tests: don't expect $EGREP to support -w

[bison.git] / tests / Makefile.am

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 05a35211674cccea4dfc77895e224e341e57a488..b6848d77b12b02c5052e731be94929267f96a841 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -2,8 +2,7 @@
 
 ## Makefile for Bison testsuite.
 
 
 ## Makefile for Bison testsuite.
 

-## Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-## 2008-2009 Free Software Foundation, Inc.
+## Copyright (C) 2000-2012 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


@@ -28,14 +27,15 @@ MAINTAINERCLEANFILES = Makefile.in $(TESTSUITE)
 ## ------------ ##
 
 $(srcdir)/package.m4: $(top_srcdir)/configure
 ## ------------ ##
 
 $(srcdir)/package.m4: $(top_srcdir)/configure

-       { \
+       $(AM_V_GEN) { \

          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)])'; \
          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
+       } >$@.tmp
+       $(AM_V_at) mv $@.tmp $@

 
 ## ------------ ##
 ## Test suite.  ##
 
 ## ------------ ##
 ## Test suite.  ##


@@ -44,8 +44,8 @@ $(srcdir)/package.m4: $(top_srcdir)/configure
 TESTSUITE_AT = \
        local.at \
        testsuite.at \
 TESTSUITE_AT = \
        local.at \
        testsuite.at \

-       input.at \
-       output.at sets.at reduce.at skeletons.at \
+       input.at named-refs.at \
+       output.at skeletons.at sets.at reduce.at \

        synclines.at headers.at actions.at conflicts.at \
        calc.at \
         torture.at existing.at regression.at \
        synclines.at headers.at actions.at conflicts.at \
        calc.at \
         torture.at existing.at regression.at \


@@ -57,9 +57,9 @@ TESTSUITE_AT = \
 TESTSUITE = $(srcdir)/testsuite
 
 AUTOTEST = $(AUTOM4TE) --language=autotest
 TESTSUITE = $(srcdir)/testsuite
 
 AUTOTEST = $(AUTOM4TE) --language=autotest

-$(TESTSUITE): package.m4 $(TESTSUITE_AT)
-       $(AUTOTEST) -I $(srcdir) testsuite.at -o $@.tmp
-       mv $@.tmp $@
+$(TESTSUITE): $(srcdir)/package.m4 $(TESTSUITE_AT)
+       $(AM_V_GEN) $(AUTOTEST) -I $(srcdir) testsuite.at -o $@.tmp
+       $(AM_V_at) mv $@.tmp $@

 
 atconfig: $(top_builddir)/config.status
        cd $(top_builddir) && ./config.status tests/$@
 
 atconfig: $(top_builddir)/config.status
        cd $(top_builddir) && ./config.status tests/$@


@@ -73,23 +73,24 @@ check-local: atconfig atlocal $(TESTSUITE)
 check_SCRIPTS = bison
 
 # Run the test suite on the *installed* tree.
 check_SCRIPTS = bison
 
 # Run the test suite on the *installed* tree.

-installcheck-local:
-       $(SHELL) $(TESTSUITE) AUTOTEST_PATH="$(bindir)" $(TESTSUITEFLAGS)
+installcheck-local: atconfig atlocal $(TESTSUITE)
+       $(TESTSUITE) AUTOTEST_PATH="$(bindir)" $(TESTSUITEFLAGS)

 
 # Be real mean with it.
 .PHONY: maintainer-check-g++
 
 # Be real mean with it.
 .PHONY: maintainer-check-g++

-maintainer-check-g++: $(TESTSUITE)
-       $(TESTSUITE) CC='$(CXX)'
+maintainer-check-g++: atconfig atlocal $(TESTSUITE)
+       $(TESTSUITE) $(TESTSUITEFLAGS) --compile-c-with-cxx

 
 .PHONY: maintainer-check-posix
 
 .PHONY: maintainer-check-posix

-maintainer-check-posix: $(TESTSUITE)
-       $(TESTSUITE) POSIXLY_CORRECT=1 _POSIX2_VERSION=200112
+maintainer-check-posix: atconfig atlocal $(TESTSUITE)
+       $(TESTSUITE) $(TESTSUITEFLAGS) POSIXLY_CORRECT=1 _POSIX2_VERSION=200112

 
 .PHONY: maintainer-check-valgrind
 
 .PHONY: maintainer-check-valgrind

-maintainer-check-valgrind: $(TESTSUITE)
-       test -z '$(VALGRIND)' || \
-          VALGRIND_OPTS='--leak-check=full --show-reachable=yes' \
-          $(TESTSUITE) PREBISON='$(VALGRIND) -q' PREPARSER='$(VALGRIND) -q'
+maintainer-check-valgrind: atconfig atlocal $(TESTSUITE)
+       test -z '$(VALGRIND)' ||                                        \
+         $(TESTSUITE) $(TESTSUITEFLAGS)                                \
+         PREBISON='$(VALGRIND_PREBISON)' PREPARSER='$(VALGRIND) -q'    \
+         VALGRIND_OPTS='--leak-check=full --show-reachable=yes'

 
 .PHONY: maintainer-check
 maintainer-check: maintainer-check-posix maintainer-check-valgrind maintainer-check-g++
 
 .PHONY: maintainer-check
 maintainer-check: maintainer-check-posix maintainer-check-valgrind maintainer-check-g++


@@ -101,3 +102,6 @@ maintainer-push-check:
 .PHONY: maintainer-xml-check
 maintainer-xml-check:
        BISON_TEST_XML=1 $(MAKE) $(AM_MAKEFLAGS) maintainer-check
 .PHONY: maintainer-xml-check
 maintainer-xml-check:
        BISON_TEST_XML=1 $(MAKE) $(AM_MAKEFLAGS) maintainer-check

+
+.PHONY: maintainer-release-check
+maintainer-release-check: maintainer-check maintainer-push-check maintainer-xml-check