Skip to content

Run rdmd testsuite properly #244

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dlang-bot merged 4 commits into from
Jul 4, 2017
Merged

Run rdmd testsuite properly #244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3a6501a
Run rdmd testsuite properly
wilzbach Jul 4, 2017
ff92a74
Remove invalid assert in rdmd_test
wilzbach Jul 4, 2017
a9750db
Use DUBFLAGS to pass architecture to DUB
wilzbach Jul 4, 2017
6dee858
Add modelSwitch to rdmd_test
wilzbach Jul 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 20 additions & 3 deletions posix.mak
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ DFLAGS = -I$(DRUNTIME_PATH)/import -I$(PHOBOS_PATH) \
-L-L$(PHOBOS_PATH)/generated/$(OS)/release/$(MODEL) $(MODEL_FLAG)
DFLAGS += -w -de

# Default DUB flags (DUB uses a different architecture format)
DUBFLAGS = --arch=$(subst 32,x86,$(subst 64,x86_64,$(MODEL)))

TOOLS = \
$(ROOT)/rdmd \
$(ROOT)/ddemangle \
Expand All @@ -50,6 +53,9 @@ CURL_TOOLS = \
DOC_TOOLS = \
$(ROOT)/dman

TEST_TOOLS = \
$(ROOT)/rdmd_test

all: $(TOOLS) $(CURL_TOOLS) $(ROOT)/dustmite

rdmd: $(ROOT)/rdmd
Expand All @@ -65,7 +71,7 @@ dustmite: $(ROOT)/dustmite
$(ROOT)/dustmite: DustMite/dustmite.d DustMite/splitter.d
$(DMD) $(DFLAGS) DustMite/dustmite.d DustMite/splitter.d -of$(@)

$(TOOLS) $(DOC_TOOLS) $(CURL_TOOLS): $(ROOT)/%: %.d
$(TOOLS) $(DOC_TOOLS) $(CURL_TOOLS) $(TEST_TOOLS): $(ROOT)/%: %.d
$(DMD) $(DFLAGS) -of$(@) $(<)

ALL_OF_PHOBOS_DRUNTIME_AND_DLANG_ORG = # ???
Expand All @@ -86,12 +92,23 @@ clean:
$(ROOT)/tests_extractor: tests_extractor.d
mkdir -p $(ROOT)
$(DUB) build \
--single $< --force --compiler=$(abspath $(DMD)) && mv ./tests_extractor $@
--single $< --force --compiler=$(abspath $(DMD)) $(DUBFLAGS) \
&& mv ./tests_extractor $@

################################################################################
# Build & run tests
################################################################################

test: $(ROOT)/tests_extractor
test_tests_extractor: $(ROOT)/tests_extractor
$< -i ./test/tests_extractor/ascii.d | diff - ./test/tests_extractor/ascii.d.ext
$< -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)
$(DMD) $(DFLAGS) -unittest -main -run rdmd.d

test: test_tests_extractor test_rdmd

ifeq ($(WITH_DOC),yes)
all install: $(DOC_TOOLS)
endif
Expand Down
Loading