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.

diff --git a/ChangeLog b/ChangeLog
index 0551327..8a009a7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-08-14  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+       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  <stefano.lattarini@gmail.com>
 
        testsuite: keep more debugging info around in 'add-missing.tap'

diff --git a/tests/defs b/tests/defs
index 3bd378e..6f9c518 100644 (file)
--- 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_ \