* tests/output.at (AT_CHECK_BISON_FLAGS, AT_CHECK_BISON_PERCENT):

(AT_CHECK_BISON_PERCENT_FLAGS): Merge into...
(AT_CHECK_OUTPUT): this.
Merely check ls' exit status, its output is useless.

diff --git a/ChangeLog b/ChangeLog
index 7b62864b81e935370d395d73f0130727928db488..3465cc6d7971dec1cb52fa083db1bc88e5462b4b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-09-10  Akim Demaille  <akim@epita.fr>
+
+       * tests/output.at (AT_CHECK_BISON_FLAGS, AT_CHECK_BISON_PERCENT):
+       (AT_CHECK_BISON_PERCENT_FLAGS): Merge into...
+       (AT_CHECK_OUTPUT): this.
+       Merely check ls' exit status, its output is useless.
+

 2001-09-10  Akim Demaille  <akim@epita.fr>
 
        * tests/calc.at: Use m4_match.
 2001-09-10  Akim Demaille  <akim@epita.fr>
 
        * tests/calc.at: Use m4_match.

diff --git a/tests/output.at b/tests/output.at
index a2cf450952310a6aef764b19eac6ddabaffffa8d..3fb093aabf3df89656dc6bc8b4b59a2adc6ee01d 100644 (file)
--- a/tests/output.at
+++ b/tests/output.at
@@ -19,85 +19,54 @@
 AT_BANNER([[Output file names.]])
 
 
 AT_BANNER([[Output file names.]])
 
 

-# AT_CHECK_BISON_FLAGS(FLAGS, EXPECTED-FILES-SORTED)
-# --------------------------------------------------
-m4_define([AT_CHECK_BISON_FLAGS],
-[AT_SETUP([Output files: $1.])
-AT_DATA([foo.y],
-[[%%
+# AT_CHECK_OUTPUT(INPUT-FILE, [DIRECTIVES], [FLAGS], EXPECTED-FILES)
+# ------------------------------------------------------------------
+m4_define([AT_CHECK_OUTPUT],
+[AT_SETUP([Output files: $2 & $3.])
+AT_DATA([$1],
+[[$2
+%%

 foo: {}
 ]])
 foo: {}
 ]])

-rm -rf $2
-AT_CHECK([bison -dv foo.y $1], 0, ignore, ignore)
-AT_CHECK([ls $2 | sort | tr '\n' ' ' | sed 's/.$//g'], 0, [$2])
-rm -f $2
-AT_CLEANUP
+
+AT_CHECK([bison $3 $1], 0)
+AT_CHECK([ls $4], [], [ignore])
+AT_CLEANUP($4)

 ])
 
 ])
 

-AT_CHECK_BISON_FLAGS([],             [foo.output foo.tab.c foo.tab.h])
-AT_CHECK_BISON_FLAGS([-o foo.c],     [foo.c foo.h foo.output])
-AT_CHECK_BISON_FLAGS([-o foo.tab.c], [foo.output foo.tab.c foo.tab.h])
-AT_CHECK_BISON_FLAGS([-y],           [y.output y.tab.c y.tab.h])
-AT_CHECK_BISON_FLAGS([-b bar],       [bar.output bar.tab.c bar.tab.h])
-AT_CHECK_BISON_FLAGS([-g -o foo.c],  [foo.c foo.h foo.output foo.vcg])
+AT_CHECK_OUTPUT([foo.y], [], [-dv],
+                [foo.output foo.tab.c foo.tab.h])
+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],
+                [foo.output foo.tab.c foo.tab.h])
+AT_CHECK_OUTPUT([foo.y], [], [-dv -y],
+                [y.output y.tab.c y.tab.h])
+AT_CHECK_OUTPUT([foo.y], [], [-dv -b bar],
+                [bar.output bar.tab.c bar.tab.h])
+AT_CHECK_OUTPUT([foo.y], [], [-dv -g -o foo.c],
+                [foo.c foo.h foo.output foo.vcg])

 
 

-# AT_CHECK_BISON_PERCENT(GRAMMAR-OPTIONS, EXPECTED-FILES-SORTED)
-# --------------------------------------------------------------
-m4_define([AT_CHECK_BISON_PERCENT],
-[AT_SETUP([Output files: $1.])
-AT_DATA([foo.y],
-[[$1
-%defines
-%verbose
-%%
-foo: {}
-]])
-rm -rf $2
-AT_CHECK([bison foo.y], 0, ignore, ignore)
-AT_CHECK([ls $2 | sort | tr '\n' ' ' | sed 's/.$//g'], 0, [$2])
-rm -f $2
-AT_CLEANUP
-])

 
 

-# The sames, but using the % directives.
-AT_CHECK_BISON_PERCENT([],                  [foo.output foo.tab.c foo.tab.h])
-# AT_CHECK_BISON_PERCENT([%output foo.c],     [foo.c foo.h foo.output])
-# AT_CHECK_BISON_PERCENT([%output foo.tab.c], [foo.output foo.tab.c foo.tab.h])
-AT_CHECK_BISON_PERCENT([%yacc],             [y.output y.tab.c y.tab.h])
-# AT_CHECK_BISON_PERCENT([%file_prefix bar],  [bar.output bar.tab.c bar.tab.h])
+AT_CHECK_OUTPUT([foo.y], [%defines %verbose],      [],
+                [foo.output foo.tab.c foo.tab.h])
+AT_CHECK_OUTPUT([foo.y], [%defines %verbose %yacc],[],
+                [y.output y.tab.c y.tab.h])

 
 

-# AT_CHECK_BISON_PERCENT_FLAGS(GRAMMAR_OPTIONS, FLAGS, EXPECTED-FILES-SORTED)
-# ---------------------------------------------------------------------------
-m4_define([AT_CHECK_BISON_PERCENT_FLAGS],
-[AT_SETUP([Output files: $1.])
-AT_DATA([foo.yy],
-[[$1
-%defines
-%verbose
-%%
-foo: {}
-]])
-rm -rf $3
-AT_CHECK([bison foo.yy $2], 0, ignore, ignore)
-AT_CHECK([ls $3 | sort | tr '\n' ' ' | sed 's/.$//g'], 0, [$3])
-rm -f $3
-AT_CLEANUP
-])

 
 # Check priorities of extension control.
 
 # Check priorities of extension control.

-AT_CHECK_BISON_PERCENT_FLAGS(
-[],
-[],
-[foo.output foo.tab.cc foo.tab.hh])
-AT_CHECK_BISON_PERCENT_FLAGS(
-[],
-[-o foo.c],
-[foo.c foo.h foo.output])
-AT_CHECK_BISON_PERCENT_FLAGS(
-[%source_extension ".cpp"] [%header_extension ".hhh"],
-[],
-[foo.output foo.tab.cpp foo.tab.hhh])
-AT_CHECK_BISON_PERCENT_FLAGS(
-[%source_extension ".cc"] [%header_extension ".hh"],
-[-o foo.c],
-[foo.c foo.h foo.output])
+AT_CHECK_OUTPUT([foo.yy], [%defines %verbose], [],
+                [foo.output foo.tab.cc foo.tab.hh])
+
+AT_CHECK_OUTPUT([foo.yy], [%defines %verbose ], [-o foo.c],
+                [foo.c foo.h foo.output])
+
+AT_CHECK_OUTPUT([foo.yy],
+                [%defines %verbose %source_extension ".cpp" %header_extension ".hhh"],
+                [],
+                [foo.output foo.tab.cpp foo.tab.hhh])
+
+AT_CHECK_OUTPUT([foo.yy],
+                [%defines %verbose %source_extension ".cc" %header_extension ".hh"],
+                [-o foo.c],
+                [foo.c foo.h foo.output])