X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/c50befe6152b25faa8d872d3ac97812e1ae85f43..813f7d34824153ac3259fdd34fce5710d3b7606c:/tests/output.at

diff --git a/tests/output.at b/tests/output.at
index 22f125bf..f7a7d8e5 100644
--- a/tests/output.at
+++ b/tests/output.at
@@ -1,5 +1,6 @@
 # Checking the output filenames.                    -*- Autotest -*-
-# Copyright (C) 2000-2002, 2005-2010 Free Software Foundation, Inc.
+
+# Copyright (C) 2000-2002, 2005-2012 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
@@ -18,10 +19,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,/.*,,'`;;
@@ -41,9 +43,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],
@@ -64,7 +72,7 @@ AT_CHECK_OUTPUT([foo.y], [%defines %verbose %yacc],[],
 AT_CHECK_OUTPUT([foo.yy], [%defines %verbose %yacc],[],
 		[y.output y.tab.c y.tab.h])
 
-# Exercise %output and %file-prefix including deprecated `='
+# Exercise %output and %file-prefix including deprecated '='
 AT_CHECK_OUTPUT([foo.y], [%file-prefix "bar" %defines %verbose],      [],
 		[bar.output bar.tab.c bar.tab.h])
 AT_CHECK_OUTPUT([foo.y], [%output="bar.c" %defines %verbose %yacc],[],
@@ -149,29 +157,30 @@ AT_CLEANUP
 
 AT_CHECK_CONFLICTING_OUTPUT([foo.y],
 [], [--graph="foo.tab.c"],
-[foo.y: warning: conflicting outputs to file `foo.tab.c'
+[foo.y: warning: conflicting outputs to file 'foo.tab.c'
 ])
 
 AT_CHECK_CONFLICTING_OUTPUT([foo.y],
 [%defines "foo.output"], [-v],
-[foo.y: warning: conflicting outputs to file `foo.output'
+[foo.y: warning: conflicting outputs to file 'foo.output'
 ])
 
 AT_CHECK_CONFLICTING_OUTPUT([foo.y],
 [%skeleton "lalr1.cc" %defines], [--graph="location.hh"],
-[foo.y: warning: conflicting outputs to file `location.hh'
+[foo.y: warning: conflicting outputs to file 'location.hh'
 ])
 
 AT_CHECK_CONFLICTING_OUTPUT([foo.y], [], [-o foo.y],
-[foo.y: refusing to overwrite the input file `foo.y'
+[foo.y: refusing to overwrite the input file 'foo.y'
 ], 1)
 
 
 # AT_CHECK_OUTPUT_FILE_NAME(FILE-NAME-PREFIX, [ADDITIONAL-TESTS])
-# -----------------------------------------------------------------------------
+# ---------------------------------------------------------------
 m4_define([AT_CHECK_OUTPUT_FILE_NAME],
 [AT_SETUP([Output file name: $1])
 
+AT_BISON_OPTION_PUSHDEFS
 # Skip if platform doesn't support file name.  For example, Cygwin
 # doesn't support file names containing ":" or "\".
 AT_CHECK([[touch "]AS_ESCAPE([$1[.tmp]])[" || exit 77]])
@@ -179,8 +188,8 @@ AT_CHECK([[touch "]AS_ESCAPE([$1[.tmp]])[" || exit 77]])
 AT_DATA_GRAMMAR([glr.y],
 [[%glr-parser
 %code {
-  int yylex (void);
-  void yyerror (const char *);
+]AT_YYERROR_DECLARE_EXTERN[
+]AT_YYLEX_DECLARE_EXTERN[
 }
 %%
 start: {};
@@ -201,11 +210,12 @@ AT_CHECK([ls "AS_ESCAPE([$1.c])" "AS_ESCAPE([$1.h])"], [], [ignore])
 AT_COMPILE_CXX([cxx.o], [-c "AS_ESCAPE([$1.c])"])
 $2
 
+AT_BISON_OPTION_POPDEFS
 AT_CLEANUP
 ])
 
 # Notice that the header file name here cannot contain
-# `"' since FILENAME in `#include "FILENAME"' cannot.
+# '"' since FILENAME in '#include "FILENAME"' cannot.
 AT_CHECK_OUTPUT_FILE_NAME([[`~!@#$%^&*()-=_+{}[]|\:;<>, .']])
 dnl Work around a bug in m4_expand that broke AT_SETUP in autoconf 2.62,
 dnl by using the definition from 2.63.