---

yaml
---
r: 147646
b: refs/heads/try2
c: d0dfc35
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 9ff65b503f0ecb00e5ddcda1776b1c55b123fc46
+refs/heads/try2: d0dfc35fc906e30502c17139ac91798db4d99fce
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/front/test.rs

@@ -41,7 +41,7 @@ struct TestCtxt {
     sess: session::Session,
     path: RefCell<~[ast::Ident]>,
     ext_cx: @ExtCtxt,
-    testfns: ~[Test],
+    testfns: RefCell<~[Test]>,
     is_extra: bool,
     config: ast::CrateConfig,
 }
@@ -104,7 +104,10 @@ impl fold::ast_fold for TestHarnessGenerator {
                         ignore: is_ignored(self.cx, i),
                         should_fail: should_fail(i)
                     };
-                    self.cx.testfns.push(test);
+                    {
+                        let mut testfns = self.cx.testfns.borrow_mut();
+                        testfns.get().push(test);
+                    }
                     // debug!("have {} test/bench functions",
                     //        cx.testfns.len());
                 }
@@ -155,7 +158,7 @@ fn generate_test_harness(sess: session::Session, crate: ast::Crate)
         sess: sess,
         ext_cx: ExtCtxt::new(sess.parse_sess, sess.opts.cfg.clone()),
         path: RefCell::new(~[]),
-        testfns: ~[],
+        testfns: RefCell::new(~[]),
         is_extra: is_extra(&crate),
         config: crate.config.clone(),
     };
@@ -389,10 +392,13 @@ fn is_extra(crate: &ast::Crate) -> bool {
 }
 
 fn mk_test_descs(cx: &TestCtxt) -> @ast::Expr {
-    debug!("building test vector from {} tests", cx.testfns.len());
     let mut descs = ~[];
-    for test in cx.testfns.iter() {
-        descs.push(mk_test_desc_and_fn_rec(cx, test));
+    {
+        let testfns = cx.testfns.borrow();
+        debug!("building test vector from {} tests", testfns.get().len());
+        for test in testfns.get().iter() {
+            descs.push(mk_test_desc_and_fn_rec(cx, test));
+        }
     }
 
     let inner_expr = @ast::Expr {