regen.

[bison.git] / tests / output.at

diff --git a/tests/output.at b/tests/output.at
index 999ca18420ca2621c2f96497b2a56e608c68660b..058ae89a96051c6fe205b6a5e79e14e9d1445ab0 100644 (file)
--- a/tests/output.at
+++ b/tests/output.at
@@ -1,5 +1,6 @@
 # Checking the output filenames.                    -*- Autotest -*-
 # 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
 
 # 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],
 
 
 # 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]])
 # -----------------------------------------------------------------------------
 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,/.*,,'`;;
 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])
 
 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_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],
 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])
 
 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],[],
 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],[],


@@ -138,28 +146,32 @@ foo: {};
 ]])
 
 [cp ]$1[ expout]
 ]])
 
 [cp ]$1[ expout]

-AT_BISON_CHECK([$3 $1], $5, [], [$4])
+# Because an output file name conflict is still a warning, Bison exits
+# with status 0, so AT_BISON_CHECK does not realize that there may be no
+# output file against which to check the XML.  AT_BISON_CHECK_NO_XML
+# avoids that problem.
+AT_BISON_CHECK_NO_XML([$3 $1], $5, [], [$4])

 AT_CHECK([[cat $1]], [[0]], [expout])
 AT_CLEANUP
 ])
 
 AT_CHECK_CONFLICTING_OUTPUT([foo.y],
 [], [--graph="foo.tab.c"],
 AT_CHECK([[cat $1]], [[0]], [expout])
 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],
 ])
 
 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"],
 ])
 
 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],
 ])
 
 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)
 
 
 ], 1)
 
 


@@ -201,7 +213,7 @@ AT_CLEANUP
 ])
 
 # Notice that the header file name here cannot contain
 ])
 
 # 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.
 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.