* tests/tap-signal.test (signal_caught): Fix a regression from commit `v1.11-1052-gd630a0d' that was causing this test to fail spuriously on Solaris (due to an already worked-around Solaris /bin/sh bug, see commit `v1.11-981-g0ef3ef5'). --- ChangeLog | 8 ++++++++ tests/tap-signal.test | 13 +++++-------- 2 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/ChangeLog b/ChangeLog index 7cfe648..7a161ac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2011-08-22 Stefano Lattarini <[email protected]> + testsuite: avoid spurious failure on Solaris + * tests/tap-signal.test (signal_caught): Fix a regression from + commit `v1.11-1052-gd630a0d' that was causing this test to fail + spuriously on Solaris (due to an already worked-around Solaris + /bin/sh bug, see commit `v1.11-981-g0ef3ef5'). + +2011-08-22 Stefano Lattarini <[email protected]> + testsuite: use the new awk+shell TAP driver in our own testsuite * tests/Makefile.am (TAP_LOG_DRIVER): Redefine to use the new awk+shell tap driver, which should be complete enough for use in diff --git a/tests/tap-signal.test b/tests/tap-signal.test index 416422e..7821a2a 100755 --- a/tests/tap-signal.test +++ b/tests/tap-signal.test @@ -62,14 +62,11 @@ signal_caught () shell) rx="$pfx_re .*terminated by signal $sig_re$wbound_re";; *) fatal_ "invalid \$am_tap_implementation '$am_tap_implementation'";; esac - if LC_ALL=C $EGREP "$rx" stdout; then - return 0 - elif test $have_solaris_bug = yes; then - case $symbolic in - INT|TERM) - $EGREP "$pfx_re - exited with status 208( |$)" stdout;; - esac - fi + LC_ALL=C $EGREP "$rx" stdout && return 0 + case $have_solaris_bug,$symbolic in + yes,INT|yes,TERM) + $EGREP "$pfx_re - exited with status 208( |$)" stdout && return 0;; + esac return 1 } -- 1.7.2.3
