[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-554-g5f2cd97

[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=5f2cd97d68da0164a7a58fd30223fb04d639918b

The branch, master has been updated
       via  5f2cd97d68da0164a7a58fd30223fb04d639918b (commit)
       via  49860170d3eea01cca9a76f6e738ca345a09e306 (commit)
       via  2f8861f47415fc98ee381cb13824176ed5932726 (commit)
      from  738d54fdacf323645cd51250fd1a87a9c8fa6038 (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 5f2cd97d68da0164a7a58fd30223fb04d639918b
Merge: 738d54f 4986017
Author: Stefano Lattarini <address@hidden>
Date:   Tue Dec 21 15:44:14 2010 +0100

    Merge branch 'maint'

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

Summary of changes:
 ChangeLog               |   14 ++++++++++++++
 tests/distlinksbrk.test |   31 +++++++++++++------------------
 2 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0ded3b8..c3e6d3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2010-12-22  Stefano Lattarini  <address@hidden>
+
+       distlinksbrk.test: Work around botched "make -k".
+       * tests/distlinksbrk.test: Run "make" multiple times and grep
+       its output each time for a single error message, rather than
+       running "make -k" one single time and grepping its output for
+       all the expected error messages.  This should work around make
+       implementations with limited (broken?) `-k' support; for more
+       information, see these subthreads on the automake-patches list:
+         - 2010-11-15, "Testsuite failures on HP-UX 11.23",
+           
<http://lists.gnu.org/archive/html/automake-patches/2010-11/msg00162.html>
+         - 2010-11-15, "Testsuite failures on IRIX 6.5",
+           
<http://lists.gnu.org/archive/html/automake-patches/2010-11/msg00166.html>
+
 2010-12-21  Stefano Lattarini  <address@hidden>
 
        Minor improvements to test 'amopts.test'.
diff --git a/tests/distlinksbrk.test b/tests/distlinksbrk.test
index 1e478ab..2314408 100755
--- a/tests/distlinksbrk.test
+++ b/tests/distlinksbrk.test
@@ -49,30 +49,25 @@ test -h $lnk2
 test -h $lnka
 test -h $lnkb
 
-cat >>configure.in <<END
+cat >> configure.in <<'END'
 AC_OUTPUT
 END
 
-cat > Makefile.am <<END
-EXTRA_DIST = $lnk1 $lnk2 $lnka $lnkb
-END
-
-ls -l
-
 $ACLOCAL
 $AUTOCONF
-$AUTOMAKE
-./configure
 
-# Distribution must fail.
-$MAKE distdir && Exit 1
+ls -l # for debugging
 
-# Names of distributed broken symlinks should be reported in make output.
-$MAKE -k distdir >out 2>&1 || : # don't trust the exit status of make -k
-cat out
-$FGREP $lnk1 out
-$FGREP $lnk2 out
-$FGREP $lnka out
-$FGREP $lnkb out
+# Don't try to use "make -k", because some botched make implementations
+# (HP-UX, IRIX) might still exit on the first error in this situations.
+for lnk in $lnk1 $lnk2 $lnka $lnkb; do
+  echo "EXTRA_DIST = $lnk" > Makefile.am
+  $AUTOMAKE
+  ./configure
+  # Distribution must fail, with a decent error message.
+  $MAKE distdir >out 2>&1 && { cat out; Exit 1; }
+  cat out
+  $FGREP $lnk out
+done
 
 :


hooks/post-receive
-- 
GNU Automake