[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.12-88-g4094eb3

[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=4094eb3eeb89758ac625e678d1351162172bb4d7

The branch, master has been updated
       via  4094eb3eeb89758ac625e678d1351162172bb4d7 (commit)
       via  45c1fcd986d38467662a1ec253d80304d7630f4f (commit)
       via  a16b838b03e759e5a98fdb9f1546d6ad302b3f4c (commit)
       via  952d91c054d4e68731a23752afc904f9f9061491 (commit)
      from  6dad21bfc921cecde339723a463f1bf6abdbf2ba (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 4094eb3eeb89758ac625e678d1351162172bb4d7
Merge: 6dad21b 45c1fcd
Author: Stefano Lattarini <address@hidden>
Date:   Sat May 5 19:28:35 2012 +0200

    Merge branch 'maint'
    
    * maint:
      tests: use append mode to capture parallel make output
      parallel-tests: separate different logs with an empty line

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

Summary of changes:
 lib/am/check.am      |    1 +
 t/lisp8.sh           |    2 ++
 t/parallel-tests3.sh |    5 ++---
 t/tap-more.sh        |   14 ++++++++++++--
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/lib/am/check.am b/lib/am/check.am
index 522c953..9cda82a 100644
--- a/lib/am/check.am
+++ b/lib/am/check.am
@@ -156,6 +156,7 @@ function rst_section(header) \
           fatal("failed to read from " $$0 ".log"); \
         print line; \
       }; \
+      printf "\n"; \
     }; \
 ## Don't leak open file descriptors, as this could cause serious
 ## problems when there are many tests (yes, even on Linux).
diff --git a/t/lisp8.sh b/t/lisp8.sh
index 299ecd0..738cbd6 100755
--- a/t/lisp8.sh
+++ b/t/lisp8.sh
@@ -37,6 +37,7 @@ $AUTOCONF
 $AUTOMAKE --add-missing
 ./configure
 
+# Use append mode here to avoid dropping output.  See automake bug#11413.
 : >stdout
 $MAKE -j >>stdout || { cat stdout; Exit 1; }
 
@@ -50,6 +51,7 @@ test -f elc-stamp
 
 rm -f am-*.elc
 
+# Use append mode here to avoid dropping output.  See automake bug#11413.
 : >stdout
 $MAKE -j >>stdout || { cat stdout; Exit 1; }
 
diff --git a/t/parallel-tests3.sh b/t/parallel-tests3.sh
index f06d093..98467e6 100755
--- a/t/parallel-tests3.sh
+++ b/t/parallel-tests3.sh
@@ -90,9 +90,8 @@ cd serial
 $MAKE ${j}1 check &
 cd ../parallel
 $sleep
-# Use append mode here to avoid dropping output.
-# Yes, this actually happens.
-: >stdout
+# Use append mode here to avoid dropping output.  See automake bug#11413.
+: > stdout
 $MAKE ${j}4 check >> stdout
 cd ..
 # Ensure the tests are really being run in parallel mode: if this is
diff --git a/t/tap-more.sh b/t/tap-more.sh
index 6f5d5fe..d275bd9 100755
--- a/t/tap-more.sh
+++ b/t/tap-more.sh
@@ -118,7 +118,12 @@ for try in 0 1; do
 
   # Success.
 
-  $run_make check >stdout || { cat stdout; Exit 1; }
+  # Use append mode here to avoid dropping output.  See automake bug#11413.
+  # Also, use 'echo' here to "nullify" the previous contents of 'stdout',
+  # since Solaris 10 /bin/sh would try to optimize a ':' away after the
+  # first iteration, even if it is redirected.
+  echo " " >stdout
+  $run_make check >>stdout || { cat stdout; Exit 1; }
   cat stdout
   count_test_results total=6 pass=4 fail=0 xpass=0 xfail=1 skip=1 error=0
   grep '^PASS: 1\.test 1 - mu$' stdout
@@ -138,7 +143,12 @@ for try in 0 1; do
   # a ':' away after the first iteration, even if it is redirected.
   echo dummy > not-skip
   echo dummy > bail-out
-  $run_make check >stdout && { cat stdout; Exit 1; }
+  # Use append mode here to avoid dropping output.  See automake bug#11413.
+  # Also, use 'echo' here to "nullify" the previous contents of 'stdout',
+  # since Solaris 10 /bin/sh would try to optimize a ':' away after the
+  # first iteration, even if it is redirected.
+  echo " " >stdout
+  $run_make check >>stdout && { cat stdout; Exit 1; }
   cat stdout
   count_test_results total=7 pass=4 fail=1 xpass=0 xfail=1 skip=0 error=1
   grep '^PASS: 1\.test 1 - mu$' stdout


hooks/post-receive
-- 
GNU Automake