Index: drc_query/Makefile
===================================================================
--- drc_query/Makefile	(revision 35776)
+++ drc_query/Makefile	(revision 35777)
@@ -3,8 +3,9 @@
 SRC=$(ROOT)/src
 TDIR=../tests/drc_query
 FLT=$(TDIR)/drc_filter.sh
+GFLT=$(TDIR)/../pupfilter.sh
 PCBRND=./pcb-rnd
-GLOBARGS=-c rc/library_search_paths=../tests/RTT/lib -c rc/quiet=1 -c editor/drc_inclusive_bbox=1
+GLOBARGS=--gui batch -c rc/library_search_paths=../tests/RTT/lib -c rc/quiet=1 -c editor/drc_inclusive_bbox=1
 
 TESTS = \
 thickness.diff overlap.diff netint.diff dwg_area.diff fullpoly.diff \
@@ -18,43 +19,43 @@
 	@diff -u thickness.ref thickness.out && rm thickness.out
 
 thickness.out: FORCE
-	@cd $(SRC) && echo "drc()" | $(PCBRND) $(GLOBARGS) $(TDIR)/thickness.lht --gui batch | $(FLT) > $(TDIR)/thickness.out
+	@cd $(SRC) && echo "drc()" | $(PCBRND) $(GLOBARGS) $(TDIR)/thickness.lht --gui batch | $(GFLT) | $(FLT) > $(TDIR)/thickness.out
 
 overlap.diff: overlap.out
 	@diff -u overlap.ref overlap.out && rm overlap.out
 
 overlap.out: FORCE
-	@cd $(SRC) && echo "drc()" | $(PCBRND) $(GLOBARGS) $(TDIR)/overlap.lht --gui batch | $(FLT) > $(TDIR)/overlap.out
+	@cd $(SRC) && echo "drc()" | $(PCBRND) $(GLOBARGS) $(TDIR)/overlap.lht --gui batch | $(GFLT) | $(FLT) > $(TDIR)/overlap.out
 
 netint.diff: netint.out
 	@diff -u netint.ref netint.out && rm netint.out
 
 netint.out: FORCE
-	@cd $(SRC) && echo "drc()" | $(PCBRND) $(GLOBARGS) $(TDIR)/netint.lht --gui batch | $(FLT) > $(TDIR)/netint.out
+	@cd $(SRC) && echo "drc()" | $(PCBRND) $(GLOBARGS) $(TDIR)/netint.lht --gui batch | $(GFLT) | $(FLT) > $(TDIR)/netint.out
 
 dwg_area.diff: dwg_area.out
 	@diff -u dwg_area.ref dwg_area.out && rm dwg_area.out
 
 dwg_area.out: FORCE
-	@cd $(SRC) && echo "drc()" | $(PCBRND) $(GLOBARGS) $(TDIR)/dwg_area.lht --gui batch | $(FLT) > $(TDIR)/dwg_area.out
+	@cd $(SRC) && echo "drc()" | $(PCBRND) $(GLOBARGS) $(TDIR)/dwg_area.lht --gui batch | $(GFLT) | $(FLT) > $(TDIR)/dwg_area.out
 
 fullpoly.diff: fullpoly.out
 	@diff -u fullpoly.ref fullpoly.out && rm fullpoly.out
 
 fullpoly.out: FORCE
-	@cd $(SRC) && echo "drc()" | $(PCBRND) $(GLOBARGS) $(TDIR)/fullpoly.lht --gui batch | $(FLT) > $(TDIR)/fullpoly.out
+	@cd $(SRC) && echo "drc()" | $(PCBRND) $(GLOBARGS) $(TDIR)/fullpoly.lht --gui batch | $(GFLT) | $(FLT) > $(TDIR)/fullpoly.out
 
 zone_clr.diff: zone_clr.out
 	@diff -u zone_clr.ref zone_clr.out && rm zone_clr.out
 
 zone_clr.out: FORCE
-	@cd $(SRC) && echo "drc()" | $(PCBRND) $(GLOBARGS) $(TDIR)/zone_clr.lht --gui batch | $(FLT) > $(TDIR)/zone_clr.out
+	@cd $(SRC) && echo "drc()" | $(PCBRND) $(GLOBARGS) $(TDIR)/zone_clr.lht --gui batch | $(GFLT) | $(FLT) > $(TDIR)/zone_clr.out
 
 invchar.diff: invchar.out
 	@diff -u invchar.ref invchar.out && rm invchar.out
 
 invchar.out: FORCE
-	@cd $(SRC) && echo "drc()" | $(PCBRND) $(GLOBARGS) $(TDIR)/invchar.lht --gui batch | $(FLT) > $(TDIR)/invchar.out
+	@cd $(SRC) && echo "drc()" | $(PCBRND) $(GLOBARGS) $(TDIR)/invchar.lht --gui batch | $(GFLT) | $(FLT) > $(TDIR)/invchar.out
 
 clean:
 	@echo "a" > dummy.out
Index: menu/Makefile
===================================================================
--- menu/Makefile	(revision 35776)
+++ menu/Makefile	(revision 35777)
@@ -1,17 +1,19 @@
+GFLT=../pupfilter.sh
+
 all:
 
 test:
-	@./test_patch.sh insert.lht 'MenuPatch(load, test, "insert.lht");' > insert.out
+	@./test_patch.sh insert.lht 'MenuPatch(load, test, "insert.lht");' | $(GFLT) > insert.out
 	@diff -w insert.ref insert.out
-	@./test_patch.sh change.lht 'MenuPatch(load, test, "change.lht");' > change.out
+	@./test_patch.sh change.lht 'MenuPatch(load, test, "change.lht");' | $(GFLT) > change.out
 	@diff -w change.ref change.out
-	@./test_patch.sh remove.lht 'MenuPatch(load, test, "remove.lht");' > remove.out
+	@./test_patch.sh remove.lht 'MenuPatch(load, test, "remove.lht");' | $(GFLT) > remove.out
 	@diff -w remove.ref remove.out
-	@./test_patch.sh overwrite_m.lht 'MenuPatch(load, test, "overwrite_m.lht");' > overwrite_m.out
+	@./test_patch.sh overwrite_m.lht 'MenuPatch(load, test, "overwrite_m.lht");' | $(GFLT) > overwrite_m.out
 	@diff -w overwrite_m.ref overwrite_m.out
-	@./test_patch.sh overwrite_p.lht 'MenuPatch(load, test, "overwrite_p.lht");' > overwrite_p.out
+	@./test_patch.sh overwrite_p.lht 'MenuPatch(load, test, "overwrite_p.lht");' | $(GFLT) > overwrite_p.out
 	@diff -w overwrite_p.ref overwrite_p.out
-	@./test_patch.sh new_submenu.lht 'MenuPatch(load, test, "new_submenu.lht");' > new_submenu.out
+	@./test_patch.sh new_submenu.lht 'MenuPatch(load, test, "new_submenu.lht");' | $(GFLT) > new_submenu.out
 	@diff -w new_submenu.ref new_submenu.out
 
 clean:
Index: pupfilter.sh
===================================================================
--- pupfilter.sh	(nonexistent)
+++ pupfilter.sh	(revision 35777)
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# ignore plugin loading errors: this way we do not need to install all
+# librnd deps
+
+exec awk '
+	/^E: Some of the dynamic/ { next }
+	/^E: puplug:/ { next}
+	{ print $0 }
+'

Property changes on: pupfilter.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: query/Makefile
===================================================================
--- query/Makefile	(revision 35776)
+++ query/Makefile	(revision 35777)
@@ -2,6 +2,7 @@
 
 SRC=$(ROOT)/src
 TDIR=../tests/query
+GFLT=$(TDIR)/../pupfilter.sh
 PCBRND=./pcb-rnd
 GLOBARGS=-c rc/library_search_paths=../tests/RTT/lib -c rc/quiet=1
 
@@ -16,19 +17,19 @@
 	@diff -u action.ref action.out && rm action.out
 
 action.out: FORCE
-	@cd $(SRC) && echo 'query(eval, "action(\"message\", \"hello\", @.x)")' | $(PCBRND) $(GLOBARGS) $(TDIR)/1obj.lht --gui batch > $(TDIR)/action.out
+	@cd $(SRC) && echo 'query(eval, "action(\"message\", \"hello\", @.x)")' | $(PCBRND) $(GLOBARGS) $(TDIR)/1obj.lht --gui batch | $(GFLT) > $(TDIR)/action.out
 
 getconf.diff: getconf.out
 	@diff -u getconf.ref getconf.out && rm getconf.out
 
 getconf.out: FORCE
-	@cd $(SRC) && echo 'query(eval, "@ thus getconf(\"editor/grid_unit\")")' | $(PCBRND) $(GLOBARGS) $(TDIR)/1obj.lht --gui batch > $(TDIR)/getconf.out
+	@cd $(SRC) && echo 'query(eval, "@ thus getconf(\"editor/grid_unit\")")' | $(PCBRND) $(GLOBARGS) $(TDIR)/1obj.lht --gui batch | $(GFLT) > $(TDIR)/getconf.out
 
 getconf2.diff: getconf2.out
 	@diff -u getconf2.ref getconf2.out && rm getconf2.out
 
 getconf2.out: FORCE
-	@cd $(SRC) && echo 'query(eval, "@ thus $$min_drill")' | $(PCBRND) $(GLOBARGS) $(TDIR)/1obj.lht --gui batch > $(TDIR)/getconf2.out
+	@cd $(SRC) && echo 'query(eval, "@ thus $$min_drill")' | $(PCBRND) $(GLOBARGS) $(TDIR)/1obj.lht --gui batch | $(GFLT) > $(TDIR)/getconf2.out
 
 clean:
 	@echo "a" > dummy.out
Index: vendordrill/test_all.sh
===================================================================
--- vendordrill/test_all.sh	(revision 35776)
+++ vendordrill/test_all.sh	(revision 35777)
@@ -2,6 +2,8 @@
 
 ROOT="../.."
 SRC="$ROOT/src"
+TDIR="../tests/vendordrill"
+GFLT="../pupfilter.sh"
 PCBRND="./pcb-rnd"
 GLOBARGS="-c rc/library_search_paths=../tests/RTT/lib -c rc/quiet=1"
 
@@ -30,8 +32,8 @@
 Report(DrillReport)
 ') | (
 	cd $SRC
-	./pcb-rnd $GLOBARGS --gui batch $brd
-) | awk '
+	$PCBRND $GLOBARGS --gui batch $brd
+) | $GFLT | awk '
 # remove full path filenames
 /Loaded.*from/ {
 	line=$0