OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Run tests with LD_LIBRARY_PATH set to the target libs, not the host libs 

Setting it to the host libs uses those compiled from the previous stage
This commit is contained in:
Brian Anderson 2011-10-04 16:35:49 -07:00
parent edf2622e21
commit e963cfd41a
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mk/platform.mk
View File

@ -89,7 +89,7 @@ CFG_TESTLIB=$(CFG_BUILD_DIR)/$(strip \
stage2/lib, \ stage2/lib, \
$(if $(findstring stage3,$(1)), \ $(if $(findstring stage3,$(1)), \
stage3/lib, \ stage3/lib, \
))))) )))))/rustc/$(CFG_HOST_TRIPLE)/lib
ifdef CFG_UNIXY ifdef CFG_UNIXY
CFG_INFO := $(info cfg: unix-y environment) CFG_INFO := $(info cfg: unix-y environment)

7
mk/tests.mk
View File

@ -160,7 +160,7 @@ test/rustctest.stage$(1)$$(X): \
check-stage$(1)-rustc-dummy: test/rustctest.stage$(1)$$(X) check-stage$(1)-rustc-dummy: test/rustctest.stage$(1)$$(X)
@$$(call E, run: $$<) @$$(call E, run: $$<)
$$(Q)$$(call CFG_RUN,$$(HOST_LIB$(1)),$$(CFG_VALGRIND) $$<) \ $$(Q)$$(call CFG_RUN_TEST,$$<) \
$$(TESTARGS) $$(TESTARGS)
@ -286,11 +286,12 @@ test/$(FT).rc test/$(FT_DRIVER).rs: $(TEST_RPASS_SOURCES_STAGE2) \
@$(call E, check: building combined stage2 test runner) @$(call E, check: building combined stage2 test runner)
$(Q)$(S)src/etc/combine-tests.py $(Q)$(S)src/etc/combine-tests.py
stage2/lib/$(FT_LIB): test/$(FT).rc $(SREQ2$(CFG_HOST_TRIPLE)) $(TARGET_HOST_LIB2)/$(FT_LIB): test/$(FT).rc $(SREQ2$(CFG_HOST_TRIPLE))
@$(call E, compile_and_link: $@) @$(call E, compile_and_link: $@)
$(STAGE2) --lib -o $@ $< $(STAGE2) --lib -o $@ $<
test/$(FT_DRIVER)$(X): test/$(FT_DRIVER).rs $(HOST_LIB2)/$(FT_LIB) $(SREQ2$(CFG_HOST_TRIPLE)) test/$(FT_DRIVER)$(X): test/$(FT_DRIVER).rs $(TARGET_HOST_LIB2)/$(FT_LIB) \
$(SREQ2$(CFG_HOST_TRIPLE))
@$(call E, compile_and_link: $@) @$(call E, compile_and_link: $@)
$(STAGE2) -L $(HOST_LIB2) -o $@ $< $(STAGE2) -L $(HOST_LIB2) -o $@ $<