Index: trunk/tests/vendordrill/pure.ref =================================================================== --- trunk/tests/vendordrill/pure.ref (revision 34061) +++ trunk/tests/vendordrill/pure.ref (revision 34062) @@ -11,10 +11,10 @@ 3.5000 0 1 0 0 *** report 'Drill Report' end *** -I: Loaded 2 vendor drills from /home/igor2/C/pcb-rnd/trunk/tests/vendordrill/pure1.lht +I: Loaded 2 vendor drills from pure1.lht I: Loaded 0 skips for 0 different attributes E: No drillmap resource found -I: Loaded 2 vendor drills from /home/igor2/C/pcb-rnd/trunk/tests/vendordrill/pure2.lht +I: Loaded 2 vendor drills from pure2.lht I: Loaded 1 skips for 1 different attributes I: Vendor mapping skipped because refdes = U1 matches ^U[1-3]$ I: Vendor mapping skipped because refdes = U2 matches ^U[1-3]$ Index: trunk/tests/vendordrill/round.ref =================================================================== --- trunk/tests/vendordrill/round.ref (revision 34061) +++ trunk/tests/vendordrill/round.ref (revision 34062) @@ -11,7 +11,7 @@ 3.5000 0 1 0 0 *** report 'Drill Report' end *** -I: Loaded 3 vendor drills from /home/igor2/C/pcb-rnd/trunk/tests/vendordrill/round.lht +I: Loaded 3 vendor drills from round.lht I: Loaded 0 skips for 0 different attributes I: Updated 6 drill sizes out of 6 total I: Adjusted active via hole size to be 82.68 mils Index: trunk/tests/vendordrill/round_down.ref =================================================================== --- trunk/tests/vendordrill/round_down.ref (revision 34061) +++ trunk/tests/vendordrill/round_down.ref (revision 34062) @@ -11,7 +11,7 @@ 3.5000 0 1 0 0 *** report 'Drill Report' end *** -I: Loaded 3 vendor drills from /home/igor2/C/pcb-rnd/trunk/tests/vendordrill/round_down.lht +I: Loaded 3 vendor drills from round_down.lht I: Loaded 0 skips for 0 different attributes I: Updated 6 drill sizes out of 6 total I: Adjusted active via hole size to be 11.81 mils Index: trunk/tests/vendordrill/round_near.ref =================================================================== --- trunk/tests/vendordrill/round_near.ref (revision 34061) +++ trunk/tests/vendordrill/round_near.ref (revision 34062) @@ -11,7 +11,7 @@ 3.5000 0 1 0 0 *** report 'Drill Report' end *** -I: Loaded 3 vendor drills from /home/igor2/C/pcb-rnd/trunk/tests/vendordrill/round_near.lht +I: Loaded 3 vendor drills from round_near.lht I: Loaded 0 skips for 0 different attributes I: Updated 6 drill sizes out of 6 total I: Adjusted active via hole size to be 11.81 mils Index: trunk/tests/vendordrill/round_up.ref =================================================================== --- trunk/tests/vendordrill/round_up.ref (revision 34061) +++ trunk/tests/vendordrill/round_up.ref (revision 34062) @@ -11,7 +11,7 @@ 3.5000 0 1 0 0 *** report 'Drill Report' end *** -I: Loaded 3 vendor drills from /home/igor2/C/pcb-rnd/trunk/tests/vendordrill/round_up.lht +I: Loaded 3 vendor drills from round_up.lht I: Loaded 0 skips for 0 different attributes I: Updated 6 drill sizes out of 6 total I: Adjusted active via hole size to be 82.68 mils Index: trunk/tests/vendordrill/skip_attr.ref =================================================================== --- trunk/tests/vendordrill/skip_attr.ref (revision 34061) +++ trunk/tests/vendordrill/skip_attr.ref (revision 34062) @@ -11,7 +11,7 @@ 3.5000 0 1 0 0 *** report 'Drill Report' end *** -I: Loaded 2 vendor drills from /home/igor2/C/pcb-rnd/trunk/tests/vendordrill/skip_attr.lht +I: Loaded 2 vendor drills from skip_attr.lht I: Loaded 1 skips for 1 different attributes I: Vendor mapping skipped because blobb = yes matches yes I: Updated 5 drill sizes out of 5 total Index: trunk/tests/vendordrill/skip_descr.ref =================================================================== --- trunk/tests/vendordrill/skip_descr.ref (revision 34061) +++ trunk/tests/vendordrill/skip_descr.ref (revision 34062) @@ -11,7 +11,7 @@ 3.5000 0 1 0 0 *** report 'Drill Report' end *** -I: Loaded 2 vendor drills from /home/igor2/C/pcb-rnd/trunk/tests/vendordrill/skip_descr.lht +I: Loaded 2 vendor drills from skip_descr.lht I: Loaded 1 skips for 1 different attributes I: Vendor mapping skipped because footprint = foo matches ^foo$ I: Vendor mapping skipped because footprint = foo matches ^foo$ Index: trunk/tests/vendordrill/skip_refdes.ref =================================================================== --- trunk/tests/vendordrill/skip_refdes.ref (revision 34061) +++ trunk/tests/vendordrill/skip_refdes.ref (revision 34062) @@ -11,7 +11,7 @@ 3.5000 0 1 0 0 *** report 'Drill Report' end *** -I: Loaded 2 vendor drills from /home/igor2/C/pcb-rnd/trunk/tests/vendordrill/skip_refdes.lht +I: Loaded 2 vendor drills from skip_refdes.lht I: Loaded 1 skips for 1 different attributes I: Vendor mapping skipped because refdes = U1 matches ^U[1-3]$ I: Vendor mapping skipped because refdes = U2 matches ^U[1-3]$ Index: trunk/tests/vendordrill/skip_value.ref =================================================================== --- trunk/tests/vendordrill/skip_value.ref (revision 34061) +++ trunk/tests/vendordrill/skip_value.ref (revision 34062) @@ -11,7 +11,7 @@ 3.5000 0 1 0 0 *** report 'Drill Report' end *** -I: Loaded 2 vendor drills from /home/igor2/C/pcb-rnd/trunk/tests/vendordrill/skip_value.lht +I: Loaded 2 vendor drills from skip_value.lht I: Loaded 1 skips for 1 different attributes I: Vendor mapping skipped because value = 1 matches ^1 I: Vendor mapping skipped because value = 1 matches ^1 Index: trunk/tests/vendordrill/test_all.sh =================================================================== --- trunk/tests/vendordrill/test_all.sh (revision 34061) +++ trunk/tests/vendordrill/test_all.sh (revision 34062) @@ -32,9 +32,19 @@ cd $SRC export LD_LIBRARY_PATH=../src_3rd/librnd-local/src ./pcb-rnd $GLOBARGS --gui batch $brd -) +) | awk ' +# remove full path filenames +/Loaded.*from/ { + line=$0 + sub("[/].*[/]", "", line) + print line + next } +{ print $0 } +' +} + run_test() { local tname="$1"