Skip to content

Commit

Permalink
Don't run betterC tests on the auto-tester and only on CircleCi +
Browse files Browse the repository at this point in the history
Buildkite for now.
  • Loading branch information
wilzbach committed Aug 21, 2018
1 parent 57d1256 commit eb777d5
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
4 changes: 4 additions & 0 deletions .circleci/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,10 @@ publictests()
source "$(CURL_USER_AGENT=\"$CURL_USER_AGENT\" bash ~/dlang/install.sh dmd-$HOST_DMD_VER --activate)"
make -f posix.mak -j$N publictests DUB=$DUB BUILD=$BUILD
# run -betterC tests
make -f posix.mak test_extractor # build in single-threaded mode
make -f posix.mak -j$N betterc
}
# test stdx dub package
Expand Down
8 changes: 5 additions & 3 deletions posix.mak
Original file line number Diff line number Diff line change
Expand Up @@ -611,6 +611,8 @@ $(TESTS_EXTRACTOR): $(TOOLS_DIR)/tests_extractor.d | $(LIB)
DFLAGS="$(DFLAGS) $(LIB) $(NODEFAULTLIB) $(LINKDL)" $(DUB) build --force --compiler=$${PWD}/$(DMD) --single $<
mv $(TOOLS_DIR)/tests_extractor $@

test_extractor: $(TESTS_EXTRACTOR)

################################################################################
# Extract public tests of a module and test them in an separate file (i.e. without its module)
# This is done to check for potentially missing imports in the examples, e.g.
Expand Down Expand Up @@ -647,7 +649,7 @@ betterc: betterc-phobos-tests betterc-run-tests
# Run separate -betterC tests
################################################################################

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

.PHONY : auto-tester-test
auto-tester-test: unittest betterc
auto-tester-test: unittest

.PHONY: buildkite-test
buildkite-test: unittest betterC
buildkite-test: unittest betterc

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

0 comments on commit eb777d5

Please sign in to comment.