bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

enable panic-catching tests in Miri

Browse source
This commit is contained in:
Ralf Jung 2019-11-22 23:11:56 +01:00
parent 083b5a0a1b
commit 1e91e4e20a
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/liballoc/tests/binary_heap.rs
View file

@ -347,7 +347,7 @@ fn assert_covariance() {
// Destructors must be called exactly once per element. // Destructors must be called exactly once per element.
// FIXME: re-enable emscripten once it can unwind again // FIXME: re-enable emscripten once it can unwind again
#[test] #[test]
#[cfg(not(any(miri, target_os = "emscripten")))] // Miri does not support catching panics #[cfg(not(target_os = "emscripten"))]
fn panic_safe() { fn panic_safe() {
use std::cmp; use std::cmp;
use std::panic::{self, AssertUnwindSafe}; use std::panic::{self, AssertUnwindSafe};

5
src/liballoc/tests/vec.rs
View file

@ -944,10 +944,9 @@ fn drain_filter_complex() {
} }
} }
// Miri does not support catching panics
// FIXME: re-enable emscripten once it can unwind again // FIXME: re-enable emscripten once it can unwind again
#[test] #[test]
#[cfg(not(any(miri, target_os = "emscripten")))] #[cfg(not(target_os = "emscripten"))]
fn drain_filter_consumed_panic() { fn drain_filter_consumed_panic() {
use std::rc::Rc; use std::rc::Rc;
use std::sync::Mutex; use std::sync::Mutex;
@ -999,7 +998,7 @@ fn drain_filter_consumed_panic() {
// FIXME: Re-enable emscripten once it can catch panics // FIXME: Re-enable emscripten once it can catch panics
#[test] #[test]
#[cfg(not(any(miri, target_os = "emscripten")))] // Miri does not support catching panics #[cfg(not(target_os = "emscripten"))]
fn drain_filter_unconsumed_panic() { fn drain_filter_unconsumed_panic() {
use std::rc::Rc; use std::rc::Rc;
use std::sync::Mutex; use std::sync::Mutex;