testsuite: ensure verbose printing of captured output.

* tests/acloca14.test, tests/acloca18.test, tests/aclocal.test,
tests/fort2.test, tests/help.test, tests/missing3.test,
tests/missing6.test: Print captured stdout or stderr before
grepping it.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index d8398ccbc3b6d171afcd83454ca15d8c2e40165e..e6f3d455154383a6d44d878ee622bdd91eacdee5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-04-25  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       testsuite: ensure verbose printing of captured output.
+       * tests/acloca14.test, tests/acloca18.test, tests/aclocal.test,
+       tests/fort2.test, tests/help.test, tests/missing3.test,
+       tests/missing6.test: Print captured stdout or stderr before
+       grepping it.
+
 2010-04-20  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
        Make test badopt.test stricter (by enabling `set -e').

diff --git a/tests/acloca14.test b/tests/acloca14.test
index 8ddbb1a81827a5ecde63324bdd30bcf5762e0903..a4e86d751cd08188bd0541244ab952fb7c39f7f6 100755 (executable)
--- a/tests/acloca14.test
+++ b/tests/acloca14.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2004, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2004, 2008, 2010 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -109,4 +109,5 @@ $MAKE testdist2
 # Make sure aclocal diagnose missing included files with correct `file:line:'.
 rm -f b.m4
 $ACLOCAL 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
 grep 'a.m4:1:.*b.m4.*does not exist' stderr

diff --git a/tests/acloca18.test b/tests/acloca18.test
index 22feb23050e16762c2b5cda3f92f8c87033f1c46..276e5ba7bc8bc108e59b5375c2b1fc010a75fc8a 100755 (executable)
--- a/tests/acloca18.test
+++ b/tests/acloca18.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2005, 2006, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2005, 2006, 2008, 2010 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -87,6 +87,7 @@ grep macro23 foo
 ACLOCAL_TESTSUITE_FLAGS='-I 4 -I 1 -I 2'
 rm -f foo
 $ACLOCAL --install 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
 grep AM_MACRO2 stderr
 
 ACLOCAL_TESTSUITE_FLAGS='-I 4 -I 1'

diff --git a/tests/aclocal.test b/tests/aclocal.test
index 6b87a9dd9e7cac5667a2dd9cc2027255faf5fb98..d3437d26c37dce34b42273cc6affad016aa447f9 100755 (executable)
--- a/tests/aclocal.test
+++ b/tests/aclocal.test
@@ -1,5 +1,6 @@
 #! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2004, 2008  Free Software Foundation, Inc.
+# Copyright (C) 1998, 2001, 2002, 2004, 2008, 2010 Free Software
+# Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -24,14 +25,17 @@ $ACLOCAL --output=fred
 test -f fred
 
 $ACLOCAL --output 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
 grep 'option.*--output.*an argument' stderr
 grep help stderr
 
 $ACLOCAL --unknown-option 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
 grep 'unrecognized.*--unknown-option' stderr
 grep help stderr
 
 $ACLOCAL --ver 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
 grep 'unrecognized.*--ver' stderr
 grep help stderr
 

diff --git a/tests/fort2.test b/tests/fort2.test
index 356818936e8421f32baed26ec23f0625400f415b..70d13f25e8bd3bb8f51b7f5782e739c786d1457b 100755 (executable)
--- a/tests/fort2.test
+++ b/tests/fort2.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2006, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -48,6 +48,7 @@ $AUTOMAKE
 grep '.\$(LINK)'       Makefile.in && Exit 1
 grep '.\$(FCLINK)'     Makefile.in
 grep '.\$(FCCOMPILE)'  Makefile.in > stdout
+cat stdout
 grep -v '\$(FCFLAGS_f' stdout && Exit 1
 grep '.\$(FC.*\$(FCFLAGS_blabla' Makefile.in && Exit 1
 # Notice the TAB:

diff --git a/tests/help.test b/tests/help.test
index d4d7110af06b3b5d30f34f2591618c145e970400..e9ccf62ce332618941ed3c833f2cac7e62a61d9a 100755 (executable)
--- a/tests/help.test
+++ b/tests/help.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2003, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2008, 2010 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -33,6 +33,7 @@ $AUTOMAKE --help
 
 # aclocal and automake cannot work without configure.ac or configure.in
 $ACLOCAL 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
 grep configure.ac stderr
 grep configure.in stderr
 AUTOMAKE_fails

diff --git a/tests/missing3.test b/tests/missing3.test
index 07ef77990b1716ba8e36bb2b39ee2c99bf3d7c25..d3a7823351339f04725aea797a17308b9088c492 100755 (executable)
--- a/tests/missing3.test
+++ b/tests/missing3.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2004, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2004, 2008, 2010 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -23,23 +23,30 @@ set -e
 # b7cb8259 assumed not to exist.
 
 ./missing b7cb8259 --version 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
 grep . stderr && Exit 1
 ./missing b7cb8259 --grep 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
 grep WARNING stderr
 
 ./missing --run b7cb8259 --version && Exit 1
 ./missing --run b7cb8259 --grep 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
 grep WARNING stderr
 
 # missing itself it known to exist :)
 
 ./missing ./missing --version 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
 grep . stderr && Exit 1
 ./missing ./missing --grep 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
 grep WARNING stderr
 
 ./missing --run ./missing --version 2>stderr
+cat stderr >&2
 grep . stderr && Exit 1
 ./missing --run ./missing --grep 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
 grep WARNING stderr && Exit 1
 grep Unknown stderr

diff --git a/tests/missing6.test b/tests/missing6.test
index b63a0d1af2df544cf9c3e757c6a08fb1b58f4070..914546b667fa08f1b4f100ed0cc34462fbf64d13 100755 (executable)
--- a/tests/missing6.test
+++ b/tests/missing6.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2008  Free Software Foundation, Inc.
+# Copyright (C) 2008, 2010 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -32,6 +32,7 @@ touch Makefile.am
 
 $ACLOCAL
 $AUTOCONF 2>stderr
+cat stderr >&2
 grep 'You have another version of autoconf' stderr
 grep 'aclocal.m4:.*this file was generated for' stderr
 $AUTOMAKE