Use rmake for windows- run-make tests

rust-lang · matthiaskrgr · May 20, 2024 · May 25, 2024 · May 25, 2024 · May 25, 2024
commit b3ee91128e7527b16b24bfeca81186490ace0cfa
diff --git a/src/tools/run-make-support/src/llvm_readobj.rs b/src/tools/run-make-support/src/llvm_readobj.rs
@@ -42,6 +42,12 @@ impl LlvmReadobj {
         self
     }
 
+    /// Pass `--coff-imports` to display the Windows DLL imports
+    pub fn coff_imports(&mut self) -> &mut Self {
+        self.cmd.arg("--coff-imports");
+        self
+    }
+
     /// Get the [`Output`][::std::process::Output] of the finished process.
     #[track_caller]
     pub fn command_output(&mut self) -> ::std::process::Output {

diff --git a/tests/run-make/issue-85441/Makefile b/tests/run-make/issue-85441/Makefile
diff --git a/tests/run-make/windows-binary-no-external-deps/Makefile b/tests/run-make/windows-binary-no-external-deps/Makefile
diff --git a/tests/run-make/windows-binary-no-external-deps/rmake.rs b/tests/run-make/windows-binary-no-external-deps/rmake.rs
@@ -0,0 +1,15 @@
+//@ only-windows
+
+// Ensure that we aren't relying on any non-system DLLs when compiling and running
+// a "hello world" application by setting `PATH` to `C:\Windows\System32`.
+
+use run_make_support::{run, rustc};
+use std::env;
+use std::path::PathBuf;
+
+fn main() {
+    let windows_dir = env::var("SystemRoot").unwrap();
+    let system32: PathBuf = [&windows_dir, "System32"].iter().collect();
+    rustc().input("hello.rs").env("PATH", system32).run();
+    run("hello");
+}
diff --git a/tests/run-make/windows-safeseh/Makefile b/tests/run-make/windows-safeseh/Makefile
diff --git a/tests/run-make/windows-safeseh/rmake.rs b/tests/run-make/windows-safeseh/rmake.rs
@@ -0,0 +1,15 @@
+//@ only-windows
+//@ needs-rust-lld
+
+use run_make_support::rustc;
+
+fn main() {
+    // Ensure that LLD can link when an .rlib contains a synthetic object
+    // file referencing exported or used symbols.
+    rustc().input("foo.rs").arg("-Clinker=rust-lld").run();
+
+    // Ensure that LLD can link when /WHOLEARCHIVE: is used with an .rlib.
+    // Previously, lib.rmeta was not marked as (trivially) SAFESEH-aware.
+    rustc().input("baz.rs").run();
+    rustc().input("bar.rs").arg("-Clinker=rust-lld").link_arg("/WHOLEARCHIVE:libbaz.rlib").run();
+}
diff --git a/tests/run-make/windows-spawn/Makefile b/tests/run-make/windows-spawn/Makefile
diff --git a/tests/run-make/windows-spawn/rmake.rs b/tests/run-make/windows-spawn/rmake.rs
@@ -0,0 +1,17 @@
+//@ only-windows
+
+use run_make_support::{run, rustc, tmp_dir};
+
+// On Windows `Command` uses `CreateProcessW` to run a new process.
+// However, in the past std used to not pass in the application name, leaving
+// `CreateProcessW` to use heuristics to guess the intended name from the
+// command line string. Sometimes this could go very wrong.
+// E.g. in Rust 1.0 `Command::new("foo").arg("bar").spawn()` will try to launch
+// `foo bar.exe` if foo.exe does not exist. Which is clearly not desired.
+
+fn main() {
+    let out_dir = tmp_dir();
+    rustc().input("hello.rs").output(out_dir.join("hopefullydoesntexist bar.exe")).run();
+    rustc().input("spawn.rs").run();
+    run("spawn");
+}
diff --git a/tests/run-make/windows-spawn/spawn.rs b/tests/run-make/windows-spawn/spawn.rs
@@ -3,10 +3,8 @@ use std::process::Command;
 
 fn main() {
     // Make sure it doesn't try to run "hopefullydoesntexist bar.exe".
-    assert_eq!(Command::new("hopefullydoesntexist")
-                   .arg("bar")
-                   .spawn()
-                   .unwrap_err()
-                   .kind(),
-               ErrorKind::NotFound);
+    assert_eq!(
+        Command::new("hopefullydoesntexist").arg("bar").spawn().unwrap_err().kind(),
+        ErrorKind::NotFound
+    )
 }
diff --git a/tests/run-make/windows-subsystem/Makefile b/tests/run-make/windows-subsystem/Makefile
diff --git a/tests/run-make/windows-subsystem/rmake.rs b/tests/run-make/windows-subsystem/rmake.rs
@@ -0,0 +1,8 @@
+//@ 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/issue-85441/empty.rs → tests/run-make/windows-ws2_32/empty.rs b/tests/run-make/issue-85441/empty.rs → tests/run-make/windows-ws2_32/empty.rs
diff --git a/tests/run-make/windows-ws2_32/rmake.rs b/tests/run-make/windows-ws2_32/rmake.rs
@@ -0,0 +1,13 @@
+//@ only-msvc
+
+// Tests that WS2_32.dll is not unnecessarily linked, see issue #85441
+
+use run_make_support::{llvm_readobj, rustc, tmp_dir};
+
+fn main() {
+    rustc().input("empty.rs").run();
+    let empty = tmp_dir().join("empty.exe");
+    let output = llvm_readobj().input(empty).coff_imports().run();
+    let output = String::from_utf8(output.stdout).unwrap();
+    assert!(!output.to_ascii_uppercase().contains("WS2_32.DLL"));
+}