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').

diff --git a/ChangeLog b/ChangeLog
index 7cfe648eb9de72054e1bb3ed54d1e90ad45aff7d..7a161ac48141d5523c6b96fb2b9df45a4be20294 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-08-22  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+       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  <stefano.lattarini@gmail.com>
 
        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 416422e23a50272063501ae65a718157c0c2125b..7821a2abc077a283a4bcb90d5751ebd957c73f30 100755 (executable)
--- 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
 }