From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Sun, 21 Aug 2011 13:33:03 +0000 (+0200)
Subject: coverage: keyword "SKIP" in TAP plan is case-insensitive
X-Git-Tag: ng-0.5a~89^2~97^2~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f833f79c912cef51f4f2f71f2183574cdc43ee4;p=thirdparty%2Fautomake.git

coverage: keyword "SKIP" in TAP plan is case-insensitive

* tests/tap-planskip-case-insensitive.test: New test.
* tests/tap-planskip.test: Remove now-duplicated checks.
* tests/Makefile.am (tap_with_common_setup_tests): Update.
---

diff --git a/ChangeLog b/ChangeLog
index 810cee086..70a255f17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-08-21  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+	coverage: keyword "SKIP" in TAP plan is case-insensitive
+	* tests/tap-planskip-case-insensitive.test: New test.
+	* tests/tap-planskip.test: Remove now-duplicated checks.
+	* tests/Makefile.am (tap_with_common_setup_tests): Update.
+
 2011-08-21  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
 	coverage: ambiguous use of TAP "TODO"/"SKIP" directives
diff --git a/tests/Makefile.am b/tests/Makefile.am
index cd6ed2cc4..1dbdcb24e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1195,6 +1195,7 @@ tap-planskip-late.test \
 tap-planskip-and-logging.test \
 tap-planskip-unplanned.test \
 tap-planskip-unplanned-corner.test \
+tap-planskip-case-insensitive.test \
 tap-planskip-whitespace.test \
 tap-planskip-badexit.test \
 tap-planskip-bailout.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index ed955ac6b..631bd8cfc 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1436,6 +1436,7 @@ tap-planskip-late.test \
 tap-planskip-and-logging.test \
 tap-planskip-unplanned.test \
 tap-planskip-unplanned-corner.test \
+tap-planskip-case-insensitive.test \
 tap-planskip-whitespace.test \
 tap-planskip-badexit.test \
 tap-planskip-bailout.test \
diff --git a/tests/tap-planskip-case-insensitive.test b/tests/tap-planskip-case-insensitive.test
new file mode 100755
index 000000000..2ed26266d
--- /dev/null
+++ b/tests/tap-planskip-case-insensitive.test
@@ -0,0 +1,46 @@
+#! /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:
+#  - "SKIP" keyword in a TAP plan is case-insensitive
+
+parallel_tests=yes
+. ./defs || Exit 1
+
+. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+# These nested loops are clearer without indentation.
+
+i=0
+for c1 in s S; do
+for c2 in k K; do
+for c3 in i I; do
+for c4 in p P; do
+  i=`expr $i + 1`
+  case $i in ?) i=0$i; esac
+  echo "1..0 # $c1$c2$c3$c4 foobar" > $i.test
+done; done; done; done
+
+TESTS="`echo *.test`" $MAKE -e check >stdout || { cat stdout; Exit 1; }
+cat stdout
+
+count_test_results total=16 pass=0 fail=0 xpass=0 xfail=0 skip=16 error=0
+
+for tst in *.test; do
+  grep "^SKIP: $tst .* foobar$" stdout
+done
+
+:
diff --git a/tests/tap-planskip.test b/tests/tap-planskip.test
index 2852305bb..574819bb6 100755
--- a/tests/tap-planskip.test
+++ b/tests/tap-planskip.test
@@ -49,12 +49,12 @@ cat > wget.test <<END
 END
 
 cat > curl.test <<END
-1..0 # skip: Can't connect to gnu.org!
+1..0 # SKIP: Can't connect to gnu.org!
 # See also wget.test
 END
 
 cat > mu.test <<END
-1..0 # Skip $weirdchars
+1..0 # SKIP $weirdchars
 END
 
 env TESTS='foo.test bar.test baz.test wget.test curl.test mu.test' \