Skip to content

Commit c35030a

Browse files
committed
Try running all tests using cwd
1 parent f4e329f commit c35030a

File tree

3 files changed

+3
-7
lines changed

3 files changed

+3
-7
lines changed

src/librustc_back/target/wasm32_unknown_emscripten.rs

-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ pub fn target() -> Result<Target, String> {
1818
vec!["-s".to_string(),
1919
"BINARYEN=1".to_string(),
2020
"-s".to_string(),
21-
"BINARYEN_METHOD='native-wasm,interpret-binary'".to_string(),
22-
"-s".to_string(),
2321
"ERROR_ON_UNDEFINED_SYMBOLS=1".to_string()]);
2422

2523
let opts = TargetOptions {

src/tools/compiletest/src/procsrv.rs

+1
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ pub fn run(lib_path: &str,
6969
}
7070
if let Some(cwd) = current_dir {
7171
cmd.current_dir(cwd);
72+
panic!("Backtrace");
7273
}
7374

7475
let mut process = cmd.spawn()?;

src/tools/compiletest/src/runtest.rs

+2-5
Original file line numberDiff line numberDiff line change
@@ -1546,11 +1546,8 @@ actual:\n\
15461546
logv(self.config, format!("executing {}", cmdline));
15471547
cmdline
15481548
};
1549-
let working_dir = if self.config.target.contains("emscripten") {
1550-
Some(self.output_base_name().parent().unwrap().to_str().unwrap().to_owned())
1551-
} else {
1552-
None
1553-
};
1549+
let working_dir =
1550+
Some(self.output_base_name().parent().unwrap().to_str().unwrap().to_owned());
15541551

15551552
let procsrv::Result {
15561553
out,

0 commit comments

Comments
 (0)