X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/f16b08196c780556cbf50691e2944960aebc46f6..fe3cae17a1dd2afa1eb34239ba497252892b2090:/tests/output.at?ds=sidebyside diff --git a/tests/output.at b/tests/output.at index 8aae22c4..3446369c 100644 --- a/tests/output.at +++ b/tests/output.at @@ -1,6 +1,6 @@ # Checking the output filenames. -*- Autotest -*- -# Copyright (C) 2000, 2001, 2002, 2005, 2006, 2007 Free Software Foundation, -# Inc. + +# Copyright (C) 2000-2002, 2005-2011 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 @@ -19,20 +19,23 @@ 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]]) -case "$1" in - */*) mkdir `echo "$1" | sed 's,/.*,,'`;; -esac +[AT_SETUP([[Output files: ]$2 $3 $5]) +$7 +for file in $1 $4; do + case "$file" in + */*) mkdir -p `echo "$file" | sed 's,/.*,,'`;; + esac +done AT_DATA([$1], -[[$2 +[$2[ %% foo: {}; ]]) -AT_CHECK([bison $3 $1 $5], 0) +AT_BISON_CHECK([$3 $1 $5], 0) AT_CHECK([ls $4], [], [ignore]) $6 AT_CLEANUP @@ -40,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], @@ -105,20 +114,34 @@ AT_CHECK([grep 'include .subdir/' $1.hh], 1, []) ]) AT_CHECK_OUTPUT([foo.yy], [%skeleton "lalr1.cc" %defines %verbose], [], + [foo.tab.cc foo.tab.hh foo.output stack.hh]) + +AT_CHECK_OUTPUT([foo.yy], [%skeleton "lalr1.cc" %defines %verbose %locations], [], [foo.tab.cc foo.tab.hh foo.output location.hh stack.hh position.hh]) AT_CHECK_OUTPUT([subdir/foo.yy], [%skeleton "lalr1.cc" %defines %verbose], [], - [foo.tab.cc foo.tab.hh foo.output location.hh stack.hh position.hh], + [foo.tab.cc foo.tab.hh foo.output stack.hh], [], [AT_CHECK_NO_SUBDIR_PART([foo.tab])]) -AT_CHECK_OUTPUT([subdir/foo.yy], [%skeleton "lalr1.cc" %defines %verbose], +AT_CHECK_OUTPUT([subdir/foo.yy], [%skeleton "lalr1.cc" %defines %verbose %locations], [-o subdir/foo.cc], [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/stack.hh]) -# AT_CHECK_CONFLICTING_OUTPUT(INPUT-FILE, DIRECTIVES, FLAGS, STDERR) -# ----------------------------------------------------------------------------- +AT_CHECK_OUTPUT([gram_dir/foo.yy], + [%skeleton "lalr1.cc" %defines %locations %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]) +# ------------------------------------------------------------------ m4_define([AT_CHECK_CONFLICTING_OUTPUT], [AT_SETUP([Conflicting output files: $2 $3]) case "$1" in @@ -130,7 +153,13 @@ AT_DATA([$1], foo: {}; ]]) -AT_CHECK([bison $3 $1], 0, [], [$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 ]) @@ -145,16 +174,24 @@ AT_CHECK_CONFLICTING_OUTPUT([foo.y], ]) AT_CHECK_CONFLICTING_OUTPUT([foo.y], -[%skeleton "lalr1.cc" %defines], [--graph="location.hh"], +[%skeleton "lalr1.cc" %defines %locations], [--graph="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' +], 1) + # AT_CHECK_OUTPUT_FILE_NAME(FILE-NAME-PREFIX, [ADDITIONAL-TESTS]) -# ----------------------------------------------------------------------------- +# --------------------------------------------------------------- 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 { @@ -164,7 +201,7 @@ AT_DATA_GRAMMAR([glr.y], %% start: {}; ]]) -AT_CHECK([bison -o "AS_ESCAPE([$1.c])" --defines="AS_ESCAPE([$1.h])" glr.y]) +AT_BISON_CHECK([-o "AS_ESCAPE([$1.c])" --defines="AS_ESCAPE([$1.h])" glr.y]) AT_CHECK([ls "AS_ESCAPE([$1.c])" "AS_ESCAPE([$1.h])"], [], [ignore]) AT_COMPILE([glr.o], [-c "AS_ESCAPE([$1.c])"]) $2 @@ -175,7 +212,7 @@ AT_DATA_GRAMMAR([cxx.y], %% start: {}; ]]) -AT_CHECK([bison -o "AS_ESCAPE([$1.c])" --defines="AS_ESCAPE([$1.h])" cxx.y]) +AT_BISON_CHECK([-o "AS_ESCAPE([$1.c])" --defines="AS_ESCAPE([$1.h])" cxx.y]) AT_CHECK([ls "AS_ESCAPE([$1.c])" "AS_ESCAPE([$1.h])"], [], [ignore]) AT_COMPILE_CXX([cxx.o], [-c "AS_ESCAPE([$1.c])"]) $2 @@ -186,9 +223,15 @@ AT_CLEANUP # Notice that the header file name here cannot contain # `"' 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. +m4_version_prereq([2.63], [], +[m4_define([m4_expand], [_$0(-=<{($1)}>=-)]) +m4_define([_m4_expand], +[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([[@}]])