[Automake-commit] [SCM] GNU Automake branch, testsuite-work, updated. v1.11-1434-ge584d6d

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=e584d6dafc318c328d129c5847d36e47c6463512

The branch, testsuite-work has been updated
       via  e584d6dafc318c328d129c5847d36e47c6463512 (commit)
       via  d47115ec4eeefc243abc3d6abf2b68e17765cb60 (commit)
      from  8ccc53c4c49a7443c4d0a32cb742ec7793cd1cd6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e584d6dafc318c328d129c5847d36e47c6463512
Merge: 8ccc53c d47115e
Author: Stefano Lattarini <address@hidden>
Date:   Wed Sep 28 13:09:18 2011 +0200

    Merge branch 'fix-test-tap-and-signals' into testsuite-work
    
    * fix-tap-tests:
      tests: remove redundant workaround for Solaris /bin/sh

commit d47115ec4eeefc243abc3d6abf2b68e17765cb60
Author: Stefano Lattarini <address@hidden>
Date:   Wed Sep 28 13:04:14 2011 +0200

    tests: remove redundant workaround for Solaris /bin/sh
    
    After previous commit `v1.11-1424-g27a399a', some workarounds for
    Solaris 10 /bin/sh are no more required, and in fact they have
    started causing XPASS results on Solaris.
    
    * tests/tap-signal.tap: Remove unneeded workarounds for Solaris 10
    /bin/sh.  Some related minor code reorganizations.

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog            |    9 +++++++++
 tests/tap-signal.tap |   31 +++----------------------------
 2 files changed, 12 insertions(+), 28 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4f6a3cd..745971a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-09-28  Stefano Lattarini  <address@hidden>
+
+       tests: remove redundant workaround for Solaris /bin/sh
+       After previous commit `v1.11-1424-g27a399a', some workarounds for
+       Solaris 10 /bin/sh are no more required, and in fact they have
+       started causing XPASS results on Solaris.
+       * tests/tap-signal.tap: Remove unneeded workarounds for Solaris 10
+       /bin/sh.  Some related minor code reorganizations.
+
 2011-09-24  Stefano Lattarini  <address@hidden>
 
        uninstall: "make uninstall" before "make install" works
diff --git a/tests/tap-signal.tap b/tests/tap-signal.tap
index 9a18586..0ed7194 100755
--- a/tests/tap-signal.tap
+++ b/tests/tap-signal.tap
@@ -60,24 +60,6 @@ chmod a+x *.test
 
 . "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
 
-# Solaris /bin/sh, when killed with a SIGTERM, SIGQUIT or SIGINT signal,
-# can end up exiting with exit status 208, instead of leaving the correct
-# wide exit status to the parent.  See:
-#   <http://dbaspot.com/shell/396118-bourne-shell-exit-code-term.html>
-# We need to detect and work around this incompatibility.
-
-have_solaris_bug=no
-for sig in 2 3 15; do
-  if /bin/sh -c "kill -$sig \$\$"; then
-    warn_ "/bin/sh cannot kill itself with signal $sig"
-  elif test $? -eq 208; then
-    warn_ "/bin/sh exits with status 208 upon some signals (Solaris?)"
-    warn_ "we will try to work around this bug"
-    have_solaris_bug=yes
-    break
-  fi
-done
-
 signal_caught ()
 {
   numeric=$1
@@ -98,18 +80,11 @@ signal_caught ()
     shell) rx="$pfx_re .*terminated by signal $sig_re$wbound_re";;
     *) fatal_ "invalid \$am_tap_implementation '$am_tap_implementation'";;
   esac
-  directive='' reason=''
-  case $have_solaris_bug,$symbolic in
-    yes,INT|yes,TERM|yes,QUIT) directive=TODO reason="Solaris /bin/sh bug";;
-  esac
+  desc="TAP driver catch test termination by signal SIG$symbolic"
   case " $blocked_signals " in
-    *" $numeric "*)
-      reason="SIG$symbolic is blocked" directive=SKIP result=ok;;
-    *)
-      LC_ALL=C $EGREP "$rx" stdout && result='ok' || result='not ok';;
+    *" $numeric "*) skip_ -r "SIG$symbolic is blocked" "$desc" ;;
+    *) command_ok_ "$desc" env LC_ALL=C $EGREP "$rx" stdout ;;
   esac
-  result_ "$result" -D "$directive" -r "$reason" \
-          "TAP driver catch test termination by signal SIG$symbolic"
 }
 
 command_ok_ '"make check" fails' eval 'not $MAKE check >stdout'


hooks/post-receive
-- 
GNU Automake