From: cpickett <cpickett@64e312b2-a51f-0410-8e61-82d0ca0eb02a>
Date: Fri, 21 Mar 2008 22:04:41 +0000 (+0000)
Subject: * add '|| test $$? -eq 1;' after each diff command per
X-Git-Tag: 0.10.0~726
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2204f5bc5877b6964c4aad0ded77f507e73fa330;p=check

* add '|| test $$? -eq 1;' after each diff command per
  OpenBSD 4.2 problems Torok Edwin was having.


git-svn-id: svn+ssh://svn.code.sf.net/p/check/code/trunk@434 64e312b2-a51f-0410-8e61-82d0ca0eb02a
---

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 69f2dec..4f3e2b7 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -23,49 +23,51 @@ eg_tests = $(eg_root)/tests
 ## now a rule for each diff.  the redundancy here can probably be
 ## parameterized, but I don't know how.  if you know, please tell us!
 
+# diff returns 1 if there is a difference, but we don't want make to
+# think that means there is an error
 money.1-2.h.diff: $(eg_src)/money.1.h $(eg_src)/money.2.h
 	cd $(eg_root); \
-	diff -u src/money.1.h src/money.2.h > @abs_builddir@/$@; \
+	diff -u src/money.1.h src/money.2.h > @abs_builddir@/$@ || test $$? -eq 1; \
 	cd -;
 
 money.1-3.c.diff: $(eg_src)/money.1.c $(eg_src)/money.3.c
 	cd $(eg_root); \
-	diff -u src/money.1.c src/money.3.c > @abs_builddir@/$@; \
+	diff -u src/money.1.c src/money.3.c > @abs_builddir@/$@ || test $$? -eq 1; \
 	cd -;
 
 money.3-4.c.diff: $(eg_src)/money.3.c $(eg_src)/money.4.c
 	cd $(eg_root); \
-	diff -u src/money.3.c src/money.4.c > @abs_builddir@/$@; \
+	diff -u src/money.3.c src/money.4.c > @abs_builddir@/$@ || test $$? -eq 1; \
 	cd -;
 
 money.4-5.c.diff: $(eg_src)/money.4.c $(eg_src)/money.5.c
 	cd $(eg_root); \
-	diff -u src/money.4.c src/money.5.c > @abs_builddir@/$@; \
+	diff -u src/money.4.c src/money.5.c > @abs_builddir@/$@ || test $$? -eq 1; \
 	cd -;
 
 money.5-6.c.diff: $(eg_src)/money.5.c $(eg_src)/money.6.c
 	cd $(eg_root); \
-	diff -u src/money.5.c src/money.6.c > @abs_builddir@/$@; \
+	diff -u src/money.5.c src/money.6.c > @abs_builddir@/$@ || test $$? -eq 1; \
 	cd -;
 
 check_money.1-2.c.diff: $(eg_tests)/check_money.1.c $(eg_tests)/check_money.2.c
 	cd $(eg_root); \
-	diff -u tests/check_money.1.c tests/check_money.2.c > @abs_builddir@/$@; \
+	diff -u tests/check_money.1.c tests/check_money.2.c > @abs_builddir@/$@ || test $$? -eq 1; \
 	cd -;
 
 check_money.2-3.c.diff: $(eg_tests)/check_money.2.c $(eg_tests)/check_money.3.c
 	cd $(eg_root); \
-	diff -u tests/check_money.2.c tests/check_money.3.c > @abs_builddir@/$@; \
+	diff -u tests/check_money.2.c tests/check_money.3.c > @abs_builddir@/$@ || test $$? -eq 1; \
 	cd -;
 
 check_money.3-6.c.diff: $(eg_tests)/check_money.3.c $(eg_tests)/check_money.6.c
 	cd $(eg_root); \
-	diff -u tests/check_money.3.c tests/check_money.6.c > @abs_builddir@/$@; \
+	diff -u tests/check_money.3.c tests/check_money.6.c > @abs_builddir@/$@ || test $$? -eq 1; \
 	cd -;
 
 check_money.6-7.c.diff: $(eg_tests)/check_money.6.c $(eg_tests)/check_money.7.c
 	cd $(eg_root); \
-	diff -u tests/check_money.6.c tests/check_money.7.c > @abs_builddir@/$@; \
+	diff -u tests/check_money.6.c tests/check_money.7.c > @abs_builddir@/$@ || test $$? -eq 1; \
 	cd -;
 
 # explicitly list every file in the example.