---

yaml
---
r: 196090
b: refs/heads/beta
c: f0a9a0c
h: refs/heads/master
v: v3

Author: Dave Huseby

[refs]

@@ -29,7 +29,7 @@ refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
 refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
 refs/heads/batch: b7fd822592a4fb577552d93010c4a4e14f314346
 refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
-refs/heads/beta: 9edbf42a342ced7357fe5ec225975f214d872fbc
+refs/heads/beta: f0a9a0ca7b8757be5f2b211604e75185398a4a30
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: 9de34a84bb300bab1bf0227f577331620cd60511

branches/beta/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/beta/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();