From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Wed, 7 Sep 2011 14:50:09 +0000 (+0200)
Subject: tests: fix spurious Cygwin failure of a test on TAP support
X-Git-Tag: ng-0.5a~89^2~71
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3afa5ec6519b96ed601f912418b20c3d2ef13652;p=thirdparty%2Fautomake.git

tests: fix spurious Cygwin failure of a test on TAP support

* tests/tap-bad-prog.tap (noexec.test): Add forgotten `echo'.
When trying to run it, redirect its output to /dev/null, to
avoid confusing automake's testsuite own TAP driver.
---

diff --git a/ChangeLog b/ChangeLog
index 9759787c0..4aaee9a29 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-09-07  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+	tests: fix spurious Cygwin failure of a test on TAP support
+	* tests/tap-bad-prog.tap (noexec.test): Add forgotten `echo'.
+	When trying to run it, redirect its output to /dev/null, to
+	avoid confusing automake's testsuite own TAP driver.
+
 2011-09-07  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
 	test defs: fix glitch in TAP version of `warn_' function
diff --git a/tests/tap-bad-prog.tap b/tests/tap-bad-prog.tap
index 1ced399d3..3cc5e217a 100755
--- a/tests/tap-bad-prog.tap
+++ b/tests/tap-bad-prog.tap
@@ -38,7 +38,7 @@ END
 cat > noexec.test <<'END'
 #!/bin/sh
 echo 1..1
-ok 1
+echo ok 1
 END
 
 cp noexec.test noread.test
@@ -60,7 +60,8 @@ command_ok_ "non-existent test is reported" \
             grep '^ERROR: none\.test' stdout
 
 desc="non-executable test is reported"
-if ./noexec.test; then
+# Redirect output to avoid confusing automake's testsuite own TAP driver.
+if ./noexec.test >/dev/null; then
   skip_ -r "any file is executable" "$desc"
 else
   command_ok_ "$desc" -- grep '^ERROR: noexec\.test' stdout