From 3afa5ec6519b96ed601f912418b20c3d2ef13652 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Wed, 7 Sep 2011 16:50:09 +0200 Subject: [PATCH] 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. --- ChangeLog | 7 +++++++ tests/tap-bad-prog.tap | 5 +++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9759787..4aaee9a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2011-09-07 Stefano Lattarini + 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 + test defs: fix glitch in TAP version of `warn_' function * tests/tap-functions.sh (warn_): Do not display the warning message two times. diff --git a/tests/tap-bad-prog.tap b/tests/tap-bad-prog.tap index 1ced399..3cc5e21 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 -- 2.7.4