summary refs log tree commit diff
path: root/src/tools/compiletest
diff options
context:
space:
mode:
authorThomas Lively <tlively@google.com>2019-08-16 22:08:01 -0700
committerThomas Lively <tlively@google.com>2019-10-16 17:06:48 -0700
commit2bf59bea481dd4b4365cafe2e94fa8bf330a6877 (patch)
tree1a66e01af701fd21c291788d5eb971f502f5dbee /src/tools/compiletest
parent0e8a4b441c5da21a2cb19448728ade5baa299c66 (diff)
downloadrust-2bf59bea481dd4b4365cafe2e94fa8bf330a6877.tar.gz
rust-2bf59bea481dd4b4365cafe2e94fa8bf330a6877.zip
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/tools/compiletest')
-rw-r--r--src/tools/compiletest/src/header.rs5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/tools/compiletest/src/header.rs b/src/tools/compiletest/src/header.rs
index df56448dd22..03094885065 100644
--- a/src/tools/compiletest/src/header.rs
+++ b/src/tools/compiletest/src/header.rs
@@ -141,7 +141,10 @@ impl EarlyProps {
                 if config.target == "wasm32-unknown-unknown" && config.parse_check_run_results(ln) {
                     props.ignore = Ignore::Ignore;
                 }
-
+                // FIXME: Re-enable run-fail once panics are handled correctly
+                if config.target.contains("emscripten") && config.mode == common::RunFail {
+                    props.ignore = Ignore::Ignore;
+                }
             }
 
             if (config.mode == common::DebugInfoGdb || config.mode == common::DebugInfoGdbLldb) &&