diff options
| author | Richard Dodd <richard.o.dodd@gmail.com> | 2017-05-30 17:52:23 +0100 |
|---|---|---|
| committer | Richard Dodd <richard.o.dodd@gmail.com> | 2017-07-17 17:01:01 +0100 |
| commit | c35030af87a5658929902cde18939145dcaed590 (patch) | |
| tree | 613bcf5fdba8e713be26cf304e97e41e6e0fc2a0 | |
| parent | f4e329f178a9da9ae4cf844597bfd2261a365ad4 (diff) | |
| download | rust-c35030af87a5658929902cde18939145dcaed590.tar.gz rust-c35030af87a5658929902cde18939145dcaed590.zip | |
Try running all tests using cwd
| -rw-r--r-- | src/librustc_back/target/wasm32_unknown_emscripten.rs | 2 | ||||
| -rw-r--r-- | src/tools/compiletest/src/procsrv.rs | 1 | ||||
| -rw-r--r-- | 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 c44095df400..f5fb63038e9 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<Target, String> { 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 0ad52de6175..aac2c87e5b3 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 0664525221f..e9cab5be317 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, |