From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Wed, 22 Oct 2008 19:21:55 +0000 (+0200)
Subject: Let stderr output end up on fd 2 in testsuite.
X-Git-Tag: v1.10b~83
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8efaeb33f3e662005bfe504264c54ee72b45156;p=thirdparty%2Fautomake.git

Let stderr output end up on fd 2 in testsuite.

* tests/defs.in (AUTOMAKE_run): Output recorded stderr on file
descriptor 2.
* tests/getopt.test: Fix erroneous multiple redirection,
uncovered by above change.

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

diff --git a/ChangeLog b/ChangeLog
index 9edc0572a..3a7967dcc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-10-22  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	Let stderr output end up on fd 2 in testsuite.
+	* tests/defs.in (AUTOMAKE_run): Output recorded stderr on file
+	descriptor 2.
+	* tests/getopt.test: Fix erroneous multiple redirection,
+	uncovered by above change.
+
 2008-10-19  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	Fix DisjConditions module to be thread-safe for perl >= 5.7.2.
diff --git a/tests/defs.in b/tests/defs.in
index c0e310f5d..e7d9d3935 100644
--- a/tests/defs.in
+++ b/tests/defs.in
@@ -382,7 +382,7 @@ AUTOMAKE_run ()
   shift
   exitcode=0
   $AUTOMAKE ${1+"$@"} >stdout 2>stderr || exitcode=$?
-  cat stderr
+  cat stderr >&2
   cat stdout
   test $exitcode = $expected_exitcode || Exit 1
 }
diff --git a/tests/getopt.test b/tests/getopt.test
index 46fcb4e81..8dc9512ae 100755
--- a/tests/getopt.test
+++ b/tests/getopt.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2008  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
@@ -31,7 +31,7 @@ grep ':.*nonexistent' stderr && Exit 1
 
 
 # Similarly, this should fail ...
-AUTOMAKE_fails --nonexistent 2>stderr
+AUTOMAKE_fails --nonexistent
 grep ':.*nonexistent' stderr
 
 # ... but this should not.