From c35030af87a5658929902cde18939145dcaed590 Mon Sep 17 00:00:00 2001 From: Richard Dodd Date: Tue, 30 May 2017 17:52:23 +0100 Subject: [PATCH] Try running all tests using cwd --- src/librustc_back/target/wasm32_unknown_emscripten.rs | 2 -- src/tools/compiletest/src/procsrv.rs | 1 + src/tools/compiletest/src/runtest.rs | 7 ++----- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/librustc_back/target/wasm32_unknown_emscripten.rs b/src/librustc_back/target/wasm32_unknown_emscripten.rs index c44095df4001..f5fb63038e91 100644 --- a/src/librustc_back/target/wasm32_unknown_emscripten.rs +++ b/src/librustc_back/target/wasm32_unknown_emscripten.rs @@ -18,8 +18,6 @@ pub fn target() -> Result { vec!["-s".to_string(), "BINARYEN=1".to_string(), "-s".to_string(), - "BINARYEN_METHOD='native-wasm,interpret-binary'".to_string(), - "-s".to_string(), "ERROR_ON_UNDEFINED_SYMBOLS=1".to_string()]); let opts = TargetOptions { diff --git a/src/tools/compiletest/src/procsrv.rs b/src/tools/compiletest/src/procsrv.rs index 0ad52de6175a..aac2c87e5b39 100644 --- a/src/tools/compiletest/src/procsrv.rs +++ b/src/tools/compiletest/src/procsrv.rs @@ -69,6 +69,7 @@ pub fn run(lib_path: &str, } if let Some(cwd) = current_dir { cmd.current_dir(cwd); + panic!("Backtrace"); } let mut process = cmd.spawn()?; diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs index 0664525221fd..e9cab5be317b 100644 --- a/src/tools/compiletest/src/runtest.rs +++ b/src/tools/compiletest/src/runtest.rs @@ -1546,11 +1546,8 @@ actual:\n\ logv(self.config, format!("executing {}", cmdline)); cmdline }; - let working_dir = if self.config.target.contains("emscripten") { - Some(self.output_base_name().parent().unwrap().to_str().unwrap().to_owned()) - } else { - None - }; + let working_dir = + Some(self.output_base_name().parent().unwrap().to_str().unwrap().to_owned()); let procsrv::Result { out,