mirror of
https://github.com/Mercury-Language/mercury.git
synced 2025-12-06 16:08:32 +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 = .."
90 lines
2.5 KiB
Makefile
90 lines
2.5 KiB
Makefile
#-----------------------------------------------------------------------------#
|
|
# vim: ts=8 sw=8 noexpandtab ft=make
|
|
#-----------------------------------------------------------------------------#
|
|
|
|
TESTS_DIR = ..
|
|
THIS_DIR = mmc_make
|
|
MAYBE_J1 =
|
|
|
|
#-----------------------------------------------------------------------------#
|
|
|
|
MMAKE_USE_MMC_MAKE=yes
|
|
|
|
PROGS = \
|
|
bug489 \
|
|
complex_test \
|
|
hello \
|
|
include_file \
|
|
include_file2 \
|
|
linkage_test \
|
|
rebuild
|
|
|
|
# These tests only work if the workspace was compiled with `--use-subdirs'.
|
|
ifneq ($(origin WORKSPACE),undefined)
|
|
ifeq ($(shell [ -d $(WORKSPACE)/library/Mercury ] || echo cannot_run),cannot_run)
|
|
PROGS =
|
|
endif
|
|
endif
|
|
|
|
TESTS = $(sort $(PROGS))
|
|
include ../Mmake.common
|
|
|
|
%.runtest: %.res ;
|
|
|
|
Mercury.modules: lexer.m
|
|
$(MC) -f $^
|
|
|
|
bug489.log: Mercury.modules
|
|
|
|
complex_test.log: install_libs
|
|
|
|
# Check that included files are identified as dependencies of the target code.
|
|
# sleep 1 is required because mmc --make timestamps are not granular enough.
|
|
include_file2.runtest: include_file
|
|
sleep 1 && touch inc/code.c inc/code.java inc/code.cs inc/code.erl
|
|
$(MCM) --verbose-make include_file > include_file2.err 2>&1
|
|
grep '^Making Mercury/.*/include_file[.]' include_file2.err
|
|
|
|
linkage_test.log: install_libs_linkage_test2
|
|
|
|
# Just test that the executable is rebuilt.
|
|
rebuild.runtest:
|
|
$(MCM) --rebuild rebuild
|
|
$(MCM) --rebuild --verbose-make rebuild > rebuild.err2 2>&1
|
|
grep '^Making rebuild\($$\|\.\)' rebuild.err2
|
|
|
|
# The compiler used to fail when invoked as `mmc --make build_object.o'.
|
|
build_object.runtest: build_object.o
|
|
|
|
.PHONY: install_libs
|
|
install_libs: start_runtests_local
|
|
$(MMAKE) TESTS_FLAGS
|
|
( cd lib; \
|
|
$(MCM) --no-libgrade --install-prefix $(shell pwd)/install \
|
|
libcomplex_numbers.install ) \
|
|
|| touch complex_test.failed
|
|
|
|
.PHONY: install_libs_linkage_test2
|
|
install_libs_linkage_test2: start_runtests_local
|
|
$(MMAKE) TESTS_FLAGS
|
|
( cd lib; \
|
|
$(MCM) --no-libgrade --install-prefix $(shell pwd)/install \
|
|
liblinkage_test2.install --lib-linkage static ) \
|
|
|| touch linkage_test.failed
|
|
|
|
# Copy/symlink TESTS_FLAGS into the current directory for when
|
|
# we change into the `lib' subdirectory.
|
|
TESTS_FLAGS: ../TESTS_FLAGS
|
|
ln -s $< $@ || cp $< $@
|
|
|
|
realclean_local: realclean_mmc_make
|
|
|
|
realclean_mmc_make: TESTS_FLAGS
|
|
rm -rf install include_file2.err rebuild.err2
|
|
# ./TESTS_FLAGS is expected by the following line.
|
|
cd lib; $(MCM) complex_numbers.realclean linkage_test2.realclean
|
|
rm -f TESTS_FLAGS
|
|
rm -f Mercury.modules
|
|
|
|
#-----------------------------------------------------------------------------#
|