From f705a22a6a55a153cb0f028dbd9a7b342c786026 Mon Sep 17 00:00:00 2001
From: Chris Denton <chris@chrisdenton.dev>
Date: Mon, 27 May 2024 13:46:41 +0000
Subject: [PATCH] Move run-make windows_subsystem tests to ui tests

---
 tests/run-make/windows-subsystem/rmake.rs                 | 8 --------
 tests/{run-make => ui}/windows-subsystem/console.rs       | 1 +
 .../{ => windows-subsystem}/windows-subsystem-invalid.rs  | 0
 .../windows-subsystem-invalid.stderr                      | 0
 tests/{run-make => ui}/windows-subsystem/windows.rs       | 1 +
 5 files changed, 2 insertions(+), 8 deletions(-)
 delete mode 100644 tests/run-make/windows-subsystem/rmake.rs
 rename tests/{run-make => ui}/windows-subsystem/console.rs (78%)
 rename tests/ui/{ => windows-subsystem}/windows-subsystem-invalid.rs (100%)
 rename tests/ui/{ => windows-subsystem}/windows-subsystem-invalid.stderr (100%)
 rename tests/{run-make => ui}/windows-subsystem/windows.rs (78%)

diff --git a/tests/run-make/windows-subsystem/rmake.rs b/tests/run-make/windows-subsystem/rmake.rs
deleted file mode 100644
index 8a6460f89339c..0000000000000
--- a/tests/run-make/windows-subsystem/rmake.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-//@ ignore-cross-compile
-
-use run_make_support::rustc;
-
-fn main() {
-    rustc().input("windows.rs").run();
-    rustc().input("console.rs").run();
-}
diff --git a/tests/run-make/windows-subsystem/console.rs b/tests/ui/windows-subsystem/console.rs
similarity index 78%
rename from tests/run-make/windows-subsystem/console.rs
rename to tests/ui/windows-subsystem/console.rs
index 61a92eb6a9db7..8f0ca2de370de 100644
--- a/tests/run-make/windows-subsystem/console.rs
+++ b/tests/ui/windows-subsystem/console.rs
@@ -1,3 +1,4 @@
+//@ run-pass
 #![windows_subsystem = "console"]
 
 fn main() {}
diff --git a/tests/ui/windows-subsystem-invalid.rs b/tests/ui/windows-subsystem/windows-subsystem-invalid.rs
similarity index 100%
rename from tests/ui/windows-subsystem-invalid.rs
rename to tests/ui/windows-subsystem/windows-subsystem-invalid.rs
diff --git a/tests/ui/windows-subsystem-invalid.stderr b/tests/ui/windows-subsystem/windows-subsystem-invalid.stderr
similarity index 100%
rename from tests/ui/windows-subsystem-invalid.stderr
rename to tests/ui/windows-subsystem/windows-subsystem-invalid.stderr
diff --git a/tests/run-make/windows-subsystem/windows.rs b/tests/ui/windows-subsystem/windows.rs
similarity index 78%
rename from tests/run-make/windows-subsystem/windows.rs
rename to tests/ui/windows-subsystem/windows.rs
index 1138248f07da0..65db0fec7a8b6 100644
--- a/tests/run-make/windows-subsystem/windows.rs
+++ b/tests/ui/windows-subsystem/windows.rs
@@ -1,3 +1,4 @@
+//@ run-pass
 #![windows_subsystem = "windows"]
 
 fn main() {}