Disable runnable_cxx on POSIX's auto-tester

This is now handled by Github actions. Don't disable Windows because this hasn't been implemented yet.
This commit is contained in:
Geod24 2020-03-27 18:20:43 +09:00
parent 848824ab57
commit c6c14a1e3c
3 changed files with 13 additions and 2 deletions

4
ci.sh
View file

@ -86,9 +86,9 @@ test() {
test_dmd() {
# test fewer compiler argument permutations for PRs to reduce CI load
if [ "$FULL_BUILD" == "true" ] && [ "$OS_NAME" == "linux" ]; then
make -j1 -C test start_all_tests MODEL=$MODEL N=$N # all ARGS by default
make -j1 -C test auto-tester-test MODEL=$MODEL N=$N # all ARGS by default
else
make -j1 -C test start_all_tests MODEL=$MODEL N=$N ARGS="-O -inline -release"
make -j1 -C test auto-tester-test MODEL=$MODEL N=$N ARGS="-O -inline -release"
fi
}

View file

@ -19,7 +19,14 @@ ifneq (,$(findstring Darwin_64_32, $(PWD)))
auto-tester-test:
echo "Darwin_64_32_disabled"
else
ifneq (,$(findstring windows, $(PWD)))
auto-tester-test: test
else # POSIX
# Like test, but without runnable_cxx
auto-tester-test:
$(QUIET)$(MAKE) -C src -f posix.mak unittest
$(QUIET)$(MAKE) -C test -f Makefile
endif
endif
buildkite-test: test

View file

@ -208,6 +208,10 @@ start_all_tests: $(RUNNER)
@echo "Running all tests"
$(EXECUTE_RUNNER) all
# The auto-tester cannot run runnable_cxx as its compiler is too old
auto-tester-test: $(RUNNER)
$(EXECUTE_RUNNER) runnable compilable fail_compilation dshell
$(RESULTS_DIR)/d_do_test$(EXE): tools/d_do_test.d tools/sanitize_json.d $(RESULTS_DIR)/.created
@echo "Building d_do_test tool"
@echo "OS: '$(OS)'"