---

yaml
---
r: 4094
b: refs/heads/master
c: 2573fe7
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e6e53aff6398f9d2c6851c25acfdedd0bf47a321
+refs/heads/master: 2573fe7026eb696841acbba8f3d1c09e2224acf0

trunk/configure

@@ -182,8 +182,7 @@ for i in \
     rustllvm \
     dl stage0 stage1 stage2 stage3 \
     stage0/lib stage1/lib stage2/lib stage3/lib \
-    test/run-pass test/run-fail test/compile-fail \
-    test/bench/99-bottles test/bench/shootout test/bench/task-perf
+    test/run-pass test/run-fail test/compile-fail test/bench
 do
     make_dir $i
 done

trunk/mk/clean.mk

@@ -38,6 +38,7 @@ clean:
 	$(Q)rm -f rt/$(CFG_RUNTIME)
 	$(Q)rm -f rt/main.o
 	$(Q)rm -f rt/main.ll
+	$(Q)rm -f test/run_pass_stage2.rc test/run_pass_stage2_driver.rs
 	$(Q)rm -Rf $(PKG_NAME)-*.tar.gz dist
 	$(Q)rm -f $(foreach ext,o a d bc s exe,$(wildcard stage*/*.$(ext)))
 	$(Q)rm -Rf $(foreach ext,out out.tmp                      \

trunk/mk/platform.mk

@@ -63,24 +63,27 @@ ifneq ($(findstring MINGW,$(CFG_OSTYPE)),)
   CFG_WINDOWSY := 1
 endif
 
-CFG_TESTLIB=$(CFG_BUILD_DIR)/$(strip     \
- $(if $(findstring stage0,$(1)),         \
-       stage0/lib,                           \
-      $(if $(findstring stage1,$(1)),    \
-           stage1/lib,                       \
-          $(if $(findstring stage2,$(1)),\
-               stage2/lib,                   \
-               ))))
+CFG_TESTLIB=$(CFG_BUILD_DIR)/$(strip \
+ $(if $(findstring stage0,$(1)), \
+       stage0/lib, \
+      $(if $(findstring stage1,$(1)), \
+           stage1/lib, \
+          $(if $(findstring stage2,$(1)), \
+               stage2/lib, \
+               $(if $(findstring stage3,$(1)), \
+                    stage3/lib, \
+               )))))
 
 ifdef CFG_UNIXY
   CFG_INFO := $(info cfg: unix-y environment)
 
   CFG_PATH_MUNGE := true
   CFG_EXE_SUFFIX :=
-  CFG_RUN_TARG=$(CFG_LDENV)=$(CFG_BUILD_DIR)/$(1) $(2)
-  CFG_RUN_TEST=\
-      $(CFG_LDENV)=$(call CFG_TESTLIB,$(1)) \
-      $(CFG_VALGRIND) $(1)
+  CFG_LDPATH :=
+  CFG_RUN=$(CFG_LDENV)=$(1) $(2)
+  CFG_RUN_TARG=$(call CFG_RUN,$(CFG_BUILD_DIR)/$(1),$(2))
+  CFG_RUN_TEST=$(call CFG_RUN,$(call CFG_TESTLIB,$(1)),\
+      $(CFG_VALGRIND) $(1))
 
   ifdef CFG_ENABLE_MINGW_CROSS
     CFG_WINDOWSY := 1
@@ -117,8 +120,9 @@ ifdef CFG_WINDOWSY
   CFG_DEF_SUFFIX := .def
   CFG_LDPATH :=$(CFG_LLVM_BINDIR)
   CFG_LDPATH :=$(CFG_LDPATH):$$PATH
-  CFG_RUN_TEST=PATH="$(CFG_LDPATH):$(call CFG_TESTLIB,$(1))" $(1)
-  CFG_RUN_TARG=PATH="$(CFG_LDPATH)" $(2)
+  CFG_RUN=PATH="$(CFG_LDPATH):$(1)" $(2)
+  CFG_RUN_TARG=$(call CFG_RUN,,$(2))
+  CFG_RUN_TEST=$(call CFG_RUN,$(call CFG_TESTLIB,$(1)),$(1))
 
   ifndef CFG_ENABLE_MINGW_CROSS
     CFG_PATH_MUNGE := $(strip perl -i.bak -p             \