Try running all tests using cwd

rust-lang · Jul 17, 2017 · c35030a · c35030a
1 parent f4e329f
commit c35030a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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,