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

[Ralf Wildenhues]

Hi Stefano,

* Stefano Lattarini wrote on Fri, Jun 11, 2010 at 09:22:40PM CEST:
> * 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.

This is ok for maint, except that cscope.test does not exist on maint.
I folded the patch below into it, committed on maint, and commited a
separate patch for cscope.test in your name to dr-cscope, and merged
that into master again.

Thanks,
Ralf

diff --git a/tests/acloca18.test b/tests/acloca18.test
index a50699a..c38fac4 100755
--- a/tests/acloca18.test
+++ b/tests/acloca18.test
@@ -106,13 +106,13 @@ AC_DEFUN([AM_MACRO1], [echo macro1d >> foo])
 AC_DEFUN([AM_MACRO2], [echo macro2d >> foo])
 EOF
 rm -f foo
-$ACLOCAL --diff=diff >output 2>stderr || {
+$ACLOCAL --diff=diff >stdout 2>stderr || {
   cat stderr >&2
-  cat output
+  cat stdout
   Exit 1
 }
 cat stderr >&2
-cat output
-grep '#serial 456' output
+cat stdout
+grep '#serial 456' stdout
 test ! -f 4/m1.m4
 grep 'installing.*4/m1.m4' stderr
diff --git a/tests/ansi3.test b/tests/ansi3.test
index 8e427f8..e1e0c42 100755
--- a/tests/ansi3.test
+++ b/tests/ansi3.test
@@ -1,5 +1,6 @@
 #! /bin/sh
-# Copyright (C) 1998, 1999, 2001, 2002, 2003  Free Software Foundation, Inc.
+# Copyright (C) 1998, 1999, 2001, 2002, 2003, 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
diff --git a/tests/ansi3b.test b/tests/ansi3b.test
index 8f82638..ad222ff 100755
--- a/tests/ansi3b.test
+++ b/tests/ansi3b.test
@@ -1,5 +1,6 @@
 #! /bin/sh
-# Copyright (C) 1998, 1999, 2001, 2002, 2003  Free Software Foundation, Inc.
+# Copyright (C) 1998, 1999, 2001, 2002, 2003, 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
diff --git a/tests/cond39.test b/tests/cond39.test
index 425698e..8d96595 100755
--- a/tests/cond39.test
+++ b/tests/cond39.test
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2008  Free Software Foundation, Inc.
+# Copyright (C) 2008, 2010 Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
diff --git a/tests/missing4.test b/tests/missing4.test
index 77874e6..13a4c22 100755
--- a/tests/missing4.test
+++ b/tests/missing4.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2006, 2007, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2006, 2007, 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
diff --git a/tests/output-order.test b/tests/output-order.test
index 4e9159c..cb9ffff 100755
--- a/tests/output-order.test
+++ b/tests/output-order.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
diff --git a/tests/pr300-ltlib.test b/tests/pr300-ltlib.test
index 5c5a85a..c6f9a5e 100755
--- a/tests/pr300-ltlib.test
+++ b/tests/pr300-ltlib.test
@@ -1,5 +1,6 @@
 #! /bin/sh
-# Copyright (C) 2002, 2007, 2008, 2009  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2007, 2008, 2009, 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
diff --git a/tests/python6.test b/tests/python6.test
index fd484d0..86dcfbb 100755
--- a/tests/python6.test
+++ b/tests/python6.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2003  Free Software Foundation, Inc.
+# Copyright (C) 2003, 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
diff --git a/tests/python7.test b/tests/python7.test
index 989bebd..27b2e79 100755
--- a/tests/python7.test
+++ b/tests/python7.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2003  Free Software Foundation, Inc.
+# Copyright (C) 2003, 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
diff --git a/tests/python8.test b/tests/python8.test
index c5812a1..51d02ad 100755
--- a/tests/python8.test
+++ b/tests/python8.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2003  Free Software Foundation, Inc.
+# Copyright (C) 2003, 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
diff --git a/tests/python9.test b/tests/python9.test
index 95cee70..6a91e9f 100755
--- a/tests/python9.test
+++ b/tests/python9.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2003  Free Software Foundation, Inc.
+# Copyright (C) 2003, 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
diff --git a/tests/subobj.test b/tests/subobj.test
index 8c24083..64edd0e 100755
--- a/tests/subobj.test
+++ b/tests/subobj.test
@@ -1,5 +1,6 @@
 #! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2004  Free Software Foundation, Inc.
+# Copyright (C) 1999, 2001, 2002, 2004, 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
diff --git a/tests/vars3.test b/tests/vars3.test
index bfd65b5..6b738ab 100755
--- a/tests/vars3.test
+++ b/tests/vars3.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002  Free Software Foundation, Inc.
+# Copyright (C) 2002, 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