Skip to content

Commit eb777d5

Browse files
committed
Don't run betterC tests on the auto-tester and only on CircleCi +
Buildkite for now.
1 parent 57d1256 commit eb777d5

2 files changed

Lines changed: 9 additions & 3 deletions

File tree

.circleci/run.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,10 @@ publictests()
126126
source "$(CURL_USER_AGENT=\"$CURL_USER_AGENT\" bash ~/dlang/install.sh dmd-$HOST_DMD_VER --activate)"
127127
128128
make -f posix.mak -j$N publictests DUB=$DUB BUILD=$BUILD
129+
130+
# run -betterC tests
131+
make -f posix.mak test_extractor # build in single-threaded mode
132+
make -f posix.mak -j$N betterc
129133
}
130134
131135
# test stdx dub package

posix.mak

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -611,6 +611,8 @@ $(TESTS_EXTRACTOR): $(TOOLS_DIR)/tests_extractor.d | $(LIB)
611611
DFLAGS="$(DFLAGS) $(LIB) $(NODEFAULTLIB) $(LINKDL)" $(DUB) build --force --compiler=$${PWD}/$(DMD) --single $<
612612
mv $(TOOLS_DIR)/tests_extractor $@
613613

614+
test_extractor: $(TESTS_EXTRACTOR)
615+
614616
################################################################################
615617
# Extract public tests of a module and test them in an separate file (i.e. without its module)
616618
# This is done to check for potentially missing imports in the examples, e.g.
@@ -647,7 +649,7 @@ betterc: betterc-phobos-tests betterc-run-tests
647649
# Run separate -betterC tests
648650
################################################################################
649651

650-
test/betterC/%.run: test/betterC/%.d $(DMD) $(LIB)
652+
test/betterC/%.run: test/betterC/%.d $(DRUNTIME)
651653
mkdir -p $(ROOT)/unittest/betterC
652654
$(DMD) $(DFLAGS) -of$(ROOT)/unittest/betterC/$(notdir $(basename $<)) -betterC $(UDFLAGS) \
653655
$(NODEFAULTLIB) $(LINKDL) $<
@@ -661,9 +663,9 @@ betterc-run-tests: $(subst .d,.run,$(wildcard test/betterC/*.d))
661663
auto-tester-build: all checkwhitespace
662664

663665
.PHONY : auto-tester-test
664-
auto-tester-test: unittest betterc
666+
auto-tester-test: unittest
665667

666668
.PHONY: buildkite-test
667-
buildkite-test: unittest betterC
669+
buildkite-test: unittest betterc
668670

669671
.DELETE_ON_ERROR: # GNU Make directive (delete output files on error)

0 commit comments

Comments
 (0)