From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Sun, 21 Aug 2011 10:25:39 +0000 (+0200)
Subject: coverage: ambiguous use of TAP "TODO"/"SKIP" directives
X-Git-Tag: ng-0.5a~89^2~97^2~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=28964e4787b17f0211f9b2aab2776cee163fdb30;p=thirdparty%2Fautomake.git

coverage: ambiguous use of TAP "TODO"/"SKIP" directives

* tests/tap-ambiguous-directive.test: New test.
* tests/tap-todo-skip-together.test: Reference it in heading
comments.
* tests/Makefile.am (tap_with_common_setup_tests): Update.
---

diff --git a/ChangeLog b/ChangeLog
index f5d19e35c..810cee086 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-08-21  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+	coverage: ambiguous use of TAP "TODO"/"SKIP" directives
+	* tests/tap-ambiguous-directive.test: New test.
+	* tests/tap-todo-skip-together.test: Reference it in heading
+	comments.
+	* tests/Makefile.am (tap_with_common_setup_tests): Update.
+
 2011-08-21  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
 	coverage: non-directive comments in TAP results are preserved
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 741720c50..cd6ed2cc4 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1142,6 +1142,7 @@ testsuite-summary-count-many.log: extract-testsuite-summary
 # `tap-common-setup.test', and sources the `tap-setup.sh' helper
 # script.
 tap_with_common_setup_tests = \
+tap-ambiguous-directive.test \
 tap-autonumber.test \
 tap-bailout.test \
 tap-bailout-and-logging.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 9b0de2725..ed955ac6b 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1383,6 +1383,7 @@ $(parallel_tests)
 # `tap-common-setup.test', and sources the `tap-setup.sh' helper
 # script.
 tap_with_common_setup_tests = \
+tap-ambiguous-directive.test \
 tap-autonumber.test \
 tap-bailout.test \
 tap-bailout-and-logging.test \
diff --git a/tests/tap-ambiguous-directive.test b/tests/tap-ambiguous-directive.test
new file mode 100755
index 000000000..78f968466
--- /dev/null
+++ b/tests/tap-ambiguous-directive.test
@@ -0,0 +1,56 @@
+#! /bin/sh
+# Copyright (C) 2011 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# TAP support:
+#  - handling of "ambiguous" TODO and SKIP directives
+# See also related test 'tap-todo-skip-together.test'.
+
+parallel_tests=yes
+. ./defs || Exit 1
+
+. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+cat > all.test <<END
+1..6
+ok 1 # foo SKIP
+not ok 2 # bar TODO
+ok 3 # :SKIP
+not ok 4 # :TODO
+ok 5 # SKIP SKIP
+not ok 6 # TODO TODO
+END
+
+$MAKE check >stdout && { cat stdout; Exit 1; }
+cat stdout
+
+count_test_results total=6 pass=2 fail=2 xpass=0 xfail=1 skip=1 error=0
+
+cat > exp << 'END'
+PASS: all.test 1 # foo SKIP
+FAIL: all.test 2 # bar TODO
+PASS: all.test 3 # :SKIP
+FAIL: all.test 4 # :TODO
+SKIP: all.test 5 # SKIP SKIP
+XFAIL: all.test 6 # TODO TODO
+END
+
+$FGREP ': all.test' stdout > got
+
+cat exp
+cat got
+diff exp got
+
+:
diff --git a/tests/tap-todo-skip-together.test b/tests/tap-todo-skip-together.test
index 14b8ed525..0f4a94363 100755
--- a/tests/tap-todo-skip-together.test
+++ b/tests/tap-todo-skip-together.test
@@ -16,6 +16,7 @@
 
 # TAP support:
 #  - TODO and SKIP directives on the same line: the first one wins
+# See also related test 'tap-ambiguous-directive.test'.
 
 parallel_tests=yes
 . ./defs || Exit 1