Tune local.at so that people can "autom4te -l autotest calc.at -o

calc" for instance, to extract a sub test suite.
* tests/testsuite.at: Move the initialization, Autotest version
requirement, and AT_TESTED invocation into...
* tests/local.at: here.
* tests/testsuite.at: Include it for compatibility with Autoconf
2.57.
* tests/Makefile.am ($(TESTSUITE)): Report that the warning should
be ignore.

diff --git a/ChangeLog b/ChangeLog
index e18fa06d61805adce638901bc6830e96a7066249..639bcf277e01bba25d99d3b1ea32dd443d0829f5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2003-08-25  Akim Demaille  <akim@epita.fr>
+
+       Tune local.at so that people can "autom4te -l autotest calc.at -o
+       calc" for instance, to extract a sub test suite.
+
+       * tests/testsuite.at: Move the initialization, Autotest version
+       requirement, and AT_TESTED invocation into...
+       * tests/local.at: here.
+       * tests/testsuite.at: Include it for compatibility with Autoconf
+       2.57.
+       * tests/Makefile.am ($(TESTSUITE)): Report that the warning should
+       be ignore.
+
 2003-08-04  Paul Eggert  <eggert@twinsun.com>
 
        Rework code slightly to avoid gcc -Wtraditional warnings.
@@ -12,7 +25,7 @@
        yyresolveStates, yyprocessOneStack):
        Use `YYASSERT (FOO);' rather than `if (! (FOO)) abort ();'.
        Derived from a suggestion by Frank Heckenbach.
-       
+
 2003-07-25  Paul Eggert  <eggert@twinsun.com>
 
        * data/glr.c (yyglrReduce): Don't use C89 string concatenation,

diff --git a/tests/Makefile.am b/tests/Makefile.am
index ae91004eb49f655cb58e27c892542e42709a19dc..960d658672ed25cb7ce5a45f6892c1d163428849 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -55,6 +55,7 @@ TESTSUITE = $(srcdir)/testsuite
 
 AUTOTEST = $(AUTOM4TE) --language=autotest
 $(TESTSUITE): package.m4 $(TESTSUITE_AT)
+       echo "WARNING: Multiple inclusion warning should be ignored." >&2
        $(AUTOTEST) -I $(srcdir) testsuite.at -o $@.tmp
        mv $@.tmp $@
 

diff --git a/tests/local.at b/tests/local.at
index e44871c18cd4f08ac86fb636ffa3b4a4068e38c7..5753ade90d91add78a8def66f707de50cc673728 100644 (file)
--- a/tests/local.at
+++ b/tests/local.at
@@ -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.57])
+
 
 ## ------------------------------- ##
 ## Macros decoding Bison options.  ##
@@ -190,3 +193,14 @@ AT_CHECK([$CXX $CXXFLAGS $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])

diff --git a/tests/testsuite.at b/tests/testsuite.at
index 44cc84171923082bbdf66e0776b24360e0228401..cdf27918a952a033cf3184e96a4ab28fe7ec9322 100644 (file)
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -18,15 +18,11 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA.
 
-# We want a recent Autotest.
-m4_version_prereq([2.57])
-
-# Helping macros.
-m4_include([local.at])
-
-AT_INIT
+# Initializes Autotest, imports macros etc.  It will trigger a warning
+# with Autoconf 2.58, because it includes this file automatically, but
+# it causes no real problem.
+m4_include([input.at])
 
-AT_TESTED([bison])
 
 # Testing resistance to user bugs.
 m4_include([input.at])