FYI: Both: Fix test suite

[Akim Demaille]

Index: ChangeLog
from  Akim Demaille  <address@hidden>

        * tests/atlocal.in (GCC): Add.
        * tests/calc.at: s/m4_match/m4_bmatch/.
        s/m4_patsubst/m4_bpatsubst/.
        (AT_CHECK_CALC): Check the compiler's stderr only if it's GCC.
        * configure.in: AC_SUBST(GCC).

Index: NEWS
===================================================================
RCS file: /cvsroot/bison/bison/NEWS,v
retrieving revision 1.21.2.11
diff -u -u -r1.21.2.11 NEWS
--- NEWS 2001/10/02 18:09:13 1.21.2.11
+++ NEWS 2001/10/18 15:24:14
@@ -1,7 +1,7 @@
 Bison News
 ----------

-Changes in version 1.29d:
+Changes in version 1.29e:

 * `--defines' and `--graph' have now an optionnal argument which is the
   output file name. `-d' and `-g' do not change, they do not take any
Index: configure.in
===================================================================
RCS file: /cvsroot/bison/bison/configure.in,v
retrieving revision 1.39.2.14
diff -u -u -r1.39.2.14 configure.in
--- configure.in 2001/10/10 15:24:02 1.39.2.14
+++ configure.in 2001/10/18 15:24:14
@@ -27,6 +27,8 @@
 # Initialize the test suite.
 AC_CONFIG_TESTDIR(tests)
 AC_CONFIG_FILES([tests/bison], [chmod +x tests/bison])
+# Needed by tests/atlocal.in.
+AC_SUBST([GCC])

 # Checks for programs.
 AC_PROG_CC
Index: tests/atlocal.in
===================================================================
RCS file: /cvsroot/bison/bison/tests/atlocal.in,v
retrieving revision 1.1.2.1
diff -u -u -r1.1.2.1 atlocal.in
--- tests/atlocal.in 2001/08/30 15:36:37 1.1.2.1
+++ tests/atlocal.in 2001/10/18 15:24:15
@@ -6,5 +6,8 @@
 CC='@CC@'
 CFLAGS='@CFLAGS@'

+# We need to know if the compiler is GCC.
+GCC='@GCC@'
+
 # We need `config.h'.
 CPPFLAGS="-I $top_builddir @CPPFLAGS@"
Index: tests/calc.at
===================================================================
RCS file: /cvsroot/bison/bison/tests/calc.at,v
retrieving revision 1.5.2.5
diff -u -u -r1.5.2.5 calc.at
--- tests/calc.at 2001/10/02 15:36:11 1.5.2.5
+++ tests/calc.at 2001/10/18 15:24:15
@@ -256,8 +256,8 @@
 # Produce `calc.y'.
 m4_define([AT_DATA_CALC_Y],
 [_AT_DATA_CALC_Y($[1], $[2], $[3],
-                 [m4_match([$1], [--yyerror-verbose],
-                           [[#define YYERROR_VERBOSE]])])])
+                 [m4_bmatch([$1], [--yyerror-verbose],
+                            [[#define YYERROR_VERBOSE]])])])



@@ -273,8 +273,8 @@
 ]])
 AT_CHECK([calc input], 0, [], [stderr])dnl
 AT_CHECK([wc -l <stderr | sed 's/[[^0-9]]//g'], 0,
-         [m4_match([$1], [--debug],
-                   [$3], [0])
+         [m4_bmatch([$1], [--debug],
+                    [$3], [0])
 ])
 ])

@@ -302,17 +302,17 @@


 AT_CHECK([wc -l <stderr | sed 's/[[^0-9]]//g'], 0,
-         [m4_match([$1], [--debug],
-                   [$3], [1])
+         [m4_bmatch([$1], [--debug],
+                    [$3], [1])
 ])

 egrep -v '^((Start|Enter|Read|Reduc|Shift)ing|state|Error:) ' stderr >at-stderr
 mv at-stderr stderr

 AT_CHECK([cat stderr], 0,
-[m4_match([$1], [--location], [$4: ])[]dnl
+[m4_bmatch([$1], [--location], [$4: ])[]dnl
 parse error[]dnl
-m4_match([$1], [--yyerror-verbose], [, $5])[]dnl
+m4_bmatch([$1], [--yyerror-verbose], [, $5])[]dnl

 ])

@@ -330,9 +330,15 @@
 AT_DATA_CALC_Y([$1])

 # Specify the output files to avoid problems on different file systems.
-AT_CHECK([bison calc.y -o calc.c m4_patsubst([$1], [--yyerror-verbose])],
+AT_CHECK([bison calc.y -o calc.c m4_bpatsubst([$1], [--yyerror-verbose])],
          [0], [], [])
-AT_CHECK([$CC $CFLAGS $CPPFLAGS calc.c -o calc], 0, [], [])
+
+# Some compilers issue warnings we don't want to hear about.
+# Maybe some day we will have proper Autoconf macros to disable these
+# warnings, but this place is not the right one for that.
+# So let's keep only GCC warnings, which we know are sane.
+AT_CHECK([$CC $CFLAGS $CPPFLAGS calc.c -o calc], 0, [], [stderr])
+AT_CHECK([test "$GCC" = yes && cat stderr])

 # Test the priorities.
 _AT_CHECK_CALC([$1],