[Automake-commit] [SCM] GNU Automake branch, branch-1-10, updated. Release-1-10-1-36-gbfa2f5f

[Ralf Wildenhues]

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=bfa2f5fe1f5c3122b0a200683b4a1473f19ac081

The branch, branch-1-10 has been updated
       via  bfa2f5fe1f5c3122b0a200683b4a1473f19ac081 (commit)
      from  dec7a691664c79ca0474b169cde1804884371f50 (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 bfa2f5fe1f5c3122b0a200683b4a1473f19ac081
Author: Ralf Wildenhues <address@hidden>
Date:   Sun Oct 5 21:25:20 2008 +0200

    Print captured output before failing.
    
    * tests/acloca14.test, tests/acloca17.test, tests/acloca18.test,
    tests/aclocal.test, tests/acsilent.test, tests/alpha.test,
    tests/check4.test, tests/fn99.test,
    tests/fn99subdir.test, tests/help.test, tests/init.test,
    tests/lisp8.test, tests/missing3.test, tests/pr220.test,
    tests/python11.test, tests/python4.test, tests/python5.test,
    tests/unused.test, tests/version8.test: When Exit is called
    after a command that has stdout or stderr redirected to a file
    for later inspection, output the file before failing the test.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

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

Summary of changes:
 ChangeLog             |   11 +++++++++++
 tests/acloca14.test   |    4 ++--
 tests/acloca17.test   |    6 +++---
 tests/acloca18.test   |    4 ++--
 tests/aclocal.test    |    8 ++++----
 tests/acsilent.test   |    4 ++--
 tests/alpha.test      |    6 +++---
 tests/check4.test     |    4 ++--
 tests/fn99.test       |    6 +++---
 tests/fn99subdir.test |    6 +++---
 tests/help.test       |    4 ++--
 tests/init.test       |    6 +++---
 tests/lisp8.test      |    4 ++--
 tests/missing3.test   |   14 +++++++-------
 tests/pr220.test      |    6 +++---
 tests/python11.test   |    8 ++++----
 tests/python4.test    |    6 +++---
 tests/python5.test    |    6 +++---
 tests/unused.test     |    6 +++---
 tests/version8.test   |    5 +++--
 20 files changed, 68 insertions(+), 56 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 127ea20..2c2a6d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2008-10-05  Ralf Wildenhues  <address@hidden>
 
+       Print captured output before failing.
+       * tests/acloca14.test, tests/acloca17.test, tests/acloca18.test,
+       tests/aclocal.test, tests/acsilent.test, tests/alpha.test,
+       tests/check4.test, tests/fn99.test,
+       tests/fn99subdir.test, tests/help.test, tests/init.test,
+       tests/lisp8.test, tests/missing3.test, tests/pr220.test,
+       tests/python11.test, tests/python4.test, tests/python5.test,
+       tests/unused.test, tests/version8.test: When Exit is called
+       after a command that has stdout or stderr redirected to a file
+       for later inspection, output the file before failing the test.
+
        Fix some comment typos.
        * automake.in: Fix some comment typos.
        * lib/Automake/Condition.pm: Likewise.
diff --git a/tests/acloca14.test b/tests/acloca14.test
index 84f3162..fd2d567 100755
--- a/tests/acloca14.test
+++ b/tests/acloca14.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2004  Free Software Foundation, Inc.
+# Copyright (C) 2004, 2008  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -112,5 +112,5 @@ $MAKE testdist2
 
 # Make sure aclocal diagnose missing included files with correct `file:line:'.
 rm -f b.m4
-$ACLOCAL 2>stderr && exit 1
+$ACLOCAL 2>stderr && { cat stderr >&2; exit 1; }
 grep 'a.m4:1:.*b.m4.*does not exist' stderr
diff --git a/tests/acloca17.test b/tests/acloca17.test
index 00bef1a..95ccfa0 100755
--- a/tests/acloca17.test
+++ b/tests/acloca17.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2004  Free Software Foundation, Inc.
+# Copyright (C) 2004, 2008  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -38,6 +38,6 @@ EOF
 # FIXME: We want autom4te's 'undefined required macro' warning to be fatal,
 # but have no means to say so to aclocal.  We use WARNINGS=error instead.
 
-WARNINGS=error $ACLOCAL -I m4 2>stderr && exit 1
-cat stderr
+WARNINGS=error $ACLOCAL -I m4 2>stderr && { cat stderr >&2; exit 1; }
+cat stderr >&2
 grep 'configure.in:4:.*UNDEFINED_MACRO' stderr
diff --git a/tests/acloca18.test b/tests/acloca18.test
index 0b6dfe2..ce4a051 100755
--- a/tests/acloca18.test
+++ b/tests/acloca18.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2005, 2006  Free Software Foundation, Inc.
+# Copyright (C) 2005, 2006, 2008  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -90,7 +90,7 @@ grep macro23 foo
 
 ACLOCAL_TESTSUITE_FLAGS='-I 4 -I 1 -I 2'
 rm -f foo
-$ACLOCAL --install 2>stderr && exit 1
+$ACLOCAL --install 2>stderr && { cat stderr >&2; exit 1; }
 grep AM_MACRO2 stderr
 
 ACLOCAL_TESTSUITE_FLAGS='-I 4 -I 1'
diff --git a/tests/aclocal.test b/tests/aclocal.test
index d2fa705..705f7a4 100755
--- a/tests/aclocal.test
+++ b/tests/aclocal.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2004  Free Software Foundation, Inc.
+# Copyright (C) 1998, 2001, 2002, 2004, 2008  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -27,15 +27,15 @@ set -e
 $ACLOCAL --output=fred
 test -f fred
 
-$ACLOCAL --output 2>stderr && exit 1
+$ACLOCAL --output 2>stderr && { cat stderr >&2; exit 1; }
 grep 'option.*--output.*an argument' stderr
 grep help stderr
 
-$ACLOCAL --unknown-option 2>stderr && exit 1
+$ACLOCAL --unknown-option 2>stderr && { cat stderr >&2; exit 1; }
 grep 'unrecognized.*--unknown-option' stderr
 grep help stderr
 
-$ACLOCAL --ver 2>stderr && exit 1
+$ACLOCAL --ver 2>stderr && { cat stderr >&2; exit 1; }
 grep 'unrecognized.*--ver' stderr
 grep help stderr
 
diff --git a/tests/acsilent.test b/tests/acsilent.test
index 4a4c7ae..54cc012 100755
--- a/tests/acsilent.test
+++ b/tests/acsilent.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 1996, 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 1996, 2001, 2002, 2008  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -36,5 +36,5 @@ module=[$1]
 AC_SUBST(module)])
 END
 
-$ACLOCAL > output 2>&1 || exit 1
+$ACLOCAL > output 2>&1 || { cat output; exit 1; }
 test -z "`cat output`"
diff --git a/tests/alpha.test b/tests/alpha.test
index 9a07a43..ff81ec7 100755
--- a/tests/alpha.test
+++ b/tests/alpha.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2003  Free Software Foundation, Inc.
+# Copyright (C) 1998, 2001, 2002, 2003, 2008  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -66,8 +66,8 @@ $AUTOMAKE
 ./configure
 
 # make distdir should fail because NEWS does not mention 1.0a
-$MAKE check 2>stderr && exit 1
-cat stderr
+$MAKE check 2>stderr && { cat stderr >&2; exit 1; }
+cat stderr >&2
 grep 'NEWS not updated' stderr
 test ! -f works
 
diff --git a/tests/check4.test b/tests/check4.test
index 191a640..7106110 100755
--- a/tests/check4.test
+++ b/tests/check4.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2005  Free Software Foundation, Inc.
+# Copyright (C) 2005, 2008  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -54,7 +54,7 @@ $ACLOCAL
 $AUTOCONF
 $AUTOMAKE
 ./configure --prefix `pwd`/inst
-$MAKE check >stdout && exit 1
+$MAKE check >stdout && { cat stdout; exit 1; }
 cat stdout
 grep 'FAIL: fail.sh' stdout
 grep 'PASS: ok.sh' stdout && exit 1
diff --git a/tests/fn99.test b/tests/fn99.test
index b389743..7eea6cc 100755
--- a/tests/fn99.test
+++ b/tests/fn99.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2004  Free Software Foundation, Inc.
+# Copyright (C) 2004, 2008  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -51,8 +51,8 @@ do
   touch x
 done) || exit 77
 
-$MAKE dist 2>stderr && exit 1
-cat stderr
+$MAKE dist 2>stderr && { cat stderr >&2; exit 1; }
+cat stderr >&2
 grep 'filenames are too long' stderr
 test 2 = `grep 12345678 stderr | wc -l`
 :
diff --git a/tests/fn99subdir.test b/tests/fn99subdir.test
index 584f747..ccf4758 100755
--- a/tests/fn99subdir.test
+++ b/tests/fn99subdir.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2006  Free Software Foundation, Inc.
+# Copyright (C) 2006, 2008  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -77,8 +77,8 @@ do
   touch x
 done)
 
-$MAKE dist 2>stderr && exit 1
-cat stderr
+$MAKE dist 2>stderr && { cat stderr >&2; exit 1; }
+cat stderr >&2
 grep 'filenames are too long' stderr
 test 1 = `grep 12345678 stderr | wc -l`
 :
diff --git a/tests/help.test b/tests/help.test
index 500166a..58ec5fb 100755
--- a/tests/help.test
+++ b/tests/help.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2003  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2008  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -36,7 +36,7 @@ $AUTOMAKE --version
 $AUTOMAKE --help
 
 # aclocal and automake cannot work without configure.ac or configure.in
-$ACLOCAL 2>stderr && exit 1
+$ACLOCAL 2>stderr && { cat stderr >&2; exit 1; }
 grep configure.ac stderr
 grep configure.in stderr
 AUTOMAKE_fails
diff --git a/tests/init.test b/tests/init.test
index 76feca6..edd6837 100755
--- a/tests/init.test
+++ b/tests/init.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2006  Free Software Foundation, Inc.
+# Copyright (C) 2006, 2008  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -31,7 +31,7 @@ AM_INIT_AUTOMAKE
 END
 
 # The error message should mension AC_INIT, not AC_PACKAGE_VERSION.
-($ACLOCAL && $AUTOCONF) 2>stderr && exit 1
-cat stderr
+($ACLOCAL && $AUTOCONF) 2>stderr && { cat stderr >&2; exit 1; }
+cat stderr >&2
 grep AC_PACKAGE_VERSION stderr && exit 1
 grep AC_INIT stderr
diff --git a/tests/lisp8.test b/tests/lisp8.test
index 3d1e2ca..996f52c 100755
--- a/tests/lisp8.test
+++ b/tests/lisp8.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2005  Free Software Foundation, Inc.
+# Copyright (C) 2005, 2008  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -43,7 +43,7 @@ $AUTOCONF
 $AUTOMAKE --add-missing
 ./configure
 
-$MAKE -j >stdout
+$MAKE -j >stdout || { cat stdout; exit 1; }
 
 cat stdout
 test 1 -eq `grep 'Warnings can be ignored' stdout | wc -l`
diff --git a/tests/missing3.test b/tests/missing3.test
index bc2d299..a495280 100755
--- a/tests/missing3.test
+++ b/tests/missing3.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2004  Free Software Foundation, Inc.
+# Copyright (C) 2004, 2008  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -26,24 +26,24 @@ set -e
 
 # b7cb8259 assumed not to exist.
 
-./missing b7cb8259 --version 2>stderr && exit 1
+./missing b7cb8259 --version 2>stderr && { cat stderr >&2; exit 1; }
 grep . stderr && exit 1
-./missing b7cb8259 --grep 2>stderr && exit 1
+./missing b7cb8259 --grep 2>stderr && { cat stderr >&2; exit 1; }
 grep WARNING stderr
 
 ./missing --run b7cb8259 --version && exit 1
-./missing --run b7cb8259 --grep 2>stderr && exit 1
+./missing --run b7cb8259 --grep 2>stderr && { cat stderr >&2; exit 1; }
 grep WARNING stderr
 
 # missing itself it known to exist :)
 
-./missing ./missing --version 2>stderr && exit 1
+./missing ./missing --version 2>stderr && { cat stderr >&2; exit 1; }
 grep . stderr && exit 1
-./missing ./missing --grep 2>stderr && exit 1
+./missing ./missing --grep 2>stderr && { cat stderr >&2; exit 1; }
 grep WARNING stderr
 
 ./missing --run ./missing --version 2>stderr
 grep . stderr && exit 1
-./missing --run ./missing --grep 2>stderr && exit 1
+./missing --run ./missing --grep 2>stderr && { cat stderr >&2; exit 1; }
 grep WARNING stderr && exit 1
 grep Unknown stderr
diff --git a/tests/pr220.test b/tests/pr220.test
index 0d4fac8..165819c 100755
--- a/tests/pr220.test
+++ b/tests/pr220.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2001, 2002, 2004  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2004, 2008  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -59,6 +59,6 @@ $AUTOMAKE -a
 
 cd build
 # configure should fail since we've done something invalid.
-../configure 2>stderr && exit 1
-cat stderr
+../configure 2>stderr && { cat stderr >&2; exit 1; }
+cat stderr >&2
 grep NEVER_TRUE stderr
diff --git a/tests/python11.test b/tests/python11.test
index bcd71e7..1c636fa 100755
--- a/tests/python11.test
+++ b/tests/python11.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2004, 2006  Free Software Foundation, Inc.
+# Copyright (C) 2004, 2006, 2008  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -39,9 +39,9 @@ EOF
 $ACLOCAL
 $AUTOCONF
 
-./configure >stdout 2>stderr && exit 1
+./configure >stdout 2>stderr && { cat stdout; cat stderr >&2; exit 1; }
 cat stdout
-cat stderr
+cat stderr >&2
 grep 'checking for IShouldNotExist1' stdout
 grep 'checking for IShouldNotExist2' stdout
 grep 'no suitable Python interpreter found' stderr
@@ -54,6 +54,6 @@ $AUTOCONF
 ./configure
 
 # Any user setting should be used.
-./configure PYTHON=foo >stdout && exit 1
+./configure PYTHON=foo >stdout && { cat stdout; exit 1; }
 cat stdout
 grep 'PYTHON = foo' stdout
diff --git a/tests/python4.test b/tests/python4.test
index 96e596d..98bd1f6 100755
--- a/tests/python4.test
+++ b/tests/python4.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2003  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2008  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -37,6 +37,6 @@ $AUTOCONF
 $AUTOMAKE --add-missing
 
 # Simulate no Python
-./configure PYTHON=: 2>stderr && exit 1
-cat stderr
+./configure PYTHON=: 2>stderr && { cat stderr >&2; exit 1; }
+cat stderr >&2
 grep 'no suitable Python interpreter found' stderr
diff --git a/tests/python5.test b/tests/python5.test
index c6a3758..3c608b0 100755
--- a/tests/python5.test
+++ b/tests/python5.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2003  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2008  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -38,6 +38,6 @@ $ACLOCAL
 $AUTOCONF
 $AUTOMAKE --add-missing
 
-./configure 2>stderr && exit 1
-cat stderr
+./configure 2>stderr && { cat stderr >&2; exit 1; }
+cat stderr >&2
 grep 'no suitable Python interpreter found' stderr
diff --git a/tests/unused.test b/tests/unused.test
index e8a0434..6fef5b7 100755
--- a/tests/unused.test
+++ b/tests/unused.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 1998, 2002, 2003  Free Software Foundation, Inc.
+# Copyright (C) 1998, 2002, 2003, 2008  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -33,5 +33,5 @@ AC_DEFUN([MACRO_1_2], echo 12)
 AC_DEFUN([MACRO_1_2_3], echo 123)
 END
 
-$ACLOCAL 2> output || exit 1
-test -z "`cat output`"
+$ACLOCAL 2> stderr || { cat stderr >&2; exit 1; }
+test -z "`cat stderr`"
diff --git a/tests/version8.test b/tests/version8.test
index a681749..cd08403 100755
--- a/tests/version8.test
+++ b/tests/version8.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2005  Free Software Foundation, Inc.
+# Copyright (C) 2005, 2008  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -24,5 +24,6 @@
 
 set -e
 echo 'AM_AUTOMAKE_VERSION([1.9])' >>configure.in
-$ACLOCAL 2>stderr && exit 0
+$ACLOCAL 2>stderr && { cat stderr >&2; exit 0; }
+cat stderr >&2
 $FGREP 'AM_INIT_AUTOMAKE([1.9])' stderr


hooks/post-receive
--
GNU Automake