---

yaml
---
r: 196300
b: refs/heads/tmp
c: d81e866
h: refs/heads/master
v: v3

Author: nikomatsakis

[refs]

@@ -32,7 +32,7 @@ refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
 refs/heads/beta: 9854143cba679834bc4ef932858cd5303f015a0e
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
-refs/heads/tmp: 9bb05fd41403c6fc28b82e8eff35f8791876ac18
+refs/heads/tmp: d81e86622ca6864c6510d1cb072fcbfc6be2ea3d
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: 53a183f0274316596bf9405944d4f0468d8c93e4
 refs/heads/gate: 97c84447b65164731087ea82685580cc81424412

branches/tmp/src/compiletest/compiletest.rs

@@ -31,6 +31,7 @@ extern crate log;
 use std::env;
 use std::fs;
 use std::path::{Path, PathBuf};
+use std::thunk::Thunk;
 use getopts::{optopt, optflag, reqopt};
 use common::Config;
 use common::{Pretty, DebugInfoGdb, DebugInfoLldb, Codegen};
@@ -350,7 +351,7 @@ pub fn make_test_name(config: &Config, testfile: &Path) -> test::TestName {
 pub fn make_test_closure(config: &Config, testfile: &Path) -> test::TestFn {
     let config = (*config).clone();
     let testfile = testfile.to_path_buf();
-    test::DynTestFn(Box::new(move || {
+    test::DynTestFn(Thunk::new(move || {
         runtest::run(config, &testfile)
     }))
 }

branches/tmp/src/compiletest/header.rs

@@ -311,7 +311,7 @@ fn parse_exec_env(line: &str) -> Option<(String, String)> {
     parse_name_value_directive(line, "exec-env").map(|nv| {
         // nv is either FOO or FOO=BAR
         let mut strs: Vec<String> = nv
-                                      .splitn(2, '=')
+                                      .splitn(1, '=')
                                       .map(|s| s.to_string())
                                       .collect();