diff options
| author | Thomas Lively <tlively@google.com> | 2019-10-02 11:02:25 -0700 |
|---|---|---|
| committer | Thomas Lively <tlively@google.com> | 2019-10-04 00:47:21 -0700 |
| commit | 5b56c660c9cf55b240d26854fa0ffd41db068ff9 (patch) | |
| tree | 03bc9b23e0f08f0f94054e85d64672a769c7e339 /src/liballoc/tests/vec.rs | |
| parent | 9a55103b985fdd4a7d90db5d46ebaf0a9e34b419 (diff) | |
| download | rust-5b56c660c9cf55b240d26854fa0ffd41db068ff9.tar.gz rust-5b56c660c9cf55b240d26854fa0ffd41db068ff9.zip | |
Fix ABI, run and fix more tests, re-enable CI for PRs
Diffstat (limited to 'src/liballoc/tests/vec.rs')
| -rw-r--r-- | src/liballoc/tests/vec.rs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/liballoc/tests/vec.rs b/src/liballoc/tests/vec.rs index 98d013dfa2b..80537217697 100644 --- a/src/liballoc/tests/vec.rs +++ b/src/liballoc/tests/vec.rs @@ -944,8 +944,10 @@ fn drain_filter_complex() { } } +// Miri does not support catching panics +// FIXME: re-enable emscripten once it can unwind again #[test] -#[cfg(not(miri))] // Miri does not support catching panics +#[cfg(not(any(miri, target_os = "emscripten")))] fn drain_filter_consumed_panic() { use std::rc::Rc; use std::sync::Mutex; @@ -995,8 +997,9 @@ fn drain_filter_consumed_panic() { } } +// FIXME: Re-enable emscripten once it can catch panics #[test] -#[cfg(not(miri))] // Miri does not support catching panics +#[cfg(not(any(miri, target_os = "emscripten")))] // Miri does not support catching panics fn drain_filter_unconsumed_panic() { use std::rc::Rc; use std::sync::Mutex; |