diff options
| -rw-r--r-- | src/compiletest/common.rs | 3 | ||||
| -rw-r--r-- | src/compiletest/compiletest.rs | 3 | ||||
| -rw-r--r-- | src/compiletest/runtest.rs | 9 |
3 files changed, 5 insertions, 10 deletions
diff --git a/src/compiletest/common.rs b/src/compiletest/common.rs index bbe8026030f..f1d89b88316 100644 --- a/src/compiletest/common.rs +++ b/src/compiletest/common.rs @@ -83,9 +83,6 @@ pub struct config { // Run tests using the JIT jit: bool, - // Run tests using the new runtime - newrt: bool, - // Target system to be tested target: ~str, diff --git a/src/compiletest/compiletest.rs b/src/compiletest/compiletest.rs index a186714fd70..d4d80eba5c9 100644 --- a/src/compiletest/compiletest.rs +++ b/src/compiletest/compiletest.rs @@ -71,7 +71,6 @@ pub fn parse_config(args: ~[~str]) -> config { optopt("", "ratchet-noise-percent", "percent change in metrics to consider noise", "N"), optflag("", "jit", "run tests under the JIT"), - optflag("", "newrt", "run tests on the new runtime / scheduler"), optopt("", "target", "the target to build for", "TARGET"), optopt("", "adb-path", "path to the android debugger", "PATH"), optopt("", "adb-test-dir", "path to tests for the android debugger", "PATH"), @@ -137,7 +136,6 @@ pub fn parse_config(args: ~[~str]) -> config { runtool: getopts::opt_maybe_str(matches, "runtool"), rustcflags: getopts::opt_maybe_str(matches, "rustcflags"), jit: getopts::opt_present(matches, "jit"), - newrt: getopts::opt_present(matches, "newrt"), target: opt_str2(getopts::opt_maybe_str(matches, "target")).to_str(), adb_path: opt_str2(getopts::opt_maybe_str(matches, "adb-path")).to_str(), adb_test_dir: @@ -171,7 +169,6 @@ pub fn log_config(config: &config) { logv(c, fmt!("runtool: %s", opt_str(&config.runtool))); logv(c, fmt!("rustcflags: %s", opt_str(&config.rustcflags))); logv(c, fmt!("jit: %b", config.jit)); - logv(c, fmt!("newrt: %b", config.newrt)); logv(c, fmt!("target: %s", config.target)); logv(c, fmt!("adb_path: %s", config.adb_path)); logv(c, fmt!("adb_test_dir: %s", config.adb_test_dir)); diff --git a/src/compiletest/runtest.rs b/src/compiletest/runtest.rs index 05fd621e597..ea94ce662ac 100644 --- a/src/compiletest/runtest.rs +++ b/src/compiletest/runtest.rs @@ -547,15 +547,13 @@ fn compile_test_(config: &config, props: &TestProps, fn exec_compiled_test(config: &config, props: &TestProps, testfile: &Path) -> ProcRes { - // If testing the new runtime then set the RUST_NEWRT env var let env = props.exec_env.clone(); - let env = if config.newrt { env + &[(~"RUST_NEWRT", ~"1")] } else { env }; match config.target { ~"arm-linux-androideabi" => { if (config.adb_device_status) { - _arm_exec_compiled_test(config, props, testfile) + _arm_exec_compiled_test(config, props, testfile, env) } else { _dummy_exec_compiled_test(config, props, testfile) } @@ -781,7 +779,7 @@ stderr:\n\ } fn _arm_exec_compiled_test(config: &config, props: &TestProps, - testfile: &Path) -> ProcRes { + testfile: &Path, env: ~[(~str, ~str)]) -> ProcRes { let args = make_run_args(config, props, testfile); let cmdline = make_cmdline("", args.prog, args.args); @@ -807,6 +805,9 @@ fn _arm_exec_compiled_test(config: &config, props: &TestProps, // run test via adb_run_wrapper runargs.push(~"shell"); + for (key, val) in env.move_iter() { + runargs.push(fmt!("%s=%s", key, val)); + } runargs.push(fmt!("%s/adb_run_wrapper.sh", config.adb_test_dir)); runargs.push(fmt!("%s", config.adb_test_dir)); runargs.push(fmt!("%s", prog_short)); |