From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Sun, 7 Aug 2011 18:26:34 +0000 (+0200)
Subject: testsuite: fix spurious failure in a test on TAP support
X-Git-Tag: ng-0.5a~89^2~132^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=30bef0f3dc2e56b1205e3a1d69f5321a9c7a99e6;p=thirdparty%2Fautomake.git

testsuite: fix spurious failure in a test on TAP support

* tests/tap-passthrough-exit.test: When the `--ignore-exit' flag
of the TAP driver is used, don't look for a message reporting the
non-zero exit statuses of tests in the log files; such message is
not expected to be there anymore.  Related simplifications.
---

diff --git a/ChangeLog b/ChangeLog
index 33ac71cb6..328ca844d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-08-07  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+	testsuite: fix spurious failure in a test on TAP support
+	* tests/tap-passthrough-exit.test: When the `--ignore-exit' flag
+	of the TAP driver is used, don't look for a message reporting the
+	non-zero exit statuses of tests in the log files; such message is
+	not expected to be there anymore.  Related simplifications.
+
 2011-08-07  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
 	tap: plan location is more liberal w.r.t. non-TAP lines
diff --git a/tests/tap-passthrough-exit.test b/tests/tap-passthrough-exit.test
index ae8ffa891..68d70711c 100755
--- a/tests/tap-passthrough-exit.test
+++ b/tests/tap-passthrough-exit.test
@@ -53,14 +53,7 @@ for e in $exit_statuses; do
   done
 done
 
-st=0
-env TEST_LOG_DRIVER_FLAGS='--ignore-exit' $MAKE -e check || st=$?
-for e in $exit_statuses; do cat exit-$e.log; done
-cat test-suite.log
-test $st -eq 0 || Exit 1
-
-for e in $exit_statuses; do
-  grep "exit-$e\\.test - exited with status $e$" exit-$e.log
-done
+env TEST_LOG_DRIVER_FLAGS='--ignore-exit' $MAKE -e check
+$FGREP ".test - exited with status" *.log && Exit 1
 
 :