Use $accept and $end, as BYacc and BTYacc do, instead of $axiom and $.

[bison.git] / tests / Makefile.am

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9560ecd124cdd9085f40f467fce4b21cdc888d59..b695d92271030e2c018bdb707a0cbcc3feb4a4d6 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to create Makefile.in.
 
 ## Makefile for Bison testsuite.
-## Copyright (C) 2000 Free Software Foundation, Inc.
+## Copyright (C) 2000, 2001, 2002  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,23 +18,58 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 
-# Distribute the testsuite since GNU M4 is needed to build it.
-noinst_SCRIPTS = testsuite
+EXTRA_DIST = $(TESTSUITE_AT) testsuite
 
-SUITE = calc.m4
+DISTCLEANFILES       = atconfig $(check_SCRIPTS)
+MAINTAINERCLEANFILES = Makefile.in $(TESTSUITE)
 
-EXTRA_DIST = atgeneral.m4 suite.m4 $(SUITE)
+## ------------ ##
+## package.m4.  ##
+## ------------ ##
 
-check-local: atconfig testsuite
-       $(SHELL) testsuite
+$(srcdir)/package.m4: $(top_srcdir)/configure.in
+       {                                       \
+         echo '# Signature of the current package.'; \
+         echo 'm4_define([AT_PACKAGE_NAME],      [@PACKAGE_NAME@])'; \
+         echo 'm4_define([AT_PACKAGE_TARNAME],   [@PACKAGE_TARNAME@])'; \
+         echo 'm4_define([AT_PACKAGE_VERSION],   [@PACKAGE_VERSION@])'; \
+         echo 'm4_define([AT_PACKAGE_STRING],    [@PACKAGE_STRING@])'; \
+         echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \
+       } >$(srcdir)/package.m4
 
-testsuite: atgeneral.m4 suite.m4 $(SUITE)
-       $(M4) -I $(srcdir) atgeneral.m4 suite.m4 | \
-          sed -e 's/[  ]*$$//' | \
-         sed -e '/^$$/N;/\n$$/D' > $@-tmp
-       chmod +x $@-tmp
-       mv $@-tmp $@
+EXTRA_DIST += package.m4
 
-CLEANFILES = debug-*.sh
-DISTCLEANFILES = atconfig
-MAINTAINERCLEANFILES = testsuite
+## ------------ ##
+## Test suite.  ##
+## ------------ ##
+
+TESTSUITE_AT = \
+       testsuite.at \
+       input.at \
+       output.at sets.at reduce.at \
+       synclines.at headers.at actions.at conflicts.at \
+       calc.at \
+        torture.at existing.at regression.at \
+       cxx-type.at
+
+TESTSUITE = $(srcdir)/testsuite
+
+AUTOTEST = $(AUTOM4TE) --language=autotest
+$(TESTSUITE): package.m4 $(TESTSUITE_AT)
+       $(AUTOTEST) -I $(srcdir) testsuite.at -o $@.tmp
+       mv $@.tmp $@
+
+atconfig: $(top_builddir)/config.status
+       cd $(top_builddir) && ./config.status tests/$@
+
+clean-local:
+       $(SHELL) $(TESTSUITE) --clean
+
+check-local: atconfig atlocal $(TESTSUITE)
+       $(SHELL) $(TESTSUITE)
+
+check_SCRIPTS = bison
+
+# Run the test suite on the *installed* tree.
+installcheck-local:
+       $(SHELL) $(TESTSUITE) AUTOTEST_PATH=$(exec_prefix)/bin