mirror of
https://git.savannah.gnu.org/git/bison.git
synced 2026-03-16 15:53:03 +00:00
* src/scan-skel.l: Output the base name parts of the parser and
header file names. * tests/output.at (AT_CHECK_OUTPUT): Support subdirectorioes, and additional checks. Use this to exercise C++ outputs in subdirs. Reported by Oleg Smolsky.
This commit is contained in:
@@ -19,10 +19,14 @@
|
||||
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])
|
||||
# -----------------------------------------------------------------------------
|
||||
m4_define([AT_CHECK_OUTPUT],
|
||||
[AT_SETUP([Output files: $2 & $3 $5.])
|
||||
[AT_SETUP([Output files: $2 $3 $5])
|
||||
case "$1" in
|
||||
*/*) mkdir `echo "$1" | sed 's,/.*,,'`;;
|
||||
esac
|
||||
AT_DATA([$1],
|
||||
[[$2
|
||||
%%
|
||||
@@ -31,6 +35,7 @@ foo: {};
|
||||
|
||||
AT_CHECK([bison $3 $1 $5], 0)
|
||||
AT_CHECK([ls $4], [], [ignore])
|
||||
$6
|
||||
AT_CLEANUP
|
||||
])
|
||||
|
||||
@@ -84,3 +89,26 @@ AT_CHECK_OUTPUT([foo.yy], [],
|
||||
AT_CHECK_OUTPUT([foo.yy], [],
|
||||
[-o foo.c++ --graph=foo.gph],
|
||||
[foo.c++ foo.gph])
|
||||
|
||||
|
||||
## ------------ ##
|
||||
## C++ output. ##
|
||||
## ------------ ##
|
||||
|
||||
m4_define([AT_CHECK_NO_SUBDIR_PART],
|
||||
[# Also make sure that the includes do not refer to the subdirectory.
|
||||
AT_CHECK([grep 'include .subdir/' $1.cc], 1, [])
|
||||
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 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],
|
||||
[], [AT_CHECK_NO_SUBDIR_PART([foo.tab])])
|
||||
|
||||
AT_CHECK_OUTPUT([subdir/foo.yy], [%skeleton "lalr1.cc" %defines %verbose],
|
||||
[-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])])
|
||||
|
||||
Reference in New Issue
Block a user