From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Mon, 8 Aug 2011 13:23:11 +0000 (+0200)
Subject: test defs: fix bug in TAP version of `skip_all_'
X-Git-Tag: ng-0.5a~89^2~126
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=150be8ee36697ce014f3431b961be45c4c6a34b8;p=thirdparty%2Fautomake.git

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 55179a0e2..ad1d3f5b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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
diff --git a/tests/tap-functions.sh b/tests/tap-functions.sh
index d685c182a..5cd6c1a9e 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
 }