From 38f12a3085be683b598be7d10de37eba0b629f28 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Sun, 14 Aug 2011 14:00:53 +0200 Subject: [PATCH] testsuite: avoid confusing SKIP messages for errored tests * tests/defs [$use_tap] (exit trap): Don't print the test plan in case the client script exited with a non-zero status. This avoids the display of redundant "SKIP" messages for tests with lazy plans that error out before any test is run. --- ChangeLog | 8 ++++++++ tests/defs | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 05513274b..8a009a7b3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2011-08-14 Stefano Lattarini + + testsuite: avoid confusing SKIP messages for errored tests + * tests/defs [$use_tap] (exit trap): Don't print the test plan + in case the client script exited with a non-zero status. This + avoids the display of redundant "SKIP" messages for tests with + lazy plans that error out before any test is run. + 2011-08-13 Stefano Lattarini testsuite: keep more debugging info around in 'add-missing.tap' diff --git a/tests/defs b/tests/defs index 3bd378ed0..6f9c51838 100644 --- a/tests/defs +++ b/tests/defs @@ -868,7 +868,7 @@ if test "$sh_errexit_works" = yes; then keep_testdirs=no fi if test $using_tap = yes; then - if test $have_tap_plan_ != yes; then + if test $have_tap_plan_ != yes && test $exit_status -eq 0; then plan_ "now" fi test $exit_status -eq 0 && test $tap_pass_count_ -eq $tap_count_ \ -- 2.47.2