portability: fix test suite for GCC 4.5's new #error message.

[bison.git] / tests / local.mk

diff --git a/tests/local.mk b/tests/local.mk
index e4881a4a2c23ea06801f8e571f48e083cbd68d5d..9cf76bd0d1ef48460678607e28d6b5ae86a90fbb 100644 (file)
--- a/tests/local.mk
+++ b/tests/local.mk
@@ -1,7 +1,6 @@
 ## Makefile for Bison testsuite.
 
-## Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free
-## Software Foundation, Inc.
+## Copyright (C) 2000-2010 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
@@ -53,6 +52,7 @@ TESTSUITE_AT =                                        \
   tests/input.at                               \
   tests/java.at                                        \
   tests/local.at                               \
+  tests/named-refs.at                          \
   tests/output.at                              \
   tests/push.at                                        \
   tests/reduce.at                              \
@@ -64,45 +64,42 @@ TESTSUITE_AT =                                      \
   tests/torture.at
 
 TESTSUITE = $(top_srcdir)/tests/testsuite
+RUN_TESTSUITE = $(TESTSUITE) -C tests $(TESTSUITEFLAGS)
 
 AUTOTEST = $(AUTOM4TE) --language=autotest
-AUTOTEST_FLAGS = -I $(top_srcdir)/tests
-$(TESTSUITE): tests/package.m4 $(TESTSUITE_AT)
-       $(AUTOTEST) $(AUTOTEST_FLAGS) $(top_srcdir)/tests/testsuite.at -o $@.tmp
+AUTOTESTFLAGS = -I $(top_srcdir)/tests
+$(TESTSUITE): $(top_srcdir)/tests/package.m4 $(TESTSUITE_AT)
+       $(AUTOTEST) $(AUTOTESTFLAGS) $(top_srcdir)/tests/testsuite.at -o $@.tmp
        mv $@.tmp $@
 
-tests/atconfig: $(top_builddir)/config.status
-       ./config.status tests/$@
-
 clean-local: clean-local-tests
 clean-local-tests:
-       test ! -f $(TESTSUITE) || cd tests && ../$(TESTSUITE) --clean
+       test ! -f $(TESTSUITE) || $(TESTSUITE) -C tests --clean
 
 check-local: tests/atconfig tests/atlocal $(TESTSUITE)
 # Move into tests/ so that testsuite.dir etc. be created there.
-       cd tests && ../$(TESTSUITE) $(TESTSUITEFLAGS)
+       $(RUN_TESTSUITE)
 
 check_SCRIPTS = tests/bison
 
 # Run the test suite on the *installed* tree.
 installcheck-local:
-       cd tests && ../$(TESTSUITE) AUTOTEST_PATH="$(bindir)" $(TESTSUITEFLAGS)
+       $(RUN_TESTSUITE) AUTOTEST_PATH="$(bindir)"
 
 # Be real mean with it.
 .PHONY: maintainer-check-g++
 maintainer-check-g++: $(TESTSUITE)
-       cd tests && ../$(TESTSUITE) CC='$(CXX)'
+       $(RUN_TESTSUITE) CC='$(CXX)'
 
 .PHONY: maintainer-check-posix
 maintainer-check-posix: $(TESTSUITE)
-       cd tests && ../$(TESTSUITE) POSIXLY_CORRECT=1 _POSIX2_VERSION=200112
+       $(RUN_TESTSUITE) POSIXLY_CORRECT=1 _POSIX2_VERSION=200112
 
 .PHONY: maintainer-check-valgrind
 maintainer-check-valgrind: $(TESTSUITE)
        test -z '$(VALGRIND)' || \
           VALGRIND_OPTS='--leak-check=full --show-reachable=yes' \
-          cd tests && \
-          ../$(TESTSUITE) PREBISON='$(VALGRIND) -q' PREPARSER='$(VALGRIND) -q'
+          $(RUN_TESTSUITE) PREBISON='$(VALGRIND) -q' PREPARSER='$(VALGRIND) -q'
 
 .PHONY: maintainer-check
 maintainer-check: maintainer-check-posix maintainer-check-valgrind maintainer-check-g++