c++: use YYRHSLOC.

[bison.git] / tests / output.at

diff --git a/tests/output.at b/tests/output.at
index a62d77a5919d89adc90de1061047d49baa93aa03..564674e1055cc3d9bef2273b210200471dd16d5f 100644 (file)
--- a/tests/output.at
+++ b/tests/output.at
@@ -1,6 +1,5 @@
 # Checking the output filenames.                    -*- Autotest -*-
-# Copyright (C) 2000, 2001, 2002, 2005, 2006, 2007, 2008 Free Software
-# Foundation, Inc.
+# Copyright (C) 2000-2002, 2005-2010 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
@@ -146,7 +145,13 @@ AT_DATA([$1],
 foo: {};
 ]])
 
-AT_BISON_CHECK([$3 $1], $5, [], [$4])
+[cp ]$1[ expout]
+# 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
 ])
 
@@ -166,7 +171,7 @@ AT_CHECK_CONFLICTING_OUTPUT([foo.y],
 ])
 
 AT_CHECK_CONFLICTING_OUTPUT([foo.y], [], [-o foo.y],
-[foo.y: fatal error: refusing to overwrite the input file `foo.y'
+[foo.y: refusing to overwrite the input file `foo.y'
 ], 1)
 
 
@@ -175,6 +180,10 @@ AT_CHECK_CONFLICTING_OUTPUT([foo.y], [], [-o foo.y],
 m4_define([AT_CHECK_OUTPUT_FILE_NAME],
 [AT_SETUP([Output file name: $1])
 
+# 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]])
+
 AT_DATA_GRAMMAR([glr.y],
 [[%glr-parser
 %code {
@@ -208,12 +217,13 @@ AT_CLEANUP
 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.
-m4_define([m4_expand], [_$0(-=<{($1)}>=-)])
+m4_version_prereq([2.63], [],
+[m4_define([m4_expand], [_$0(-=<{($1)}>=-)])
 m4_define([_m4_expand],
-[m4_changequote([-=<{(], [)}>=-])$1m4_changequote([, ])])
+[m4_changequote([-=<{(], [)}>=-])$1m4_changequote([, ])])])
 AT_CHECK_OUTPUT_FILE_NAME([[(]])
 AT_CHECK_OUTPUT_FILE_NAME([[)]])
-AT_CHECK_OUTPUT_FILE_NAME([[#]])
+AT_CHECK_OUTPUT_FILE_NAME([[@%:@]])
 AT_CHECK_OUTPUT_FILE_NAME([[@@]])
 AT_CHECK_OUTPUT_FILE_NAME([[@{]])
 AT_CHECK_OUTPUT_FILE_NAME([[@}]])