From 9df8da8e04d04492d57603d69d1b9c330b4424f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Rakic?= Date: Mon, 6 Mar 2023 12:32:45 +0000 Subject: [PATCH 1/3] fix ignore header in MSVC test --- tests/ui/panic-runtime/unwind-tables-target-required.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/ui/panic-runtime/unwind-tables-target-required.rs b/tests/ui/panic-runtime/unwind-tables-target-required.rs index 3abb52b675a60..f2145c2bfe756 100644 --- a/tests/ui/panic-runtime/unwind-tables-target-required.rs +++ b/tests/ui/panic-runtime/unwind-tables-target-required.rs @@ -1,7 +1,7 @@ // Tests that the compiler errors if the user tries to turn off unwind tables // when they are required. // -// only-x86_64-windows-msvc +// only-x86_64-pc-windows-msvc // compile-flags: -C force-unwind-tables=no // // error-pattern: target requires unwind tables, they cannot be disabled with `-C force-unwind-tables=no`. From 877530cf1a950cf82ca0acc6e66ae9eadb1267d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Rakic?= Date: Mon, 13 Mar 2023 14:01:25 +0100 Subject: [PATCH 2/3] fix error pattern --- tests/ui/panic-runtime/unwind-tables-target-required.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/ui/panic-runtime/unwind-tables-target-required.rs b/tests/ui/panic-runtime/unwind-tables-target-required.rs index f2145c2bfe756..be2cbf6586779 100644 --- a/tests/ui/panic-runtime/unwind-tables-target-required.rs +++ b/tests/ui/panic-runtime/unwind-tables-target-required.rs @@ -4,7 +4,7 @@ // only-x86_64-pc-windows-msvc // compile-flags: -C force-unwind-tables=no // -// error-pattern: target requires unwind tables, they cannot be disabled with `-C force-unwind-tables=no`. +// error-pattern: target requires unwind tables, they cannot be disabled with `-C force-unwind-tables=no` pub fn main() { } From 956bebb07b641b1d9c1b04255f9a190e8f00a146 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Rakic?= Date: Mon, 13 Mar 2023 14:01:48 +0100 Subject: [PATCH 3/3] remove need for test expectations --- tests/ui/panic-runtime/unwind-tables-target-required.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/ui/panic-runtime/unwind-tables-target-required.rs b/tests/ui/panic-runtime/unwind-tables-target-required.rs index be2cbf6586779..5a90b314a6ed1 100644 --- a/tests/ui/panic-runtime/unwind-tables-target-required.rs +++ b/tests/ui/panic-runtime/unwind-tables-target-required.rs @@ -4,6 +4,7 @@ // only-x86_64-pc-windows-msvc // compile-flags: -C force-unwind-tables=no // +// dont-check-compiler-stderr // error-pattern: target requires unwind tables, they cannot be disabled with `-C force-unwind-tables=no` pub fn main() {