From a8873669551e28e368923d3c6183b5b08946ae02 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Thu, 11 Jun 2009 14:36:18 +0200 Subject: [PATCH 1/4] tests: honor TESTSUITEFLAGS in every check target. * tests/local.mk (RUN_TESTSUITE): New. (check-local, installcheck-local, maintainer-check-g++) (maintainer-check-posix, maintainer-check-valgrind): Use it. --- ChangeLog | 7 +++++++ tests/local.mk | 15 ++++++++------- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4fe1bec..9871ea1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2009-06-11 Akim Demaille + + tests: honor TESTSUITEFLAGS in every check target. + * tests/local.mk (RUN_TESTSUITE): New. + (check-local, installcheck-local, maintainer-check-g++) + (maintainer-check-posix, maintainer-check-valgrind): Use it. + 2009-06-10 Akim Demaille deterministic test suite. diff --git a/tests/local.mk b/tests/local.mk index b8df572..a635ed8 100644 --- a/tests/local.mk +++ b/tests/local.mk @@ -1,7 +1,7 @@ ## Makefile for Bison testsuite. -## Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free -## Software Foundation, Inc. +## Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 +## 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 @@ -64,6 +64,7 @@ TESTSUITE_AT = \ tests/torture.at TESTSUITE = $(top_srcdir)/tests/testsuite +RUN_TESTSUITE = $(TESTSUITE) -C tests $(TESTSUITEFLAGS) AUTOTEST = $(AUTOM4TE) --language=autotest AUTOTESTFLAGS = -I $(top_srcdir)/tests @@ -77,28 +78,28 @@ clean-local-tests: check-local: tests/atconfig tests/atlocal $(TESTSUITE) # Move into tests/ so that testsuite.dir etc. be created there. - $(TESTSUITE) -C tests $(TESTSUITEFLAGS) + $(RUN_TESTSUITE) check_SCRIPTS = tests/bison # Run the test suite on the *installed* tree. installcheck-local: - $(TESTSUITE) -C tests AUTOTEST_PATH="$(bindir)" $(TESTSUITEFLAGS) + $(RUN_TESTSUITE) AUTOTEST_PATH="$(bindir)" # Be real mean with it. .PHONY: maintainer-check-g++ maintainer-check-g++: $(TESTSUITE) - $(TESTSUITE) -C tests CC='$(CXX)' + $(RUN_TESTSUITE) CC='$(CXX)' .PHONY: maintainer-check-posix maintainer-check-posix: $(TESTSUITE) - $(TESTSUITE) -C tests 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' \ - $(TESTSUITE) -C tests 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++ -- 1.6.3.2