From 150be8ee36697ce014f3431b961be45c4c6a34b8 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Mon, 8 Aug 2011 15:23:11 +0200 Subject: [PATCH] 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. --- ChangeLog | 6 ++++++ tests/tap-functions.sh | 1 + 2 files changed, 7 insertions(+) diff --git a/ChangeLog b/ChangeLog index 55179a0..ad1d3f5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2011-08-08 Stefano Lattarini + 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 + 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 --- 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 } -- 2.7.4