From c027cccb351b7b553f92a827787fa91d28934e5c Mon Sep 17 00:00:00 2001 From: "Joel E. Denny" Date: Sat, 24 Jul 2010 16:30:07 -0400 Subject: [PATCH] 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. --- ChangeLog | 7 +++++++ tests/output.at | 11 +++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 64aaf004..9f621d2e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2010-07-24 Joel E. Denny + + 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-07-21 Akim Demaille Pacify gcc warnings. diff --git a/tests/output.at b/tests/output.at index 176191f4..5eb778dc 100644 --- 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], -- 2.45.2