[PATCH] Testsuite: ensure verbose printing of captured stderr.

[Stefano Lattarini]

* tests/acloca18.test: Print captured stderr before either failing
or grepping it.  Be sure to send captured stderr to stderr, not to
stdout.
* tests/ansi3b.test: Likewise.
* tests/cond39.test: Likewise.
* tests/configure.test: Likewise.
* tests/cscope.test: Likewise.
* tests/missing3.test: Likewise.
* tests/missing6.test: Likewise.
* tests/output-order.test: Likewise.
* tests/pr300-ltlib.test: Likewise.
* tests/python6.test: Likewise.
* tests/python7.test: Likewise.
* tests/python8.test: Likewise.
* tests/python9.test: Likewise.
* tests/subobj.test: Likewise.
* tests/vars3.test: Likewise.
* tests/missing4.test: Likewise, and fix a call to grep not to use
the `-c' flag.
* tests/ansi3.test: Likewise, and rely on the `configure.in' stub
created by `./defs', rather than writing one from scratch.
---
 ChangeLog               |   23 +++++++++++++++++++++++
 tests/acloca18.test     |    8 ++++++--
 tests/ansi3.test        |   10 ++++------
 tests/ansi3b.test       |    4 ++--
 tests/cond39.test       |   10 ++++++----
 tests/configure.test    |    2 +-
 tests/cscope.test       |    4 ++--
 tests/missing3.test     |    2 +-
 tests/missing4.test     |   10 +++++-----
 tests/missing6.test     |    6 +++---
 tests/output-order.test |    2 +-
 tests/pr300-ltlib.test  |    2 +-
 tests/python6.test      |    6 ++++--
 tests/python7.test      |    6 ++++--
 tests/python8.test      |    6 ++++--
 tests/python9.test      |    6 ++++--
 tests/subobj.test       |    6 ++++--
 tests/vars3.test        |    5 +++--
 18 files changed, 78 insertions(+), 40 deletions(-)

From 7edd6feeed8faf0d3fbfeb885835a5c2d3dfa68e Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <address@hidden>
Date: Fri, 11 Jun 2010 19:59:58 +0200
Subject: [PATCH] Testsuite: ensure verbose printing of captured stderr.

* tests/acloca18.test: Print captured stderr before either failing
or grepping it.  Be sure to send captured stderr to stderr, not to
stdout.
* tests/ansi3b.test: Likewise.
* tests/cond39.test: Likewise.
* tests/configure.test: Likewise.
* tests/cscope.test: Likewise.
* tests/missing3.test: Likewise.
* tests/missing6.test: Likewise.
* tests/output-order.test: Likewise.
* tests/pr300-ltlib.test: Likewise.
* tests/python6.test: Likewise.
* tests/python7.test: Likewise.
* tests/python8.test: Likewise.
* tests/python9.test: Likewise.
* tests/subobj.test: Likewise.
* tests/vars3.test: Likewise.
* tests/missing4.test: Likewise, and fix a call to grep not to use
the `-c' flag.
* tests/ansi3.test: Likewise, and rely on the `configure.in' stub
created by `./defs', rather than writing one from scratch.
---
 ChangeLog               |   23 +++++++++++++++++++++++
 tests/acloca18.test     |    8 ++++++--
 tests/ansi3.test        |   10 ++++------
 tests/ansi3b.test       |    4 ++--
 tests/cond39.test       |   10 ++++++----
 tests/configure.test    |    2 +-
 tests/cscope.test       |    4 ++--
 tests/missing3.test     |    2 +-
 tests/missing4.test     |   10 +++++-----
 tests/missing6.test     |    6 +++---
 tests/output-order.test |    2 +-
 tests/pr300-ltlib.test  |    2 +-
 tests/python6.test      |    6 ++++--
 tests/python7.test      |    6 ++++--
 tests/python8.test      |    6 ++++--
 tests/python9.test      |    6 ++++--
 tests/subobj.test       |    6 ++++--
 tests/vars3.test        |    5 +++--
 18 files changed, 78 insertions(+), 40 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6b927ba..4d0fb05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,28 @@
 2010-06-11  Stefano Lattarini  <address@hidden>
 
+       Testsuite: ensure verbose printing of captured stderr.
+       * tests/acloca18.test: Print captured stderr before either failing
+       or grepping it.  Be sure to send captured stderr to stderr, not to
+       stdout.
+       * tests/ansi3b.test: Likewise.
+       * tests/cond39.test: Likewise.
+       * tests/configure.test: Likewise.
+       * tests/cscope.test: Likewise.
+       * tests/missing3.test: Likewise.
+       * tests/missing6.test: Likewise.
+       * tests/output-order.test: Likewise.
+       * tests/pr300-ltlib.test: Likewise.
+       * tests/python6.test: Likewise.
+       * tests/python7.test: Likewise.
+       * tests/python8.test: Likewise.
+       * tests/python9.test: Likewise.
+       * tests/subobj.test: Likewise.
+       * tests/vars3.test: Likewise.
+       * tests/missing4.test: Likewise, and fix a call to grep not to use
+       the `-c' flag.
+       * tests/ansi3.test: Likewise, and rely on the `configure.in' stub
+       created by `./defs', rather than writing one from scratch.
+
        Improve determination of PATH separator in bootstrap script.
        * bootstrap: Detemine what the PATH separator is the same way
        autoconf does.
diff --git a/tests/acloca18.test b/tests/acloca18.test
index 6f2de7e..a287bec 100755
--- a/tests/acloca18.test
+++ b/tests/acloca18.test
@@ -117,8 +117,12 @@ AC_DEFUN([AM_MACRO1], [echo macro1d >> foo])
 AC_DEFUN([AM_MACRO2], [echo macro2d >> foo])
 EOF
 rm -f foo
-$ACLOCAL --diff=diff >output 2>stderr
-cat stderr
+$ACLOCAL --diff=diff >output 2>stderr || {
+  cat stderr >&2
+  cat output
+  Exit 1
+}
+cat stderr >&2
 cat output
 grep '#serial 456' output
 test ! -f 4/m1.m4
diff --git a/tests/ansi3.test b/tests/ansi3.test
index 2bbcaf7..8e427f8 100755
--- a/tests/ansi3.test
+++ b/tests/ansi3.test
@@ -22,12 +22,10 @@ required=gcc
 
 set -e
 
-cat > configure.in << 'END'
-AC_INIT(hello.c)
-AM_INIT_AUTOMAKE(hello,0.23)
+cat >> configure.in << 'END'
 AC_PROG_CC
 AM_C_PROTOTYPES
-AC_OUTPUT(Makefile)
+AC_OUTPUT
 END
 
 cat > Makefile.am << 'END'
@@ -53,8 +51,8 @@ export CFLAGS
 # Linux boxes (Red Hat 5.1 in particular).
 $ACLOCAL
 $AUTOCONF
-$AUTOMAKE -a 2>stderr
-cat stderr
+$AUTOMAKE -a 2>stderr || { cat stderr >&2; Exit 1; }
+cat stderr >&2
 grep 'Makefile.am:1:.*ansi2knr\.c' stderr
 CC='gcc' ./configure
 ANSI2KNR=./ansi2knr U=_ $MAKE -e
diff --git a/tests/ansi3b.test b/tests/ansi3b.test
index 8f254ad..8f82638 100755
--- a/tests/ansi3b.test
+++ b/tests/ansi3b.test
@@ -52,8 +52,8 @@ export CFLAGS
 # Linux boxes (Red Hat 5.1 in particular).
 $ACLOCAL
 $AUTOCONF
-$AUTOMAKE -a 2>stderr
-cat stderr
+$AUTOMAKE -a 2>stderr || { cat stderr >&2; Exit 1; }
+cat stderr >&2
 grep 'configure.in:2:.*ansi2knr\.1' stderr
 CC='gcc' ./configure
 ANSI2KNR=./ansi2knr U=_ $MAKE -e
diff --git a/tests/cond39.test b/tests/cond39.test
index 79eaa70..425698e 100755
--- a/tests/cond39.test
+++ b/tests/cond39.test
@@ -82,8 +82,8 @@ $AUTOCONF
 $AUTOMAKE --add-missing
 
 ./configure COND=true
-$MAKE 2>stderr
-cat stderr
+$MAKE 2>stderr || { cat stderr >&2; Exit 1; }
+cat stderr >&2
 grep 'overriding commands' stderr && Exit 1
 $MAKE sure-exist
 ./prog1 && Exit 1
@@ -97,8 +97,8 @@ $MAKE sure-exist
 $MAKE distclean
 
 ./configure COND=false
-$MAKE 2>stderr
-cat stderr
+$MAKE 2>stderr || { cat stderr >&2; Exit 1; }
+cat stderr >&2
 grep 'overriding commands' stderr && Exit 1
 ./prog1
 ./sub/prog2
@@ -107,3 +107,5 @@ $MAKE sure-not-exist
 $MAKE
 ./prog1
 ./sub/prog2
+
+:
diff --git a/tests/configure.test b/tests/configure.test
index f7ee977..838da68 100755
--- a/tests/configure.test
+++ b/tests/configure.test
@@ -48,7 +48,7 @@ $ACLOCAL 2>stderr && { cat stderr >&2; Exit 1; }
 cat stderr >&2
 grep 'configure.ac.*configure.in.*both present' stderr
 
-$ACLOCAL -Wno-error 2>stderr
+$ACLOCAL -Wno-error 2>stderr || { cat stderr >&2; Exit 1; }
 cat stderr >&2
 grep 'configure.ac.*configure.in.*both present' stderr
 grep 'proceeding.*configure.ac' stderr
diff --git a/tests/cscope.test b/tests/cscope.test
index e4a84a3..d85af45 100755
--- a/tests/cscope.test
+++ b/tests/cscope.test
@@ -73,7 +73,7 @@ $MAKE -n cscope
 : ${CSCOPE=cscope}
 ( $CSCOPE --version ) >/dev/null 2>&1 || Exit 77
 
-$MAKE cscope 2>stderr
+$MAKE cscope 2>stderr || { cat stderr >&2; Exit 1; }
 cat stderr >&2
 grep 'cannot find file' stderr && Exit 1
 
@@ -96,7 +96,7 @@ test ! -f cscope.po.out
 
 `pwd`/../configure || Exit 77
 
-$MAKE cscope 2>stderr
+$MAKE cscope 2>stderr || { cat stderr >&2; Exit 1; }
 cat stderr >&2
 grep 'cannot find file' stderr && Exit 1
 $MAKE || Exit 77
diff --git a/tests/missing3.test b/tests/missing3.test
index d3a7823..54044f5 100755
--- a/tests/missing3.test
+++ b/tests/missing3.test
@@ -43,7 +43,7 @@ grep . stderr && Exit 1
 cat stderr >&2
 grep WARNING stderr
 
-./missing --run ./missing --version 2>stderr
+./missing --run ./missing --version 2>stderr || { cat stderr >&2; Exit 1; }
 cat stderr >&2
 grep . stderr && Exit 1
 ./missing --run ./missing --grep 2>stderr && { cat stderr >&2; Exit 1; }
diff --git a/tests/missing4.test b/tests/missing4.test
index 1015828..77874e6 100755
--- a/tests/missing4.test
+++ b/tests/missing4.test
@@ -36,13 +36,13 @@ cmp aclocal.m4 aclocal.tmp && Exit 1
 
 mv aclocal.tmp aclocal.m4
 
-$MAKE 2>stderr
-cat stderr
+$MAKE 2>stderr || { cat cat stderr >&2; Exit 1; }
+cat stderr >&2
 grep 'You have another version of autoconf' stderr
-grep -c 'aclocal.m4:.*this file was generated for' stderr
+grep 'aclocal.m4:.*this file was generated for' stderr
 
-$MAKE 2>stderr
-cat stderr
+$MAKE 2>stderr || { cat cat stderr >&2; Exit 1; }
+cat stderr >&2
 grep 'You have another version of autoconf' stderr && Exit 1
 grep 'aclocal.m4:.*this file was generated for' stderr && Exit 1
 
diff --git a/tests/missing6.test b/tests/missing6.test
index 914546b..3994b85 100755
--- a/tests/missing6.test
+++ b/tests/missing6.test
@@ -31,7 +31,7 @@ rm -f configure.in
 touch Makefile.am
 
 $ACLOCAL
-$AUTOCONF 2>stderr
+$AUTOCONF 2>stderr || { cat stderr >&2; Exit 1; }
 cat stderr >&2
 grep 'You have another version of autoconf' stderr
 grep 'aclocal.m4:.*this file was generated for' stderr
@@ -44,8 +44,8 @@ cmp configure.ac configure.tmp && Exit 1
 
 mv configure.tmp configure.ac
 
-$MAKE 2>stderr
-cat stderr
+$MAKE 2>stderr || { cat stderr >&2; Exit 1; }
+cat stderr >&2
 grep 'You have another version of autoconf' stderr
 grep 'aclocal.m4:.*this file was generated for autoconf 9999a' stderr
 
diff --git a/tests/output-order.test b/tests/output-order.test
index 856baa2..4e9159c 100755
--- a/tests/output-order.test
+++ b/tests/output-order.test
@@ -43,7 +43,7 @@ END
 $ACLOCAL
 $AUTOCONF
 rm -f missing install-sh
-$AUTOMAKE --add-missing --copy 2>stderr
+$AUTOMAKE --add-missing --copy 2>stderr || { cat stderr >&2; Exit 1; }
 cat stderr >&2
 
 for i in 1 2 3 4 5 6; do
diff --git a/tests/pr300-ltlib.test b/tests/pr300-ltlib.test
index 01814a9..5c5a85a 100755
--- a/tests/pr300-ltlib.test
+++ b/tests/pr300-ltlib.test
@@ -58,7 +58,7 @@ grep 'libb.la .*-rpath .*lib/subdir' stdout
 test -f subdir/liba.la
 test -f subdir/libb.la
 
-$MAKE install 2>stderr
+$MAKE install 2>stderr || { cat stderr >&2; Exit 1; }
 cat stderr >&2
 grep 'remember.*--finish' stderr && Exit 1
 
diff --git a/tests/python6.test b/tests/python6.test
index eb4fb4d..fd484d0 100755
--- a/tests/python6.test
+++ b/tests/python6.test
@@ -34,6 +34,8 @@ $AUTOCONF
 $AUTOMAKE --add-missing
 
 # Simulate no Python
-./configure PYTHON=: 2>stderr
-cat stderr
+./configure PYTHON=: 2>stderr || { cat stderr >&2; Exit 1; }
+cat stderr >&2
 grep 'GREP ME:' stderr
+
+:
diff --git a/tests/python7.test b/tests/python7.test
index 62c1a1b..989bebd 100755
--- a/tests/python7.test
+++ b/tests/python7.test
@@ -34,6 +34,8 @@ $ACLOCAL
 $AUTOCONF
 $AUTOMAKE --add-missing
 
-./configure 2>stderr
-cat stderr
+./configure 2>stderr || { cat stderr >&2; Exit 1; }
+cat stderr >&2
 grep 'GREP ME:' stderr
+
+:
diff --git a/tests/python8.test b/tests/python8.test
index a50af22..c5812a1 100755
--- a/tests/python8.test
+++ b/tests/python8.test
@@ -32,6 +32,8 @@ $ACLOCAL
 $AUTOCONF
 $AUTOMAKE --add-missing
 
-./configure 2>stderr
-cat stderr
+./configure 2>stderr || { cat stderr >&2; Exit 1; }
+cat stderr >&2
 grep 'GREP ME' stderr
+
+:
diff --git a/tests/python9.test b/tests/python9.test
index 9b23deb..95cee70 100755
--- a/tests/python9.test
+++ b/tests/python9.test
@@ -33,6 +33,8 @@ $ACLOCAL
 $AUTOCONF
 $AUTOMAKE --add-missing
 
-./configure 2>stderr
-cat stderr
+./configure 2>stderr || { cat stderr >&2; Exit 1; }
+cat stderr >&2
 grep 'GREP ME' stderr
+
+:
diff --git a/tests/subobj.test b/tests/subobj.test
index df297f4..8c24083 100755
--- a/tests/subobj.test
+++ b/tests/subobj.test
@@ -32,8 +32,8 @@ wish_SOURCES = generic/a.c generic/b.c
 END
 
 $ACLOCAL
-$AUTOMAKE --add-missing 2>stderr
-cat stderr
+$AUTOMAKE --add-missing 2>stderr || { cat stderr >&2; Exit 1; }
+cat stderr >&2
 # Make sure compile is installed, and that Automake says so.
 grep 'install.*compile' stderr
 test -f compile
@@ -43,3 +43,5 @@ grep '[^/]a\.\$(OBJEXT)' Makefile.in && Exit 1
 
 # Opportunistically test for a different bug.
 grep '^generic/b.\$(OBJEXT):.*dirstamp' Makefile.in
+
+:
diff --git a/tests/vars3.test b/tests/vars3.test
index 3f61c90..e2e8e47 100755
--- a/tests/vars3.test
+++ b/tests/vars3.test
@@ -38,8 +38,9 @@ EOF
 
 $ACLOCAL
 # Make sure this warning is print in the `portability' category.
-$AUTOMAKE --warnings=no-error,none,portability 2>stderr
-cat stderr
+$AUTOMAKE --warnings=no-error,none,portability 2>stderr \
+  || { cat stderr >&2; Exit 1; }
+cat stderr >&2
 
 # Lines number are printed in error message.
 # Use them to make sure errors are diagnosed against the right lines.
-- 
1.6.5