Eliminate Merge-Program lines from regression tests, so we don't get

messed up by version skew.

diff --git a/Makefile b/Makefile
index 42713ba8117b6453f757b1886d2ccf8b3e4494ff..36108dd66f5409cd576407d2fd4af83aea635ec4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -52,12 +52,12 @@ scf-standard.html: scf-standard.xml
 OPTS="-N line-oriented, remove-braces, remove-whitespace"
 makeregress:
        @for n in 1 2 3; do \
-           comparator $(OPTS) -d test test$${n}-a test$${n}-b >test/out$${n}.good;\
+           comparator $(OPTS) -d test test$${n}-a test$${n}-b | grep -v 'Merge-Program' >test/out$${n}.good;\
        done
 
 regress:
        @for n in 1 2 3; do \
-           comparator $(OPTS) -d test test$${n}-a test$${n}-b >test/out$${n}.log;\
+           comparator $(OPTS) -d test test$${n}-a test$${n}-b | grep -v 'Merge-Program' >test/out$${n}.log;\
            if diff -c test/out$${n}.good test/out$${n}.log; \
            then \
                echo "Test $${n} from trees passed."; \