Index: Makefile
===================================================================
--- Makefile	(revision 35776)
+++ 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