diff options
| author | Thomas Lively <tlively@google.com> | 2019-08-16 22:08:01 -0700 |
|---|---|---|
| committer | Thomas Lively <tlively@google.com> | 2019-10-16 17:06:48 -0700 |
| commit | 2bf59bea481dd4b4365cafe2e94fa8bf330a6877 (patch) | |
| tree | 1a66e01af701fd21c291788d5eb971f502f5dbee /src/libtest/lib.rs | |
| parent | 0e8a4b441c5da21a2cb19448728ade5baa299c66 (diff) | |
Upgrade Emscripten targets to use upstream LLVM backend
- Compatible with Emscripten 1.38.46-upstream or later upstream. - Refactors the Emscripten target spec to share code with other wasm targets. - Replaces the old incorrect wasm32 C call ABI with the correct one, preserving the old one as wasm32_bindgen_compat for wasm-bindgen compatibility. - Updates the varargs ABI used by Emscripten and deletes the old one. - Removes the obsolete wasm32-experimental-emscripten target. - Uses EMCC_CFLAGS on CI to avoid the timeout problems with #63649.
Diffstat (limited to 'src/libtest/lib.rs')
| -rw-r--r-- | src/libtest/lib.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libtest/lib.rs b/src/libtest/lib.rs index 5a77413b2cb..4c3cbeb4acc 100644 --- a/src/libtest/lib.rs +++ b/src/libtest/lib.rs @@ -1735,9 +1735,9 @@ pub fn run_test( ) { let TestDescAndFn { desc, testfn } = test; - let ignore_because_no_process_support = cfg!(target_arch = "wasm32") - && !cfg!(target_os = "emscripten") - && desc.should_panic != ShouldPanic::No; + // FIXME: Re-enable emscripten once it can catch panics again + let ignore_because_no_process_support = desc.should_panic != ShouldPanic::No + && (cfg!(target_arch = "wasm32") || cfg!(target_os = "emscripten")); if force_ignore || desc.ignore || ignore_because_no_process_support { monitor_ch.send((desc, TrIgnored, None, Vec::new())).unwrap(); |
