diff --git a/posix.mak b/posix.mak index 49d31dc0a6..a93eb8c73a 100644 --- a/posix.mak +++ b/posix.mak @@ -6,6 +6,14 @@ DRUNTIME_PATH = ../druntime PHOBOS_PATH = ../phobos DUB=dub +RDMD_TEST_COMPILERS = $(abspath $(DMD)) + +VERBOSE_RDMD_TEST=0 + +ifeq ($(VERBOSE_RDMD_TEST), 1) + override VERBOSE_RDMD_TEST_FLAGS:=-v +endif + WITH_DOC = no DOC = ../dlang.org @@ -110,7 +118,9 @@ test_tests_extractor: $(ROOT)/tests_extractor $< -i ./test/tests_extractor/iteration.d | diff - ./test/tests_extractor/iteration.d.ext test_rdmd: $(ROOT)/rdmd_test $(ROOT)/rdmd - $< --compiler=$(abspath $(DMD)) -m$(MODEL) + $< --compiler=$(abspath $(DMD)) -m$(MODEL) \ + --test-compilers=$(RDMD_TEST_COMPILERS) \ + $(VERBOSE_RDMD_TEST_FLAGS) $(DMD) $(DFLAGS) -unittest -main -run rdmd.d test: test_tests_extractor test_rdmd diff --git a/travis.sh b/travis.sh index 21690b7629..501a9df203 100755 --- a/travis.sh +++ b/travis.sh @@ -2,5 +2,13 @@ set -uexo pipefail -make -f posix.mak all DMD="$(which $DMD)" -make -f posix.mak test DMD="$(which $DMD)" +~/dlang/install.sh install ldc + +~/dlang/install.sh list + +LDMD2=$(find ~/dlang -type f -name "ldmd2") + +make -f posix.mak all DMD=$(which dmd) +make -f posix.mak test DMD=$(which dmd) \ + RDMD_TEST_COMPILERS=dmd,$LDMD2 \ + VERBOSE_RDMD_TEST=1