From: Eric S. Raymond <esr@thyrsus.com>
Date: Fri, 7 Jan 2005 17:11:02 +0000 (+0000)
Subject: Eliminate Merge-Program lines from regression tests, so we don't get
X-Git-Tag: 2.7~3
X-Git-Url: http://thyrsus.com/gitweb/?a=commitdiff_plain;h=bfe328bbfdccd2c0498c46fe9a800533eee45c1a;p=comparator.git

Eliminate Merge-Program lines from regression tests, so we don't get
messed up by version skew.
---

diff --git a/Makefile b/Makefile
index 42713ba..36108dd 100644
--- 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."; \