Auto merge of #126861 - GuillaumeGomez:migrate-run-make-invalid-library, r=<try>

bors · bors · commit 4f44f046d29a · 2024-06-24T09:08:22.000Z
Migrate `run-make/invalid-library` to `rmake.rs` Part of #121876. r? `@jieyouxu` try-job: x86_64-msvc
diff --git a/src/tools/compiletest/src/header/needs.rs b/src/tools/compiletest/src/header/needs.rs
@@ -144,6 +144,11 @@ pub(super) fn handle_needs(
             condition: config.runner.as_ref().is_some_and(|r| r.contains("wasmtime")),
             ignore_reason: "ignored when wasmtime runner is not available",
         },
+        Need {
+            name: "needs-ar",
+            condition: !config.target.contains("msvc"),
+            ignore_reason: "ignored when ar command is not available",
+        },
         Need {
             name: "needs-symlink",
             condition: cache.symlinks,
diff --git a/src/tools/run-make-support/src/lib.rs b/src/tools/run-make-support/src/lib.rs
@@ -61,6 +61,14 @@ pub fn target() -> String {
     env_var("TARGET")
 }
 
+/// `AR`
+#[track_caller]
+#[must_use]
+pub fn ar_command() -> Command {
+    let ar_path = env_var("AR");
+    Command::new(ar_path)
+}
+
 /// Check if target is windows-like.
 #[must_use]
 pub fn is_windows() -> bool {
diff --git a/src/tools/tidy/src/allowed_run_make_makefiles.txt b/src/tools/tidy/src/allowed_run_make_makefiles.txt
@@ -54,7 +54,6 @@ run-make/incr-add-rust-src-component/Makefile
 run-make/incr-foreign-head-span/Makefile
 run-make/interdependent-c-libraries/Makefile
 run-make/intrinsic-unreachable/Makefile
-run-make/invalid-library/Makefile
 run-make/invalid-so/Makefile
 run-make/issue-107094/Makefile
 run-make/issue-109934-lto-debuginfo/Makefile
diff --git a/tests/run-make/invalid-library/Makefile b/tests/run-make/invalid-library/Makefile
diff --git a/tests/run-make/invalid-library/rmake.rs b/tests/run-make/invalid-library/rmake.rs
@@ -0,0 +1,10 @@
+//@ needs-ar
+
+use run_make_support::fs_wrapper::create_file;
+use run_make_support::{ar_command, rustc};
+
+fn main() {
+    create_file("lib.rmeta");
+    ar_command().arg("crus").arg("libfoo-ffffffff-1.0.rlib").arg("lib.rmeta").run();
+    rustc().input("foo.rs").run_fail().assert_stderr_contains("found invalid metadata");
+}
