From 80f9484c8680e54a31916d6410a5eea2ddb1e237 Mon Sep 17 00:00:00 2001 From: Aaron Hill Date: Sun, 17 Nov 2019 13:47:06 -0500 Subject: [PATCH] Disable panic tests on Windows Miri currently does not support `GetProcAddress` and `GetModuleHandleW`, both of which end up getting invoked by the libstd panic hook. --- tests/run-pass/catch_panic.rs | 1 + tests/run-pass/panic1.rs | 1 + tests/run-pass/panic1.stderr | 2 +- tests/run-pass/panic2.rs | 1 + tests/run-pass/panic2.stderr | 2 +- 5 files changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/run-pass/catch_panic.rs b/tests/run-pass/catch_panic.rs index 8e254385d47..228317e8936 100644 --- a/tests/run-pass/catch_panic.rs +++ b/tests/run-pass/catch_panic.rs @@ -1,3 +1,4 @@ +// ignore-windows: Unwind panicking does not currently work on Windows use std::panic::catch_unwind; use std::cell::Cell; diff --git a/tests/run-pass/panic1.rs b/tests/run-pass/panic1.rs index b9bb52b95b1..261db018d6d 100644 --- a/tests/run-pass/panic1.rs +++ b/tests/run-pass/panic1.rs @@ -1,3 +1,4 @@ +// ignore-windows: Unwind panicking does not currently work on Windows fn main() { panic!("Miri panic!"); } diff --git a/tests/run-pass/panic1.stderr b/tests/run-pass/panic1.stderr index a29ba479825..b1607dd864f 100644 --- a/tests/run-pass/panic1.stderr +++ b/tests/run-pass/panic1.stderr @@ -1 +1 @@ -thread 'main' panicked at 'Miri panic!', $DIR/panic1.rs:2:5 +thread 'main' panicked at 'Miri panic!', $DIR/panic1.rs:3:5 diff --git a/tests/run-pass/panic2.rs b/tests/run-pass/panic2.rs index 9a1da6656c2..deaf606d9a2 100644 --- a/tests/run-pass/panic2.rs +++ b/tests/run-pass/panic2.rs @@ -1,3 +1,4 @@ +// ignore-windows: Unwind panicking does not currently work on Windows fn main() { let val = "Value".to_string(); panic!("Miri panic with value: {}", val); diff --git a/tests/run-pass/panic2.stderr b/tests/run-pass/panic2.stderr index de70fd4d583..bc5df83ec0f 100644 --- a/tests/run-pass/panic2.stderr +++ b/tests/run-pass/panic2.stderr @@ -1 +1 @@ -thread 'main' panicked at 'Miri panic with value: Value', $DIR/panic2.rs:3:5 +thread 'main' panicked at 'Miri panic with value: Value', $DIR/panic2.rs:4:5 -- 2.44.0