[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.12-64-gbd75e7a

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

The branch, maint has been updated
       via  bd75e7a8901e4df8730a7a9a4bf0f7fbe5a511ae (commit)
       via  45c1fcd986d38467662a1ec253d80304d7630f4f (commit)
      from  a16b838b03e759e5a98fdb9f1546d6ad302b3f4c (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 bd75e7a8901e4df8730a7a9a4bf0f7fbe5a511ae
Author: Nick Alcock <address@hidden>
Date:   Fri May 4 15:14:43 2012 +0100

    docs: fix clumsy grammar in the scripts-based testsuite chapter
    
    * doc/automake.texi (Scripts-based Testsuites): "We'll have later" is
    a rare example of English in the Automake manual clearly not written
    by a native English-speaker: while comprehensible, it can be better
    formulated.
    
    Copyright-paperwork-exempt: yes
    Signed-off-by: Nick Alcock <address@hidden>
    Signed-off-by: Stefano Lattarini <address@hidden>

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

Summary of changes:
 doc/automake.texi    |    5 ++---
 t/lisp8.sh           |    2 ++
 t/parallel-tests3.sh |    5 ++---
 t/tap-more.sh        |   14 ++++++++++++--
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/doc/automake.texi b/doc/automake.texi
index 7c71405..5e2b9c2 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -8837,9 +8837,8 @@ more complex test protocols, either standard 
(@pxref{Using the TAP test
 protocol}) or custom (@pxref{Custom Test Drivers}).  Note that you can
 enable such protocols only when the parallel harness is used: they won't
 work with the serial test harness.  In the rest of this section we are
-going to concentrate mostly on protocol-less tests, since  we'll have later
-a whole section devoted to the use of test protocols (again, @pxref{Custom
-Test Drivers}).
+going to concentrate mostly on protocol-less tests, since we cover
+test protocols in a later section (again, @pxref{Custom Test Drivers}).
 
 @cindex Exit status 77, special interpretation
 @cindex Exit status 99, special interpretation
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