test defs: fix bug in TAP version of `skip_all_'

* tests/tap-functions (skip_all_): Set `$have_tap_plan_' to "yes"
when called, so that the exit trap won't write another TAP plan.

diff --git a/ChangeLog b/ChangeLog
index 55179a0..ad1d3f5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2011-08-08  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
+       test defs: fix bug in TAP version of `skip_all_'
+       * tests/tap-functions (skip_all_): Set `$have_tap_plan_' to "yes"
+       when called, so that the exit trap won't write another TAP plan.
+
+2011-08-08  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
        test defs: fix skip directives to work also with TAP-based tests
        * test/defs: Use `skip_all_', not `skip_', to issue a skip of the
        whole calling test script.

diff --git a/tests/tap-functions.sh b/tests/tap-functions.sh
index d685c18..5cd6c1a 100644 (file)
--- a/tests/tap-functions.sh
+++ b/tests/tap-functions.sh
@@ -200,6 +200,7 @@ xpass_ ()
 skip_all_ ()
 {
   echo "1..0 # SKIP" ${1+"$@"}
+  have_tap_plan_=yes
   Exit 0
 }