diff options
| author | Ralf Jung <post@ralfj.de> | 2019-11-22 23:11:56 +0100 |
|---|---|---|
| committer | Ralf Jung <post@ralfj.de> | 2019-11-22 23:11:56 +0100 |
| commit | 1e91e4e20a5d6e50e281c6e87a3a61cc735e266f (patch) | |
| tree | 5a02f6cf566b30578b37343598ec30a4cf9a6678 | |
| parent | 083b5a0a1bb3b2ee0873697ebf37e88d85faa3e5 (diff) | |
| download | rust-1e91e4e20a5d6e50e281c6e87a3a61cc735e266f.tar.gz rust-1e91e4e20a5d6e50e281c6e87a3a61cc735e266f.zip | |
enable panic-catching tests in Miri
| -rw-r--r-- | src/liballoc/tests/binary_heap.rs | 2 | ||||
| -rw-r--r-- | src/liballoc/tests/vec.rs | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/liballoc/tests/binary_heap.rs b/src/liballoc/tests/binary_heap.rs index a44cf1eaf6d..81b22ca815b 100644 --- a/src/liballoc/tests/binary_heap.rs +++ b/src/liballoc/tests/binary_heap.rs @@ -347,7 +347,7 @@ fn assert_covariance() { // Destructors must be called exactly once per element. // FIXME: re-enable emscripten once it can unwind again #[test] -#[cfg(not(any(miri, target_os = "emscripten")))] // Miri does not support catching panics +#[cfg(not(target_os = "emscripten"))] fn panic_safe() { use std::cmp; use std::panic::{self, AssertUnwindSafe}; diff --git a/src/liballoc/tests/vec.rs b/src/liballoc/tests/vec.rs index 80537217697..58b555ecb4e 100644 --- a/src/liballoc/tests/vec.rs +++ b/src/liballoc/tests/vec.rs @@ -944,10 +944,9 @@ fn drain_filter_complex() { } } -// Miri does not support catching panics // FIXME: re-enable emscripten once it can unwind again #[test] -#[cfg(not(any(miri, target_os = "emscripten")))] +#[cfg(not(target_os = "emscripten"))] fn drain_filter_consumed_panic() { use std::rc::Rc; use std::sync::Mutex; @@ -999,7 +998,7 @@ fn drain_filter_consumed_panic() { // FIXME: Re-enable emscripten once it can catch panics #[test] -#[cfg(not(any(miri, target_os = "emscripten")))] // Miri does not support catching panics +#[cfg(not(target_os = "emscripten"))] fn drain_filter_unconsumed_panic() { use std::rc::Rc; use std::sync::Mutex; |
