* tests/regression.at (Mixing %token styles): New test.

[bison.git] / tests / Makefile.am

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3ea9fe3494e8e76c8dea3ac102c3814c04f07172..3613713f5bf1340cca9c8ea1ab0a8d7f0aac5e45 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 2000, 2001 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,31 @@
 ## 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 =
+DISTCLEANFILES       = atconfig atlocal bison package.m4
+MAINTAINERCLEANFILES = Makefile.in $(TESTSUITE)
 
-EXTRA_DIST = atgeneral.m4 suite.m4 $(SUITE)
+TESTSUITE_AT = \
+       testsuite.at \
+       output.at calc.at regression.at
+TESTSUITE = $(srcdir)/testsuite
 
-check-local: atconfig testsuite
-       $(SHELL) testsuite
+AUTOM4TE = autom4te
+AUTOTEST = $(AUTOM4TE) --language=autotest
+$(srcdir)/$(TESTSUITE): $(TESTSUITE_AT)
+       $(AUTOTEST) -I $(srcdir) testsuite.at -o $@.tmp
+       mv $@.tmp $@
 
-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 $@
+atconfig: $(top_builddir)/config.status
+       cd $(top_builddir) && ./config.status tests/$@
 
-CLEANFILES = debug-*.sh
-DISTCLEANFILES = atconfig
-MAINTAINERCLEANFILES = testsuite
+clean-local:
+       $(SHELL) $(TESTSUITE) --clean
+
+check-local: atconfig atlocal $(TESTSUITE)
+       $(SHELL) $(TESTSUITE)
+
+# Run the test suite on the *installed* tree.
+installcheck-local:
+       $(SHELL) $(TESTSUITE) AUTOTEST_PATH=$(exec_prefix)/bin