From 30bef0f3dc2e56b1205e3a1d69f5321a9c7a99e6 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Sun, 7 Aug 2011 20:26:34 +0200 Subject: [PATCH] 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. --- ChangeLog | 8 ++++++++ tests/tap-passthrough-exit.test | 11 ++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 33ac71cb6..328ca844d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2011-08-07 Stefano Lattarini + + 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 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 : -- 2.47.2