Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-15 07:13:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: fix dependencies.

Browse Source 
* tests/local.mk (check_SCRIPTS): Add atlocal and atconfig so
that they are properly updated before running tests.
(RUN_TESTSUITE_deps): New.
Use it to factor the dependencies of "*-check" targets,
especially those that don't bounce to the regular
"check-local" target, since then they don't benefit from the
proper dependencies (such as atlocal).
This commit is contained in:
Akim Demaille
2012-03-23 16:00:42 +01:00
parent 70986d84bc
commit ff9684b720
1 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
tests/local.mk
View File

@@ -36,9 +36,9 @@ $(top_srcdir)/tests/package.m4: $(top_srcdir)/configure
} >$@.tmp } >$@.tmp
$(AM_V_at)mv $@.tmp $@ $(AM_V_at)mv $@.tmp $@
## ------------ ## ## ------------------------- ##
## Test suite. ## ## Generate the test suite. ##
## ------------ ## ## ------------------------- ##
## Leave testsuite.at first for the "testsuite" rule's $<. ## Leave testsuite.at first for the "testsuite" rule's $<.
TESTSUITE_AT = \ TESTSUITE_AT = \
@@ -67,7 +67,6 @@ TESTSUITE_AT = \
tests/torture.at tests/torture.at
TESTSUITE = $(top_srcdir)/tests/testsuite TESTSUITE = $(top_srcdir)/tests/testsuite
RUN_TESTSUITE = $(TESTSUITE) -C tests $(TESTSUITEFLAGS)
AUTOTEST = $(AUTOM4TE) --language=autotest AUTOTEST = $(AUTOM4TE) --language=autotest
AUTOTESTFLAGS = -I $(top_srcdir)/tests AUTOTESTFLAGS = -I $(top_srcdir)/tests
@@ -75,31 +74,38 @@ $(TESTSUITE): $(TESTSUITE_AT)
$(AM_V_GEN)$(AUTOTEST) $(AUTOTESTFLAGS) $< -o $@.tmp $(AM_V_GEN)$(AUTOTEST) $(AUTOTESTFLAGS) $< -o $@.tmp
$(AM_V_at)mv $@.tmp $@ $(AM_V_at)mv $@.tmp $@
## -------------------- ##
## Run the test suite. ##
## -------------------- ##
# Move into tests/ so that testsuite.dir etc. be created there.
RUN_TESTSUITE = $(TESTSUITE) -C tests $(TESTSUITEFLAGS)
check_SCRIPTS = $(BISON) tests/atconfig tests/atlocal
RUN_TESTSUITE_deps = $(TESTSUITE) $(check_SCRIPTS)
clean-local: clean-local-tests clean-local: clean-local-tests
clean-local-tests: clean-local-tests:
test ! -f $(TESTSUITE) || $(TESTSUITE) -C tests --clean test ! -f $(TESTSUITE) || $(TESTSUITE) -C tests --clean
check-local: tests/atconfig tests/atlocal $(TESTSUITE) check-local: $(RUN_TESTSUITE_deps)
# Move into tests/ so that testsuite.dir etc. be created there.
$(RUN_TESTSUITE) $(RUN_TESTSUITE)
check_SCRIPTS = $(BISON)
# Run the test suite on the *installed* tree. # Run the test suite on the *installed* tree.
installcheck-local: installcheck-local: $(RUN_TESTSUITE_deps)
$(RUN_TESTSUITE) AUTOTEST_PATH="$(bindir)" $(RUN_TESTSUITE) AUTOTEST_PATH="$(bindir)"
# Be real mean with it. # Be real mean with it.
.PHONY: maintainer-check-g++ .PHONY: maintainer-check-g++
maintainer-check-g++: $(TESTSUITE)
$(RUN_TESTSUITE) CC='$(CXX)' $(RUN_TESTSUITE) CC='$(CXX)'
maintainer-check-g++: $(RUN_TESTSUITE_deps)
.PHONY: maintainer-check-posix .PHONY: maintainer-check-posix
maintainer-check-posix: $(TESTSUITE) maintainer-check-posix: $(RUN_TESTSUITE_deps)
$(RUN_TESTSUITE) POSIXLY_CORRECT=1 _POSIX2_VERSION=200112 $(RUN_TESTSUITE) POSIXLY_CORRECT=1 _POSIX2_VERSION=200112
.PHONY: maintainer-check-valgrind .PHONY: maintainer-check-valgrind
maintainer-check-valgrind: $(TESTSUITE) maintainer-check-valgrind: $(RUN_TESTSUITE_deps)
test -z '$(VALGRIND)' || \ test -z '$(VALGRIND)' || \
VALGRIND_OPTS='--leak-check=full --show-reachable=yes' \ VALGRIND_OPTS='--leak-check=full --show-reachable=yes' \
$(RUN_TESTSUITE) PREBISON='$(VALGRIND) -q' PREPARSER='$(VALGRIND) -q' $(RUN_TESTSUITE) PREBISON='$(VALGRIND) -q' PREPARSER='$(VALGRIND) -q'