X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/279cabb657e5116d9fd4badace040f36f579199a..215b40ac9e629ed8b1e130c59c6a9d8a1b1816bc:/tests/output.at?ds=sidebyside diff --git a/tests/output.at b/tests/output.at index 06f30c79..fe5708c4 100644 --- a/tests/output.at +++ b/tests/output.at @@ -1,21 +1,19 @@ # Checking the output filenames. -*- Autotest -*- -# Copyright (C) 2000, 2001, 2002, 2005, 2006, 2007 Free Software Foundation, -# Inc. +# Copyright (C) 2000, 2001, 2002, 2005, 2006, 2007, 2008 Free Software +# Foundation, Inc. -# This program is free software; you can redistribute it and/or modify +# 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 -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. - +# # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program. If not, see . AT_BANNER([[Output file names.]]) @@ -24,17 +22,19 @@ AT_BANNER([[Output file names.]]) # [ADDITIONAL-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]) +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 @@ -107,20 +107,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 @@ -132,7 +146,7 @@ AT_DATA([$1], foo: {}; ]]) -AT_CHECK([bison $3 $1], 0, [], [$4]) +AT_BISON_CHECK([$3 $1], $5, [], [$4]) AT_CLEANUP ]) @@ -147,17 +161,21 @@ 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: fatal error: 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_DATA([glr.y], +AT_DATA_GRAMMAR([glr.y], [[%glr-parser %code { int yylex (void); @@ -166,18 +184,18 @@ AT_DATA([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 -AT_DATA([cxx.y], +AT_DATA_GRAMMAR([cxx.y], [[%skeleton "lalr1.cc" %code { int yylex (yy::parser::semantic_type*); } %% 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 @@ -188,6 +206,12 @@ 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([[#]])