From: Eric S. Raymond <esr@thyrsus.com>
Date: Tue, 19 Oct 2010 08:15:31 +0000 (-0400)
Subject: Waiting for Emacs...
X-Git-Tag: 2.8~4
X-Git-Url: http://thyrsus.com/gitweb/?a=commitdiff_plain;h=aebc94eb4d4ff81d1c04f000e75bb9328e12ebd4;p=comparator.git

Waiting for Emacs...
Filter regression test loads to avoid spurious failures.
---

diff --git a/Makefile b/Makefile
index 3099ea6..0126955 100644
--- 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 \