[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-1752-gd376fb6

[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=d376fb6033bddabf86b91bd5ce58627a91f59fc8

The branch, master has been updated
       via  d376fb6033bddabf86b91bd5ce58627a91f59fc8 (commit)
       via  30f40f634fd5bc80a9cccbacc383ef1e2b9c153a (commit)
      from  9928ea5c84889026f5800fe4270013791d47f16a (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 d376fb6033bddabf86b91bd5ce58627a91f59fc8
Author: Stefano Lattarini <address@hidden>
Date:   Tue Jan 17 11:07:01 2012 +0100

    tests: avoid spurious failures with parallel make
    
    Some tests are unprepared to be run with a make command that runs
    in parallel mode by default.  This can happen e.g., if the user
    explicitly run the tests with something like:
    
      AM_TESTSUITE_MAKE="gmake -j3" in the
    
    in the environment, but also if the make used in the testsuite is
    Sun Distributed Make, and the 'DMAKE_MODE' environment variable is
    set to "parallel".
    
    Fix some instances of this issue.
    
    * tests/tap-doc.test (Makefile.am): Declare explicit dependencies
    among the test cases, to ensure they are run in the correct order.
    * tests/tap-doc2.test: Set the 'DMAKE_MODE' environment variable
    to "serial", to prevent Sun dmake from trying to run in parallel.
    Remove other now-superfluous workarounds for dmake.

commit 30f40f634fd5bc80a9cccbacc383ef1e2b9c153a
Author: Stefano Lattarini <address@hidden>
Date:   Tue Jan 17 10:33:46 2012 +0100

    tests: fix spurious failures with Solaris dmake
    
    Solaris Distributed Make, when run in parallel mode, can sprinkle
    its standard output with lines like:
    
      hostname --> 2 jobs
      ...
      hostname --> Job output
      ...
    
    This behaviour was causing spurious errors in some tests where we
    compare the output of make with a known, expected value.  Fix that.
    
    * tests/tap-doc.test: Before comparing the output from make with its
    expected value, remove extra lines that could have been printed by
    Solaris dmake.
    * tests/tap-doc2.test: Likewise.

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

Summary of changes:
 tests/tap-doc.test  |   12 ++++++++++--
 tests/tap-doc2.test |    7 ++++++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/tests/tap-doc.test b/tests/tap-doc.test
index 174e5e5..94ced61 100755
--- a/tests/tap-doc.test
+++ b/tests/tap-doc.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -31,6 +31,10 @@ cat > Makefile.am << 'END'
 TESTS = foo.sh zardoz.tap bar.sh mu.tap
 TEST_EXTENSIONS = .sh .tap
 TAP_LOG_DRIVER = $(srcdir)/tap-driver
+## Ensure the test scripts are run in the correct order.
+mu.log: bar.log
+bar.log: zardoz.log
+zardoz.log: foo.log
 END
 
 cat > foo.sh <<'END'
@@ -81,7 +85,11 @@ PASS: mu.tap 1
 XFAIL: mu.tap 2 # TODO frobnication not yet implemented
 END
 
-sed -n '/^PASS: foo\.sh/,/^XFAIL: mu\.tap/p' stdout > got
+sed -n '/^PASS: foo\.sh/,/^XFAIL: mu\.tap/p' stdout > t
+cat t
+# Strip extra "informative" lines that could be printed by Solaris
+# Distributed Make.
+LC_ALL=C $EGREP -v ' --> ([0-9][0-9]* job|[Jj]ob output)' t > got
 
 cat exp
 cat got
diff --git a/tests/tap-doc2.test b/tests/tap-doc2.test
index 258f2d3..c844f79 100755
--- a/tests/tap-doc2.test
+++ b/tests/tap-doc2.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -69,6 +69,8 @@ END
 
 chmod a+x *.test
 
+# Strip extra "informative" lines that could be printed by Solaris
+# Distributed Make.
 mkdir build-aux
 cp "$am_scriptdir"/tap-driver.pl build-aux \
   || framework_failure_ "fetching the perl TAP driver"
@@ -80,6 +82,9 @@ cp "$am_scriptdir"/tap-driver.pl build-aux \
 
 case $MAKE in *\ -j*) skip_ "can't work easily with concurrent make";; esac
 
+# Prevent Sun Distributed Make from trying to run in parallel.
+DMAKE_MODE=serial; export DMAKE_MODE
+
 $MAKE check >stdout && { cat stdout; Exit 1; }
 cat stdout
 


hooks/post-receive
-- 
GNU Automake