From 2789e72e18938b4c676551d9b3d8f7ee955e5bbc Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Thu, 28 Nov 2019 19:17:43 +0100 Subject: [PATCH 1/2] test more panics --- tests/run-pass/catch_panic.rs | 16 ++++++++-------- tests/run-pass/catch_panic.stderr | 6 ++++++ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/tests/run-pass/catch_panic.rs b/tests/run-pass/catch_panic.rs index c504956db35a..88fc35067d01 100644 --- a/tests/run-pass/catch_panic.rs +++ b/tests/run-pass/catch_panic.rs @@ -44,14 +44,14 @@ fn main() { prev(panic_info) })); - test(|_old_val| panic!("Hello from panic: std")); - test(|old_val| panic!(format!("Hello from panic: {:?}", old_val))); - test(|old_val| panic!("Hello from panic: {:?}", old_val)); - test(|_old_val| panic!(1337)); - // FIXME https://github.com/rust-lang/miri/issues/1071 - //test(|_old_val| core::panic!("Hello from panic: core")); - //test(|old_val| core::panic!(&format!("Hello from panic: {:?}", old_val))); - //test(|old_val| core::panic!("Hello from panic: {:?}", old_val)); + test(|_old_val| std::panic!("Hello from panic: std")); + test(|old_val| std::panic!(format!("Hello from panic: {:?}", old_val))); + test(|old_val| std::panic!("Hello from panic: {:?}", old_val)); + test(|_old_val| std::panic!(1337)); + + test(|_old_val| core::panic!("Hello from panic: core")); + test(|old_val| core::panic!(&format!("Hello from panic: {:?}", old_val))); + test(|old_val| core::panic!("Hello from panic: {:?}", old_val)); // Cleanup: reset to default hook. drop(std::panic::take_hook()); diff --git a/tests/run-pass/catch_panic.stderr b/tests/run-pass/catch_panic.stderr index 6d905da7febe..51814c7cde6e 100644 --- a/tests/run-pass/catch_panic.stderr +++ b/tests/run-pass/catch_panic.stderr @@ -6,4 +6,10 @@ thread 'main' panicked at 'Hello from panic: 2', $DIR/catch_panic.rs:49:20 Caught panic message (String): Hello from panic: 2 thread 'main' panicked at 'Box', $DIR/catch_panic.rs:50:21 Failed get caught panic message. +thread 'main' panicked at 'Hello from panic: core', tests/run-pass/catch_panic.rs:52:21 +Caught panic message (String): Hello from panic: core +thread 'main' panicked at 'Hello from panic: 5', tests/run-pass/catch_panic.rs:53:20 +Caught panic message (String): Hello from panic: 5 +thread 'main' panicked at 'Hello from panic: 6', tests/run-pass/catch_panic.rs:54:20 +Caught panic message (String): Hello from panic: 6 Success! From f7efe238f3c999b815da3e7b736136360c973c59 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Sun, 1 Dec 2019 11:04:51 +0100 Subject: [PATCH 2/2] fix catch_panic.stderr --- tests/run-pass/catch_panic.stderr | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/run-pass/catch_panic.stderr b/tests/run-pass/catch_panic.stderr index 51814c7cde6e..be729005dd56 100644 --- a/tests/run-pass/catch_panic.stderr +++ b/tests/run-pass/catch_panic.stderr @@ -6,10 +6,10 @@ thread 'main' panicked at 'Hello from panic: 2', $DIR/catch_panic.rs:49:20 Caught panic message (String): Hello from panic: 2 thread 'main' panicked at 'Box', $DIR/catch_panic.rs:50:21 Failed get caught panic message. -thread 'main' panicked at 'Hello from panic: core', tests/run-pass/catch_panic.rs:52:21 +thread 'main' panicked at 'Hello from panic: core', $DIR/catch_panic.rs:52:21 Caught panic message (String): Hello from panic: core -thread 'main' panicked at 'Hello from panic: 5', tests/run-pass/catch_panic.rs:53:20 +thread 'main' panicked at 'Hello from panic: 5', $DIR/catch_panic.rs:53:20 Caught panic message (String): Hello from panic: 5 -thread 'main' panicked at 'Hello from panic: 6', tests/run-pass/catch_panic.rs:54:20 +thread 'main' panicked at 'Hello from panic: 6', $DIR/catch_panic.rs:54:20 Caught panic message (String): Hello from panic: 6 Success!