(Torturing the Scanner): Adjust to lack of quotes in diagnostics.

[bison.git] / tests / local.at

diff --git a/tests/local.at b/tests/local.at
index 65ae073fcb6578307c0917bc100b5c59a8aa8490..2544b2f6e6f4f83df0ab0c2e1a2f0519c00a1e72 100644 (file)
--- a/tests/local.at
+++ b/tests/local.at
@@ -1,7 +1,7 @@
 # Process this -*- Autotest -*- file with autom4te.
 
 # Macros for the GNU Bison Test suite.
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,6 +18,9 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA.
 
+# We want a recent Autotest.
+m4_version_prereq([2.58])
+
 
 ## ------------------------------- ##
 ## Macros decoding Bison options.  ##
@@ -167,17 +170,17 @@ $2])
 # Compile SOURCES into OUTPUT.  If OUTPUT does not contain '.',
 # assume that we are linking too; this is a hack.
 m4_define([AT_COMPILE],
-[AT_CHECK([$CC $CFLAGS $CPPFLAGS m4_bmatch([$1], [[.]], [], [$LDFLAGS ])m4_default([$2], [$1.c]) m4_bmatch([$1], [[.]], [], [$LIBS ])-o $1],
-          0, [], [ignore])])
+[AT_CHECK([$CC $CFLAGS $CPPFLAGS m4_bmatch([$1], [[.]], [], [$LDFLAGS ])-o $1 m4_default([$2], [$1.c])[]m4_bmatch([$1], [[.]], [], [ $LIBS])],
+          0, [ignore], [ignore])])
 
-# AT_COMPILE_CXX(OUTPUT, [SOURCES = OUTPUT.c])
+# AT_COMPILE_CXX(OUTPUT, [SOURCES = OUTPUT.cc])
 # --------------------------------------------
-# If the C++ compiler is not defined, ignore the test.
+# If the C++ compiler does not work, ignore the test.
 m4_define([AT_COMPILE_CXX],
 [AT_KEYWORDS(c++)
-AT_CHECK([$CXX --version || exit 77], 0, ignore, ignore)
-AT_CHECK([$CXX $CFLAGS $CPPFLAGS m4_default([$2], [$1.c]) -o $1],
-         0, [], [ignore])])
+AT_CHECK([$BISON_CXX_WORKS], 0, ignore, ignore)
+AT_CHECK([$CXX $CXXFLAGS $CPPFLAGS -o $1 m4_default([$2], [$1.cc])],
+         0, [ignore], [ignore])])
 
 
 
@@ -190,3 +193,14 @@ AT_CHECK([$CXX $CFLAGS $CPPFLAGS m4_default([$2], [$1.c]) -o $1],
 # So that we can run `./testsuite PREPARSER='valgrind -q' for instance.
 m4_define([AT_PARSER_CHECK],
 [AT_CHECK([$PREPARSER $1], [$2], [$3], [$4])])
+
+
+
+
+## ----------------------- ##
+## Launch the test suite.  ##
+## ----------------------- ##
+
+AT_INIT
+
+AT_TESTED([bison])