rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Revert "Auto merge of #63649 - tlively:emscripten-upstream-upgrade, r=alexcrichton"

Browse Source 
This reverts commit 7870050796, reversing
changes made to 2e7244807a.
This commit is contained in:
Tyler Mandry
2019-10-05 21:38:45 -07:00
parent 7870050796
commit d16b7f705b
142 changed files with 537 additions and 377 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libtest/lib.rs
View File

@@ -1478,9 +1478,9 @@ pub fn run_test(
) {
let TestDescAndFn { desc, testfn } = test;
// 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"));
let ignore_because_no_process_support = cfg!(target_arch = "wasm32")
&& !cfg!(target_os = "emscripten")
&& desc.should_panic != ShouldPanic::No;
if force_ignore || desc.ignore || ignore_because_no_process_support {
monitor_ch.send((desc, TrIgnored, None, Vec::new())).unwrap();