[Automake-commit] [SCM] GNU Automake branch, test-protocols, updated. v1.11-1054-g30913e0

[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=30913e0eb8ef1f9924b6762d277a561c8de9e622

The branch, test-protocols has been updated
       via  30913e0eb8ef1f9924b6762d277a561c8de9e622 (commit)
       via  477abec3777589888ed4a4b4f78d1c13f91cdfcb (commit)
      from  d630a0d4dc7c1af141ab3c61458cdbc690dac88c (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 ChangeLog             |   15 +++++++++++++++
 tests/Makefile.am     |    2 +-
 tests/Makefile.in     |    2 +-
 tests/tap-signal.test |   13 +++++--------
 4 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index db6a46b..7a161ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,20 @@
 2011-08-22  Stefano Lattarini  <address@hidden>
 
+       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  <address@hidden>
+
+       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
+       a "controlled" production environment.
+
+2011-08-22  Stefano Lattarini  <address@hidden>
+
        tap/awk: handle non-zero exit status from the test command
        * lib/tap-driver.sh (get_test_exit_message): New function in the
        awk script, used to extract the exit status of the test program,
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 1dbdcb2..4c8f342 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 TEST_EXTENSIONS = .test .tap
-TAP_LOG_DRIVER = $(PERL) $(top_srcdir)/lib/tap-driver.pl
+TAP_LOG_DRIVER = AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/lib/tap-driver.sh
 TAP_LOG_DRIVER_FLAGS = --merge
 
 MAINTAINERCLEANFILES =
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 631bd8c..d9fafa7 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -279,7 +279,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 TEST_EXTENSIONS = .test .tap
-TAP_LOG_DRIVER = $(PERL) $(top_srcdir)/lib/tap-driver.pl
+TAP_LOG_DRIVER = AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/lib/tap-driver.sh
 TAP_LOG_DRIVER_FLAGS = --merge
 MAINTAINERCLEANFILES = $(parallel_tests) $(instspc_tests)
 EXTRA_DIST = ChangeLog-old gen-parallel-tests instspc-tests.sh \
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
 }
 


hooks/post-receive
-- 
GNU Automake