Waiting for Emacs...

Filter regression test loads to avoid spurious failures.

diff --git a/Makefile b/Makefile
index 3099ea679b4f2032cb9289bf3165f8f0d033f3b9..01269550193fad7fc9419ebb0dd32568b3891ff6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -64,9 +64,9 @@ regress:
            else \
                echo "Test $${n} from trees failed."; \
            fi; \
-           comparator $(OPTS) -d test -c test$${n}-a >test$${n}-a.scf; \
-           comparator $(OPTS) -d test -c test$${n}-b >test$${n}-b.scf; \
-           comparator $(OPTS) test$${n}-a.scf test$${n}-b.scf >test/out$${n}.log;\
+           comparator $(OPTS) -d test -c test$${n}-a | grep -v 'Merge-Program' >test$${n}-a.scf; \
+           comparator $(OPTS) -d test -c test$${n}-b | grep -v 'Merge-Program' >test$${n}-b.scf; \
+           comparator $(OPTS) test$${n}-a.scf test$${n}-b.scf | grep -v 'Merge-Program' >test/out$${n}.log;\
            rm test$${n}-a.scf test$${n}-b.scf; \
            if diff -u test/out$${n}.good test/out$${n}.log; \
            then \