From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Mon, 1 Aug 2011 16:43:30 +0000 (+0200)
Subject: testsuite: fix spurious errors in an xfailing test on TAP support
X-Git-Tag: ng-0.5a~89^2~155^2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9fb15f19427bb194feb87c59c52169b2fb9a04d5;p=thirdparty%2Fautomake.git

testsuite: fix spurious errors in an xfailing test on TAP support

* tests/plan-bad-prog.test: Fix typo in the name of the test
being made unreadable.  Correct the wording of the potential
skip message, and simplify the condition under which the test
is to be skipped.  Escape literal dots in grep regexps.
---

diff --git a/ChangeLog b/ChangeLog
index 2f7385d08..a155e2daa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-08-01  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+	testsuite: fix spurious errors in an xfailing test on TAP support
+	* tests/plan-bad-prog.test: Fix typo in the name of the test
+	being made unreadable.  Correct the wording of the potential
+	skip message, and simplify the condition under which the test
+	is to be skipped.  Escape literal dots in grep regexps.
+
 2011-08-01  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
 	testsuite: better granularity in a couple of tests on TAP support
diff --git a/tests/tap-bad-prog.test b/tests/tap-bad-prog.test
index af54b2e98..e20009d04 100755
--- a/tests/tap-bad-prog.test
+++ b/tests/tap-bad-prog.test
@@ -44,11 +44,9 @@ END
 ./noexec.test && skip_ "can't have non-executable files"
 
 cp noexec.test noread.test
-chmod a-r noread
+chmod a-r noread.test
 
-if test -r noread.test || cat noread.test; then
-  skip_ "can't have readonly files"
-fi
+test -r noread.test && skip_ "you can still read unreadable files"
 
 $ACLOCAL
 $AUTOCONF
@@ -60,9 +58,9 @@ $MAKE check >stdout && { cat stdout; Exit 1; }
 cat stdout
 
 # FIXME: maybe better error messages?
-grep '^ERROR: none.test' stdout
-grep '^ERROR: noexec.test' stdout
-grep '^ERROR: noread.test' stdout
+grep '^ERROR: none\.test' stdout
+grep '^ERROR: noexec\.test' stdout
+grep '^ERROR: noread\.test' stdout
 
 count_test_results total=3 pass=0 fail=0 xpass=0 xfail=0 skip=0 error=3