X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/c0ee9e21157b86eeb151debcc1b8f4b1ca7e9eb8..e7bab2df968dd287d0a35a6c8a38569332af2ca2:/tests/output.at diff --git a/tests/output.at b/tests/output.at index 3e815d70..22f125bf 100644 --- 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 @@ -23,9 +22,11 @@ AT_BANNER([[Output file names.]]) # ----------------------------------------------------------------------------- m4_define([AT_CHECK_OUTPUT], [AT_SETUP([[Output files: $2 $3 $5]]) -case "$1" in - */*) mkdir `echo "$1" | sed 's,/.*,,'`;; -esac +for file in $1 $4; do + case "$file" in + */*) mkdir -p `echo "$file" | sed 's,/.*,,'`;; + esac +done AT_DATA([$1], [[$2 %% @@ -116,6 +117,11 @@ AT_CHECK_OUTPUT([subdir/foo.yy], [%skeleton "lalr1.cc" %defines %verbose], [subdir/foo.cc subdir/foo.hh subdir/foo.output subdir/location.hh subdir/stack.hh subdir/position.hh], [], [AT_CHECK_NO_SUBDIR_PART([subdir/foo])]) +AT_CHECK_OUTPUT([gram_dir/foo.yy], + [%skeleton "lalr1.cc" %defines %verbose %file-prefix "output_dir/foo"], + [], + [output_dir/foo.tab.cc output_dir/foo.tab.hh output_dir/foo.output output_dir/location.hh output_dir/stack.hh output_dir/position.hh]) + # AT_CHECK_CONFLICTING_OUTPUT(INPUT-FILE, DIRECTIVES, FLAGS, STDERR, # [EXIT-STATUS]) @@ -131,7 +137,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 ]) @@ -151,7 +163,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) @@ -160,6 +172,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 { @@ -193,12 +209,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([[@}]])