* 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).

diff --git a/ChangeLog b/ChangeLog
index 854686249e9f01c4e5b7d16a245274633b2a6333..a033a1d147e08229ed6f456e9134fa2a79d7596f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-10-18  Akim Demaille  <akim@epita.fr>
+
+       * 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).
+
 2001-10-14  Marc Autret  <autret_m@epita.fr>
 
        * src/options.c (create_long_option_table): Fix.

diff --git a/NEWS b/NEWS
index af7d37d41350288d9f57c62741f9ccd831affd7d..07762541f22324a39d9283c8c3fd74d3142d5377 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -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

diff --git a/configure.in b/configure.in
index 4d5ed68ef9983e1df681e57573e8bc7c1ac820cd..27b8d2ecfd5d59efaf6bd2eaae0f5e4615df0f73 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -27,6 +27,8 @@ AM_CONFIG_HEADER(config.h:config.hin)
 # 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

diff --git a/tests/atlocal.in b/tests/atlocal.in
index 9a6790afdb6baca92ae5366553064787af92a387..81b0995affde82c6591eef4834b1e8c6052fe0dc 100644 (file)
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -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@"

diff --git a/tests/calc.at b/tests/calc.at
index 87053158817ca4d2956b2f5181c2a6148339ce32..ba5293f53e5676958c8c08407b67eb2eee6484bf 100644 (file)
--- a/tests/calc.at
+++ b/tests/calc.at
@@ -273,8 +273,8 @@ m4_define([_AT_CHECK_CALC],
 ]])
 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([calc input], 0, [], [stderr])
 
 
 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_SETUP([Calculator $1])
 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],