From e963cfd41a4c8acbd42e88511fb0ab27ea11f5b3 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Tue, 4 Oct 2011 16:35:49 -0700
Subject: [PATCH] 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
---
 mk/platform.mk | 2 +-
 mk/tests.mk    | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/mk/platform.mk b/mk/platform.mk
index d83d248b437..75201fabf57 100644
--- a/mk/platform.mk
+++ b/mk/platform.mk
@@ -89,7 +89,7 @@ CFG_TESTLIB=$(CFG_BUILD_DIR)/$(strip \
                stage2/lib, \
                $(if $(findstring stage3,$(1)), \
                     stage3/lib, \
-               )))))
+               )))))/rustc/$(CFG_HOST_TRIPLE)/lib
 
 ifdef CFG_UNIXY
   CFG_INFO := $(info cfg: unix-y environment)
diff --git a/mk/tests.mk b/mk/tests.mk
index 2209265a233..184ee9b8c2e 100644
--- a/mk/tests.mk
+++ b/mk/tests.mk
@@ -160,7 +160,7 @@ test/rustctest.stage$(1)$$(X): \
 
 check-stage$(1)-rustc-dummy: test/rustctest.stage$(1)$$(X)
 	@$$(call E, run: $$<)
-	$$(Q)$$(call CFG_RUN,$$(HOST_LIB$(1)),$$(CFG_VALGRIND) $$<) \
+	$$(Q)$$(call CFG_RUN_TEST,$$<) \
 	  $$(TESTARGS)
 
 
@@ -286,11 +286,12 @@ test/$(FT).rc test/$(FT_DRIVER).rs: $(TEST_RPASS_SOURCES_STAGE2) \
 	@$(call E, check: building combined stage2 test runner)
 	$(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: $@)
 	$(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: $@)
 	$(STAGE2) -L $(HOST_LIB2) -o $@ $<