mirror of
https://github.com/Mercury-Language/mercury.git
synced 2026-04-21 04:13:46 +00:00
1f45f91886
My commitafe2887882broke the ability to run the test suite outside of a bootcheck by executing "mmake runtests" in the tests directory. This diff fixes that. tests/Mmake.common: Don't define "TESTS_DIR = ..". While every single tests/*/Mmakefile defined it as such, I overlooked the fact that tests/Mmakefile itself defined it ".", referring to the same directory from a different starting point. Document this easily-overlooked fact. Rename the old runtests target, which afterafe2887runs the tests in a single directory, as runtests_dir, to leave the target name "runtests" itself free for tests/Mmakefile to use. tests/Mmakefile: Define "TESTS_DIR = .", and add a target "runtests" which invokes "mmake runtests_dir" in each test directory. tools/bootcheck: Invoke "mmake runtests_dir" instead of "mmake runtests" in each test directory. Initialize a variable just before it is used. tests/*/Mmakefile: Add back the definition "TESTS_DIR = .."
44 lines
1.2 KiB
Makefile
44 lines
1.2 KiB
Makefile
#-----------------------------------------------------------------------------#
|
|
# vim: ts=8 sw=8 noexpandtab ft=make
|
|
#-----------------------------------------------------------------------------#
|
|
|
|
TESTS_DIR = ..
|
|
THIS_DIR = valid_make_int
|
|
MAYBE_J1 =
|
|
|
|
#-----------------------------------------------------------------------------#
|
|
# Please keep these lists sorted.
|
|
|
|
SINGLE_MODULE_PROGS = \
|
|
bug499
|
|
|
|
MULTI_MODULE_PROGS = \
|
|
bug506 \
|
|
test_repn
|
|
|
|
#-----------------------------------------------------------------------------#
|
|
|
|
PROGS = $(SINGLE_MODULE_PROGS) $(MULTI_MODULE_PROGS)
|
|
TESTS = $(sort $(SINGLE_MODULE_PROGS:%=%-nodepend) $(MULTI_MODULE_PROGS))
|
|
include ../Mmake.common
|
|
|
|
# Module-specific options should go in Mercury.options so they can be found
|
|
# by `mmc --make'.
|
|
include Mercury.options
|
|
|
|
$(SINGLE_MODULE_PROGS:%=%.runtest): %.runtest: %.int ;
|
|
|
|
$(MULTI_MODULE_PROGS:%=%.runtest): %.runtest: %.int ;
|
|
|
|
#-----------------------------------------------------------------------------#
|
|
|
|
printtests:
|
|
@echo $(PROGS)
|
|
|
|
clean_local: clean_valid_make_int
|
|
|
|
clean_valid_make_int:
|
|
rm -f *.d *.dep *.dep_err *.date *.int*
|
|
|
|
#-----------------------------------------------------------------------------#
|