From 3e72a015662edc61bc33c1461f4392b469086433 Mon Sep 17 00:00:00 2001
From: Florian Bartels <Florian.Bartels@elektrobit.com>
Date: Mon, 28 Nov 2022 08:11:19 +0100
Subject: [PATCH 1/2] Run Windows-only tests only on Windows

This removes the need to maintain a list of all other
OSs which ignore the tests.
---
 src/test/codegen/dllimports/main.rs     | 14 +-------------
 src/test/codegen/panic-abort-windows.rs | 13 +------------
 2 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/src/test/codegen/dllimports/main.rs b/src/test/codegen/dllimports/main.rs
index bb3134e81c930..f7978749a9173 100644
--- a/src/test/codegen/dllimports/main.rs
+++ b/src/test/codegen/dllimports/main.rs
@@ -1,17 +1,5 @@
 // This test is for *-windows-msvc only.
-// ignore-android
-// ignore-dragonfly
-// ignore-emscripten
-// ignore-freebsd
-// ignore-gnu
-// ignore-haiku
-// ignore-ios
-// ignore-linux
-// ignore-macos
-// ignore-netbsd
-// ignore-openbsd
-// ignore-solaris
-// ignore-sgx no dynamic linking
+// only-windows
 
 // aux-build:dummy.rs
 // aux-build:wrapper.rs
diff --git a/src/test/codegen/panic-abort-windows.rs b/src/test/codegen/panic-abort-windows.rs
index 9ee4bfc471168..d22df6200afae 100644
--- a/src/test/codegen/panic-abort-windows.rs
+++ b/src/test/codegen/panic-abort-windows.rs
@@ -1,16 +1,5 @@
 // This test is for *-windows-msvc only.
-// ignore-android
-// ignore-dragonfly
-// ignore-emscripten
-// ignore-freebsd
-// ignore-haiku
-// ignore-ios
-// ignore-linux
-// ignore-macos
-// ignore-netbsd
-// ignore-openbsd
-// ignore-solaris
-// ignore-sgx
+// only-windows
 
 // compile-flags: -C no-prepopulate-passes -C panic=abort -O
 

From c04d67444fcbfccc5db848417c1dbeac568a1a23 Mon Sep 17 00:00:00 2001
From: Florian Bartels <Florian.Bartels@elektrobit.com>
Date: Thu, 1 Dec 2022 14:12:55 +0100
Subject: [PATCH 2/2] Ignore `gnu` systems (`windows-msvc` only)

---
 src/test/codegen/dllimports/main.rs     | 1 +
 src/test/codegen/panic-abort-windows.rs | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/test/codegen/dllimports/main.rs b/src/test/codegen/dllimports/main.rs
index f7978749a9173..ab599992ffd79 100644
--- a/src/test/codegen/dllimports/main.rs
+++ b/src/test/codegen/dllimports/main.rs
@@ -1,5 +1,6 @@
 // This test is for *-windows-msvc only.
 // only-windows
+// ignore-gnu
 
 // aux-build:dummy.rs
 // aux-build:wrapper.rs
diff --git a/src/test/codegen/panic-abort-windows.rs b/src/test/codegen/panic-abort-windows.rs
index d22df6200afae..2ee29762dcdf4 100644
--- a/src/test/codegen/panic-abort-windows.rs
+++ b/src/test/codegen/panic-abort-windows.rs
@@ -1,4 +1,4 @@
-// This test is for *-windows-msvc only.
+// This test is for *-windows only.
 // only-windows
 
 // compile-flags: -C no-prepopulate-passes -C panic=abort -O