From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Fri, 5 Aug 2011 12:27:12 +0000 (+0200)
Subject: maintcheck: fix spurious failure w.r.t. use of bare "exit"
X-Git-Tag: ng-0.5a~89^2~148^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5cb0635a837eb99591ac0356f242f0496f1ad0f;p=thirdparty%2Fautomake.git

maintcheck: fix spurious failure w.r.t. use of bare "exit"

* tests/check12.test: Cosmetic changes to avoid triggering a
spurious failure of the `sc_tests_Exit_not_exit' maintainer
check.
---

diff --git a/ChangeLog b/ChangeLog
index 0c3641728..234206003 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-08-05  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+	maintcheck: fix spurious failure w.r.t. use of bare "exit"
+	* tests/check12.test: Cosmetic changes to avoid triggering a
+	spurious failure of the `sc_tests_Exit_not_exit' maintainer
+	check.
+
 2011-08-05  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
 	check: update comments to reflect recent heavy changes
diff --git a/tests/check12.test b/tests/check12.test
index 27d61f6ca..e36a94da3 100755
--- a/tests/check12.test
+++ b/tests/check12.test
@@ -34,12 +34,12 @@ END
 
 cat > a.test << 'END'
 #!/bin/sh
-echo a.test: exit ${A_EXIT_STATUS-0}
+echo a.test: exit status: ${A_EXIT_STATUS-0}
 exit ${A_EXIT_STATUS-0}
 END
 cat > b.test << 'END'
 #!/bin/sh
-echo b.test: exit ${B_EXIT_STATUS-0}
+echo b.test: exit status: ${B_EXIT_STATUS-0}
 exit ${B_EXIT_STATUS-0}
 END
 chmod +x a.test b.test
@@ -174,10 +174,10 @@ for vpath in : false; do
     cat test-suite.log
     cat a.log
     cat b.log
-    grep '^a\.test: exit 0$' a.log
-    grep '^b\.test: exit 1$' b.log
+    grep '^a\.test: exit status: 0$' a.log
+    grep '^b\.test: exit status: 1$' b.log
     grep '^FAIL: b$' test-suite.log
-    grep '^b\.test: exit 1$' test-suite.log
+    grep '^b\.test: exit status: 1$' test-suite.log
     grep '^a\.test' test-suite.log && Exit 1
   else :; fi
 
@@ -197,10 +197,10 @@ for vpath in : false; do
     cat test-suite.log
     cat a.log
     cat b.log
-    grep '^a\.test: exit 0$' a.log
-    grep '^b\.test: exit 23$' b.log
+    grep '^a\.test: exit status: 0$' a.log
+    grep '^b\.test: exit status: 23$' b.log
     grep '^FAIL: b$' test-suite.log
-    grep '^b\.test: exit 23$' test-suite.log
+    grep '^b\.test: exit status: 23$' test-suite.log
     grep '^a\.test' test-suite.log && Exit 1
   else :; fi
   grep 'check-local failed :-(' local.log