dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tweak to get windows test-running correct

This commit is contained in:
Niko Matsakis 2011-11-28 21:23:42 -08:00
parent 89a4f8c751
commit 6e55426c8c
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mk/platform.mk
View File

@ -101,7 +101,7 @@ else
CFG_GCCISH_CFLAGS += -O2
endif
CFG_TESTLIB=$(CFG_BUILD_DIR)/$(CFG_HOST_TRIPLE)/$(strip \
CFG_TESTLIB=$(CFG_BUILD_DIR)/$(2)/$(strip \
$(if $(findstring stage0,$(1)), \
stage0/lib, \
$(if $(findstring stage1,$(1)), \
@ -158,8 +158,8 @@ ifdef CFG_WINDOWSY
CFG_DEF_SUFFIX := .def
CFG_LDPATH :=$(CFG_LDPATH):$$PATH
CFG_RUN=PATH="$(CFG_LDPATH):$(1)" $(2)
CFG_RUN_TARG=$(call CFG_RUN,$(HOST_LIB$(1)),$(2))
CFG_RUN_TEST=$(call CFG_RUN,$(call CFG_TESTLIB,$(1)),$(1))
CFG_RUN_TARG=$(call CFG_RUN,$(HLIB$(1)_H_$(CFG_HOST_TRIPLE)),$(2))
CFG_RUN_TEST=$(call CFG_RUN,$(call CFG_TESTLIB,$(1),$(3)),$(1))
CFG_LIBUV_LINK_FLAGS=-lWs2_32
ifndef CFG_ENABLE_MINGW_CROSS

8
mk/tests.mk
View File

@ -62,7 +62,7 @@ STDTEST_INPUTS := $(wildcard $(S)src/test/stdtest/*rs)
# Run the compiletest runner itself under valgrind
ifdef CTEST_VALGRIND
CFG_RUN_CTEST=$(call CFG_RUN_TEST,$(2))
CFG_RUN_CTEST=$(call CFG_RUN_TEST,$(2),$(3))
else
CFG_RUN_CTEST=$(call CFG_RUN,$(TLIB$(1)_T_$(3)_H_$(3)),$(2))
endif
@ -174,7 +174,7 @@ $(3)/test/stdtest.stage$(1)-$(2)$$(X): \
check-stage$(1)-T-$(2)-H-$(3)-std-dummy: \
$(3)/test/stdtest.stage$(1)-$(2)$$(X)
@$$(call E, run: $$<)
$$(Q)$$(call CFG_RUN_TEST,$$<) $$(TESTARGS)
$$(Q)$$(call CFG_RUN_TEST,$$<,$(2),$(3)) $$(TESTARGS)
# Rules for the rustc test runner
@ -189,7 +189,7 @@ $(3)/test/rustctest.stage$(1)-$(2)$$(X): \
check-stage$(1)-T-$(2)-H-$(3)-rustc-dummy: \
$(3)/test/rustctest.stage$(1)-$(2)$$(X)
@$$(call E, run: $$<)
$$(Q)$$(call CFG_RUN_TEST,$$<) $$(TESTARGS)
$$(Q)$$(call CFG_RUN_TEST,$$<,$(2),$(3)) $$(TESTARGS)
# Rules for the cfail/rfail/rpass/bench/perf test runner
@ -395,4 +395,4 @@ test/$(FT_DRIVER)$(X): test/$(FT_DRIVER).rs $(TARGET_HOST_LIB2)/$(FT_LIB) \
$(STAGE2_$(CFG_HOST_TRIPLE)) -L $(HOST_LIB2) -o $@ $<
test/$(FT_DRIVER).out: test/$(FT_DRIVER)$(X) $(SREQ2$(CFG_HOST_TRIPLE))
$(Q)$(call CFG_RUN_TEST, $<)
$(Q)$(call CFG_RUN_TEST,$<,$(CFG_HOST_TRIPLE),$(CFG_HOST_TRIPLE))

3
src/etc/snapshot.py
View File

@ -56,7 +56,8 @@ def full_snapshot_name(date, rev, platform, hsh):
def get_kernel(triple):
os_name = triple.split('-')[-1]
if os_name == "nt" or scrub(os.getenv("CFG_ENABLE_MINGW_CROSS")):
#scrub(os.getenv("CFG_ENABLE_MINGW_CROSS")):
if os_name == "nt" or os_name == "mingw32":
return "winnt"
if os_name == "darwin":
return "macos"