From 30913e0eb8ef1f9924b6762d277a561c8de9e622 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Mon, 22 Aug 2011 16:32:09 +0200 Subject: [PATCH] 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'). --- ChangeLog | 8 ++++++++ tests/tap-signal.test | 13 +++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7cfe648eb..7a161ac48 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2011-08-22 Stefano Lattarini + + 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 testsuite: use the new awk+shell TAP driver in our own testsuite diff --git a/tests/tap-signal.test b/tests/tap-signal.test index 416422e23..7821a2abc 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 } -- 2.47.2