---

yaml
---
r: 64894
b: refs/heads/snap-stage3
c: 91f1ab4
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 38d62feec1e65ba5ed57235355053782ca15b5ff
+refs/heads/snap-stage3: 91f1ab48969e1b7d3f4871348db2ec302000c93a
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/mk/tests.mk

@@ -34,16 +34,12 @@ ifdef CHECK_XFAILS
   TESTARGS += --ignored
 endif
 
-TEST_BENCH = --bench
+CTEST_BENCH = --bench
 
 # Arguments to the cfail/rfail/rpass/bench tests
 ifdef CFG_VALGRIND
   CTEST_RUNTOOL = --runtool "$(CFG_VALGRIND)"
-  TEST_BENCH =
-endif
-
-ifdef NO_BENCH
-  TEST_BENCH =
+  CTEST_BENCH =
 endif
 
 # Arguments to the perf tests
@@ -73,12 +69,12 @@ TEST_RATCHET_NOISE_PERCENT=10.0
 # Whether to ratchet or merely save benchmarks
 ifdef CFG_RATCHET_BENCH
 CRATE_TEST_BENCH_ARGS=\
-  --test $(TEST_BENCH) \
+  --test $(CTEST_BENCH) \
   --ratchet-metrics $(call TEST_RATCHET_FILE,$(1),$(2),$(3),$(4)) \
   --ratchet-noise-percent $(TEST_RATCHET_NOISE_PERCENT)
 else
 CRATE_TEST_BENCH_ARGS=\
-  --test $(TEST_BENCH) \
+  --test $(CTEST_BENCH) \
   --save-metrics $(call TEST_RATCHET_FILE,$(1),$(2),$(3),$(4))
 endif
 

branches/snap-stage3/src/rt/rust_builtin.cpp

@@ -939,12 +939,12 @@ static lock_and_signal change_dir_lock;
 
 extern "C" CDECL void
 rust_take_change_dir_lock() {
-    global_args_lock.lock();
+    change_dir_lock.lock();
 }
 
 extern "C" CDECL void
 rust_drop_change_dir_lock() {
-    global_args_lock.unlock();
+    change_dir_lock.unlock();
 }
 
 //