tests: handle Valgrind that complains about >&-.

* tests/output.at (AT_CHECK_OUTPUT): Extend to accept pre-tests.
(Output files: -dv >&-): Skip test group if running
maintainer-check-valgrind.
(cherry picked from commit c027cccb351b7b553f92a827787fa91d28934e5c)

diff --git a/ChangeLog b/ChangeLog
index b6fe8058002cec7f6e5c2b308725fe7c914266a5..b011b0820bb09c188b6706c02cda3bd3e6bb485b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-07-24  Joel E. Denny  <joeldenny@joeldenny.org>
+
+       tests: handle Valgrind that complains about >&-.
+       * tests/output.at (AT_CHECK_OUTPUT): Extend to accept pre-tests.
+       (Output files: -dv >&-): Skip test group if running
+       maintainer-check-valgrind.
+
 2010-06-17  Paul Eggert  <eggert@cs.ucla.edu>
 
        Update from GFDL GFDL 1.2 to 1.3.

diff --git a/tests/output.at b/tests/output.at
index 176191f4ee3aa1a0cf47e80e91b0fd9c095981c8..5eb778dc8e66d6d2528c1e1bc11db741ba69223a 100644 (file)
--- a/tests/output.at
+++ b/tests/output.at
@@ -20,10 +20,11 @@ AT_BANNER([[Output file names.]])
 
 
 # AT_CHECK_OUTPUT(INPUT-FILE, [DIRECTIVES], [FLAGS], EXPECTED-FILES, [SHELLIO],
-#                 [ADDITIONAL-TESTS])
+#                 [ADDITIONAL-TESTS], [PRE-TESTS])
 # -----------------------------------------------------------------------------
 m4_define([AT_CHECK_OUTPUT],
 [AT_SETUP([[Output files: $2 $3 $5]])
+$7
 for file in $1 $4; do
   case "$file" in
     */*) mkdir -p `echo "$file" | sed 's,/.*,,'`;;
@@ -43,9 +44,15 @@ AT_CLEANUP
 
 AT_CHECK_OUTPUT([foo.y], [], [-dv],
                [foo.output foo.tab.c foo.tab.h])
+
+# Some versions of Valgrind (at least valgrind-3.6.0.SVN-Debian) report
+# "fgrep: write error: Bad file descriptor" when stdout is closed, so we
+# skip this test group during maintainer-check-valgrind.
 AT_CHECK_OUTPUT([foo.y], [], [-dv],
                [foo.output foo.tab.c foo.tab.h],
-               [>&-])
+               [>&-], [],
+               [AT_CHECK([[case "$PREBISON" in *valgrind*) exit 77;; esac]])])
+
 AT_CHECK_OUTPUT([foo.y], [], [-dv -o foo.c],
                [foo.c foo.h foo.output])
 AT_CHECK_OUTPUT([foo.y], [], [-dv -o foo.tab.c],