From 1e6544a20ec8ba822c8af93a953ec7ea70dddbd9 Mon Sep 17 00:00:00 2001
From: Chris Denton <chris@chrisdenton.dev>
Date: Wed, 29 May 2024 13:04:28 +0000
Subject: Move run-make windows_subsystem tests to ui tests

---
 tests/run-make/windows-subsystem/Makefile                   | 6 ------
 tests/run-make/windows-subsystem/console.rs                 | 3 ---
 tests/run-make/windows-subsystem/windows.rs                 | 3 ---
 tests/ui/windows-subsystem-invalid.rs                       | 5 -----
 tests/ui/windows-subsystem-invalid.stderr                   | 4 ----
 tests/ui/windows-subsystem/console.rs                       | 4 ++++
 tests/ui/windows-subsystem/windows-subsystem-invalid.rs     | 5 +++++
 tests/ui/windows-subsystem/windows-subsystem-invalid.stderr | 4 ++++
 tests/ui/windows-subsystem/windows.rs                       | 4 ++++
 9 files changed, 17 insertions(+), 21 deletions(-)
 delete mode 100644 tests/run-make/windows-subsystem/Makefile
 delete mode 100644 tests/run-make/windows-subsystem/console.rs
 delete mode 100644 tests/run-make/windows-subsystem/windows.rs
 delete mode 100644 tests/ui/windows-subsystem-invalid.rs
 delete mode 100644 tests/ui/windows-subsystem-invalid.stderr
 create mode 100644 tests/ui/windows-subsystem/console.rs
 create mode 100644 tests/ui/windows-subsystem/windows-subsystem-invalid.rs
 create mode 100644 tests/ui/windows-subsystem/windows-subsystem-invalid.stderr
 create mode 100644 tests/ui/windows-subsystem/windows.rs

diff --git a/tests/run-make/windows-subsystem/Makefile b/tests/run-make/windows-subsystem/Makefile
deleted file mode 100644
index e3cf9181de4..00000000000
--- a/tests/run-make/windows-subsystem/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-# ignore-cross-compile
-include ../tools.mk
-
-all:
-	$(RUSTC) windows.rs
-	$(RUSTC) console.rs
diff --git a/tests/run-make/windows-subsystem/console.rs b/tests/run-make/windows-subsystem/console.rs
deleted file mode 100644
index 61a92eb6a9d..00000000000
--- a/tests/run-make/windows-subsystem/console.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-#![windows_subsystem = "console"]
-
-fn main() {}
diff --git a/tests/run-make/windows-subsystem/windows.rs b/tests/run-make/windows-subsystem/windows.rs
deleted file mode 100644
index 1138248f07d..00000000000
--- a/tests/run-make/windows-subsystem/windows.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-#![windows_subsystem = "windows"]
-
-fn main() {}
diff --git a/tests/ui/windows-subsystem-invalid.rs b/tests/ui/windows-subsystem-invalid.rs
deleted file mode 100644
index c6a6dd00a92..00000000000
--- a/tests/ui/windows-subsystem-invalid.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-//@ error-pattern: invalid windows subsystem `wrong`, only `windows` and `console` are allowed
-
-#![windows_subsystem = "wrong"]
-
-fn main() {}
diff --git a/tests/ui/windows-subsystem-invalid.stderr b/tests/ui/windows-subsystem-invalid.stderr
deleted file mode 100644
index 703f35c969c..00000000000
--- a/tests/ui/windows-subsystem-invalid.stderr
+++ /dev/null
@@ -1,4 +0,0 @@
-error: invalid windows subsystem `wrong`, only `windows` and `console` are allowed
-
-error: aborting due to 1 previous error
-
diff --git a/tests/ui/windows-subsystem/console.rs b/tests/ui/windows-subsystem/console.rs
new file mode 100644
index 00000000000..8f0ca2de370
--- /dev/null
+++ b/tests/ui/windows-subsystem/console.rs
@@ -0,0 +1,4 @@
+//@ run-pass
+#![windows_subsystem = "console"]
+
+fn main() {}
diff --git a/tests/ui/windows-subsystem/windows-subsystem-invalid.rs b/tests/ui/windows-subsystem/windows-subsystem-invalid.rs
new file mode 100644
index 00000000000..c6a6dd00a92
--- /dev/null
+++ b/tests/ui/windows-subsystem/windows-subsystem-invalid.rs
@@ -0,0 +1,5 @@
+//@ error-pattern: invalid windows subsystem `wrong`, only `windows` and `console` are allowed
+
+#![windows_subsystem = "wrong"]
+
+fn main() {}
diff --git a/tests/ui/windows-subsystem/windows-subsystem-invalid.stderr b/tests/ui/windows-subsystem/windows-subsystem-invalid.stderr
new file mode 100644
index 00000000000..703f35c969c
--- /dev/null
+++ b/tests/ui/windows-subsystem/windows-subsystem-invalid.stderr
@@ -0,0 +1,4 @@
+error: invalid windows subsystem `wrong`, only `windows` and `console` are allowed
+
+error: aborting due to 1 previous error
+
diff --git a/tests/ui/windows-subsystem/windows.rs b/tests/ui/windows-subsystem/windows.rs
new file mode 100644
index 00000000000..65db0fec7a8
--- /dev/null
+++ b/tests/ui/windows-subsystem/windows.rs
@@ -0,0 +1,4 @@
+//@ run-pass
+#![windows_subsystem = "windows"]
+
+fn main() {}
-- 
cgit 1.4.1-3-g733a5