Skip to content

Commit

Permalink
Merge pull request #6714 from wilzbach/remove-betterc-separate
Browse files Browse the repository at this point in the history
Remove separate @BetterC tests
merged-on-behalf-of: Petar Kirov <ZombineDev@users.noreply.github.com>
  • Loading branch information
dlang-bot authored Sep 20, 2018
2 parents 0032c8d + c7aeb24 commit fe35b94
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 17 deletions.
14 changes: 1 addition & 13 deletions posix.mak
Original file line number Diff line number Diff line change
Expand Up @@ -635,7 +635,7 @@ publictests: $(addsuffix .publictests,$(D_MODULES))
################################################################################

betterc-phobos-tests: $(addsuffix .betterc,$(D_MODULES))
betterc: betterc-phobos-tests betterc-run-tests
betterc: betterc-phobos-tests

%.betterc: %.d | $(BETTERCTESTS_DIR)/.directory
@# Due to the FORCE rule on druntime, make will always try to rebuild Phobos (even as an order-only dependency)
Expand All @@ -645,18 +645,6 @@ betterc: betterc-phobos-tests betterc-run-tests
--inputdir $< --outputdir $(BETTERCTESTS_DIR)
@$(DMD) $(DFLAGS) $(NODEFAULTLIB) -betterC $(UDFLAGS) -run $(BETTERCTESTS_DIR)/$(subst /,_,$<)

################################################################################
# Run separate -betterC tests
################################################################################

test/betterC/%.run: test/betterC/%.d $(DRUNTIME)
mkdir -p $(ROOT)/unittest/betterC
$(DMD) $(DFLAGS) -of$(ROOT)/unittest/betterC/$(notdir $(basename $<)) -betterC $(UDFLAGS) \
$(NODEFAULTLIB) $(LINKDL) $<
./$(ROOT)/unittest/betterC/$(notdir $(basename $<))

betterc-run-tests: $(subst .d,.run,$(wildcard test/betterC/*.d))

################################################################################

.PHONY : auto-tester-build
Expand Down
4 changes: 0 additions & 4 deletions test/betterC/algorithm.d

This file was deleted.

0 comments on commit fe35b94

Please sign in to comment.