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 33ac71cb69865058073ebbc7bb1672b54530c6e4..328ca844d91b3c7dc71dc337add846187b5c1621 100644 (file)
--- 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 ae8ffa89111988e6a86ba11905352ca84c4a518b..68d70711c2dfc2ded14c28a109a4c5ff7ee9afe5 100755 (executable)
--- 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
 
 :