about summary refs log tree commit diff
diff options
context:
space:
mode:
authorChris Denton <chris@chrisdenton.dev>2024-05-29 13:04:28 +0000
committerChris Denton <chris@chrisdenton.dev>2024-05-29 13:04:28 +0000
commit1e6544a20ec8ba822c8af93a953ec7ea70dddbd9 (patch)
tree427e57c483e40a0bdc82cebb8200a63b0f7ad16a
parent4cf5723dbe471ef0a32857b968b91498551f5e38 (diff)
downloadrust-1e6544a20ec8ba822c8af93a953ec7ea70dddbd9.tar.gz
rust-1e6544a20ec8ba822c8af93a953ec7ea70dddbd9.zip
Move run-make windows_subsystem tests to ui tests
-rw-r--r--tests/run-make/windows-subsystem/Makefile6
-rw-r--r--tests/ui/windows-subsystem/console.rs (renamed from tests/run-make/windows-subsystem/console.rs)1
-rw-r--r--tests/ui/windows-subsystem/windows-subsystem-invalid.rs (renamed from tests/ui/windows-subsystem-invalid.rs)0
-rw-r--r--tests/ui/windows-subsystem/windows-subsystem-invalid.stderr (renamed from tests/ui/windows-subsystem-invalid.stderr)0
-rw-r--r--tests/ui/windows-subsystem/windows.rs (renamed from tests/run-make/windows-subsystem/windows.rs)1
5 files changed, 2 insertions, 6 deletions
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/ui/windows-subsystem/console.rs
index 61a92eb6a9d..8f0ca2de370 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
index c6a6dd00a92..c6a6dd00a92 100644
--- a/tests/ui/windows-subsystem-invalid.rs
+++ b/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
index 703f35c969c..703f35c969c 100644
--- a/tests/ui/windows-subsystem-invalid.stderr
+++ b/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
index 1138248f07d..65db0fec7a8 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() {}