diff options
| author | Tyler Mandry <tmandry@gmail.com> | 2019-10-05 21:38:45 -0700 |
|---|---|---|
| committer | Tyler Mandry <tmandry@gmail.com> | 2019-10-05 21:38:45 -0700 |
| commit | d16b7f705bd7c266a924e43a31495477dc4c9321 (patch) | |
| tree | 6ea9a6b182816a2b05e5d82d64f03bee1208e938 /src/test/ui/panic-runtime | |
| parent | 7870050796e5904a0fc85ecbe6fa6dde1cfe0c91 (diff) | |
| download | rust-d16b7f705bd7c266a924e43a31495477dc4c9321.tar.gz rust-d16b7f705bd7c266a924e43a31495477dc4c9321.zip | |
Revert "Auto merge of #63649 - tlively:emscripten-upstream-upgrade, r=alexcrichton"
This reverts commit 7870050796e5904a0fc85ecbe6fa6dde1cfe0c91, reversing changes made to 2e7244807a7878f6eca3eb7d97ae9b413aa49014.
Diffstat (limited to 'src/test/ui/panic-runtime')
| -rw-r--r-- | src/test/ui/panic-runtime/transitive-link-a-bunch.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/panic-runtime/want-unwind-got-abort.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/panic-runtime/want-unwind-got-abort2.rs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/test/ui/panic-runtime/transitive-link-a-bunch.rs b/src/test/ui/panic-runtime/transitive-link-a-bunch.rs index 6dcb852a366..5d72771c2dc 100644 --- a/src/test/ui/panic-runtime/transitive-link-a-bunch.rs +++ b/src/test/ui/panic-runtime/transitive-link-a-bunch.rs @@ -4,7 +4,7 @@ // aux-build:wants-panic-runtime-abort.rs // aux-build:panic-runtime-lang-items.rs // error-pattern: is not compiled with this crate's panic strategy `unwind` -// ignore-emscripten compiled with panic=abort by default +// ignore-wasm32-bare compiled with panic=abort by default #![no_std] #![no_main] diff --git a/src/test/ui/panic-runtime/want-unwind-got-abort.rs b/src/test/ui/panic-runtime/want-unwind-got-abort.rs index e7811d40b5b..4c25c09d643 100644 --- a/src/test/ui/panic-runtime/want-unwind-got-abort.rs +++ b/src/test/ui/panic-runtime/want-unwind-got-abort.rs @@ -1,7 +1,7 @@ // error-pattern:is incompatible with this crate's strategy of `unwind` // aux-build:panic-runtime-abort.rs // aux-build:panic-runtime-lang-items.rs -// ignore-emscripten compiled with panic=abort by default +// ignore-wasm32-bare compiled with panic=abort by default #![no_std] #![no_main] diff --git a/src/test/ui/panic-runtime/want-unwind-got-abort2.rs b/src/test/ui/panic-runtime/want-unwind-got-abort2.rs index 44671796c01..478af451e7f 100644 --- a/src/test/ui/panic-runtime/want-unwind-got-abort2.rs +++ b/src/test/ui/panic-runtime/want-unwind-got-abort2.rs @@ -2,7 +2,7 @@ // aux-build:panic-runtime-abort.rs // aux-build:wants-panic-runtime-abort.rs // aux-build:panic-runtime-lang-items.rs -// ignore-emscripten compiled with panic=abort by default +// ignore-wasm32-bare compiled with panic=abort by default #![no_std] #![no_main] |