X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/0fb669f9d648dfdd7a39478a6b658511455ae966..3b0ffc7ec1c9f452b48150c5c537b4f2b80cd34e:/tests/output.at?ds=sidebyside

diff --git a/tests/output.at b/tests/output.at
index 12a49b90..574f2141 100644
--- a/tests/output.at
+++ b/tests/output.at
@@ -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])])