* src/files.c (open_files): Actually the `.output' file is based

on the short_base_name, not base_name.
* tests/suite.at (Checking output file names): Adjust.

diff --git a/ChangeLog b/ChangeLog
index 7713986ea69f69ede0dd7d965502ab30fbca5762..0b3001bf82790c9d2027e97d0bc2a7aac34c6a9a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-12-20  Akim Demaille  <akim@epita.fr>
+
+       * src/files.c (open_files): Actually the `.output' file is based
+       on the short_base_name, not base_name.
+       * tests/suite.at (Checking output file names): Adjust.
+
 2000-12-20  Akim Demaille  <akim@epita.fr>
 
        * src/bison.s1: Remove, we now use directly...

diff --git a/src/files.c b/src/files.c
index b2f84a2ab94c4875e0772e5f7c2118da6881cd85..24a17fa62e72ee2121f7d3e766219747df55e081 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -252,7 +252,7 @@ open_files (void)
   if (verbose_flag)
     /* We used to use just .out if spec_name_prefix (-p) was used, but
        that conflicts with Posix.  */
-    foutput = xfopen (stringappend (base_name, EXT_OUTPUT), "w");
+    foutput = xfopen (stringappend (short_base_name, EXT_OUTPUT), "w");
 
   attrsfile = stringappend (short_base_name, EXT_STYPE_H);
 

diff --git a/tests/suite.at b/tests/suite.at
index f4a4f7d73b5ad26d5b4b131ac85bc9936ede4a38..e2283513953a49aa9618ce7215d22d47349b1b91 100644 (file)
--- a/tests/suite.at
+++ b/tests/suite.at
@@ -5,10 +5,6 @@
 
 AT_INIT([bison])
 
-AT_INCLUDE([calc.at])
-AT_INCLUDE([regression.at])
-
-
 ## ---------------------------- ##
 ## Checking output file names.  ##
 ## ---------------------------- ##
@@ -28,10 +24,14 @@ 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_CHECK_BISON_OUTPUT([],             [foo.tab.c foo.tab.h foo.tab.output])
+AT_CHECK_BISON_OUTPUT([],             [foo.output foo.tab.c foo.tab.h])
 AT_CHECK_BISON_OUTPUT([-o foo.c],     [foo.c foo.h foo.output])
-AT_CHECK_BISON_OUTPUT([-o foo.tab.c], [foo.tab.c foo.tab.h foo.tab.output])
-AT_CHECK_BISON_OUTPUT([-y],           [y.tab.c y.tab.h y.tab.output])
-AT_CHECK_BISON_OUTPUT([-b bar],       [bar.tab.c bar.tab.h bar.tab.output])
+AT_CHECK_BISON_OUTPUT([-o foo.tab.c], [foo.output foo.tab.c foo.tab.h])
+AT_CHECK_BISON_OUTPUT([-y],           [y.output y.tab.c y.tab.h])
+AT_CHECK_BISON_OUTPUT([-b bar],       [bar.output bar.tab.c bar.tab.h])
 
 AT_CLEANUP
+
+
+AT_INCLUDE([calc.at])
+AT_INCLUDE([regression.at])