Catch up to last couple of days' checkins.

[bison.git] / tests / Makefile.am

diff --git a/tests/Makefile.am b/tests/Makefile.am
index fff1a30ea64a9cb1b99b1202a3c63d1f18b54884..1d9b619e2ad5ee9ef651691c73abcdea1b2f3d19 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,7 +1,9 @@
 ## Process this file with automake to create Makefile.in.
 
 ## Makefile for Bison testsuite.
 ## Process this file with automake to create Makefile.in.
 
 ## Makefile for Bison testsuite.

-## Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
+
+## Copyright (C) 2000, 2001, 2002, 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
 
 ## 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


@@ -15,8 +17,8 @@
 
 ## You should have received a copy of the GNU General Public License
 ## along with this program; if not, write to the Free Software
 
 ## You should have received a copy of the GNU General Public License
 ## along with this program; if not, write to the Free Software

-## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-## 02111-1307, USA.
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.

 
 EXTRA_DIST = $(TESTSUITE_AT) testsuite package.m4
 
 
 EXTRA_DIST = $(TESTSUITE_AT) testsuite package.m4
 


@@ -27,7 +29,7 @@ MAINTAINERCLEANFILES = Makefile.in $(TESTSUITE)
 ## package.m4.  ##
 ## ------------ ##
 
 ## package.m4.  ##
 ## ------------ ##
 

-$(srcdir)/package.m4: $(top_srcdir)/configure.in
+$(srcdir)/package.m4: $(top_srcdir)/configure.ac

        {                                       \
          echo '# Signature of the current package.'; \
          echo 'm4_define([AT_PACKAGE_NAME],      [@PACKAGE_NAME@])'; \
        {                                       \
          echo '# Signature of the current package.'; \
          echo 'm4_define([AT_PACKAGE_NAME],      [@PACKAGE_NAME@])'; \


@@ -42,13 +44,15 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.in
 ## ------------ ##
 
 TESTSUITE_AT = \
 ## ------------ ##
 
 TESTSUITE_AT = \

+       local.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 \
        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
+        c++.at \
+       cxx-type.at glr-regression.at

 
 TESTSUITE = $(srcdir)/testsuite
 
 
 TESTSUITE = $(srcdir)/testsuite
 


@@ -61,13 +65,33 @@ atconfig: $(top_builddir)/config.status
        cd $(top_builddir) && ./config.status tests/$@
 
 clean-local:
        cd $(top_builddir) && ./config.status tests/$@
 
 clean-local:

-       $(SHELL) $(TESTSUITE) --clean
+       test ! -f $(TESTSUITE) || $(SHELL) $(TESTSUITE) --clean

 
 check-local: atconfig atlocal $(TESTSUITE)
 
 check-local: atconfig atlocal $(TESTSUITE)

-       $(SHELL) $(TESTSUITE)
+       $(SHELL) $(TESTSUITE) $(TESTSUITEFLAGS)

 
 check_SCRIPTS = bison
 
 # Run the test suite on the *installed* tree.
 installcheck-local:
 
 check_SCRIPTS = bison
 
 # Run the test suite on the *installed* tree.
 installcheck-local:

-       $(SHELL) $(TESTSUITE) AUTOTEST_PATH=$(exec_prefix)/bin
+       $(SHELL) $(TESTSUITE) AUTOTEST_PATH="$(bindir)" $(TESTSUITEFLAGS)
+
+# Be real mean with it.
+.PHONY: maintainer-check-g++
+maintainer-check-g++: $(TESTSUITE)
+       $(TESTSUITE) CC='$(CXX)'
+
+.PHONY: maintainer-check-posix
+maintainer-check-posix: $(TESTSUITE)
+       $(TESTSUITE) POSIXLY_CORRECT=1 _POSIX2_VERSION=200112
+
+.PHONY: maintainer-check-valgrind
+maintainer-check-valgrind: $(TESTSUITE)
+       if test -n "$(VALGRIND)"; then                                      \
+          $(TESTSUITE) PREBISON='$(VALGRIND) -q' PREPARSER='$(VALGRIND) -q'; \
+       else                                                                \
+         true;                                                             \
+       fi
+
+.PHONY: maintainer-check
+maintainer-check: maintainer-check-posix maintainer-check-valgrind maintainer-check-g++