bison: catch bad symbol names.

[bison.git] / tests / local.mk

diff --git a/tests/local.mk b/tests/local.mk
index e4881a4a2c23ea06801f8e571f48e083cbd68d5d..b8df572490facd8331edb132704c11cb090c4a13 100644 (file)
--- a/tests/local.mk
+++ b/tests/local.mk
@@ -66,43 +66,39 @@ TESTSUITE_AT =                                      \
 TESTSUITE = $(top_srcdir)/tests/testsuite
 
 AUTOTEST = $(AUTOM4TE) --language=autotest
 TESTSUITE = $(top_srcdir)/tests/testsuite
 
 AUTOTEST = $(AUTOM4TE) --language=autotest

-AUTOTEST_FLAGS = -I $(top_srcdir)/tests
+AUTOTESTFLAGS = -I $(top_srcdir)/tests

 $(TESTSUITE): tests/package.m4 $(TESTSUITE_AT)
 $(TESTSUITE): tests/package.m4 $(TESTSUITE_AT)

-       $(AUTOTEST) $(AUTOTEST_FLAGS) $(top_srcdir)/tests/testsuite.at -o $@.tmp
+       $(AUTOTEST) $(AUTOTESTFLAGS) $(top_srcdir)/tests/testsuite.at -o $@.tmp

        mv $@.tmp $@
 
        mv $@.tmp $@
 

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

 clean-local: clean-local-tests
 clean-local-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.
 
 check-local: tests/atconfig tests/atlocal $(TESTSUITE)
 # Move into tests/ so that testsuite.dir etc. be created there.

-       cd tests && ../$(TESTSUITE) $(TESTSUITEFLAGS)
+       $(TESTSUITE) -C tests $(TESTSUITEFLAGS)

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

-       cd tests && ../$(TESTSUITE) AUTOTEST_PATH="$(bindir)" $(TESTSUITEFLAGS)
+       $(TESTSUITE) -C tests AUTOTEST_PATH="$(bindir)" $(TESTSUITEFLAGS)

 
 # Be real mean with it.
 .PHONY: maintainer-check-g++
 maintainer-check-g++: $(TESTSUITE)
 
 # Be real mean with it.
 .PHONY: maintainer-check-g++
 maintainer-check-g++: $(TESTSUITE)

-       cd tests && ../$(TESTSUITE) CC='$(CXX)'
+       $(TESTSUITE) -C tests CC='$(CXX)'

 
 .PHONY: maintainer-check-posix
 maintainer-check-posix: $(TESTSUITE)
 
 .PHONY: maintainer-check-posix
 maintainer-check-posix: $(TESTSUITE)

-       cd tests && ../$(TESTSUITE) POSIXLY_CORRECT=1 _POSIX2_VERSION=200112
+       $(TESTSUITE) -C tests 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' \
 
 .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'
+          $(TESTSUITE) -C tests PREBISON='$(VALGRIND) -q' PREPARSER='$(VALGRIND) -q'

 
 .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++