Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 969bbc6

Browse files
authoredJun 24, 2024
Rollup merge of rust-lang#126861 - GuillaumeGomez:migrate-run-make-invalid-library, r=Kobzol
Migrate `run-make/invalid-library` to `rmake.rs` Part of rust-lang#121876. r? `@jieyouxu`
2 parents 12d7736 + 10990e2 commit 969bbc6

File tree

4 files changed

+16
-7
lines changed

4 files changed

+16
-7
lines changed
 

‎src/tools/run-make-support/src/lib.rs

+8
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,14 @@ pub fn target() -> String {
6161
env_var("TARGET")
6262
}
6363

64+
/// `AR`
65+
#[track_caller]
66+
#[must_use]
67+
pub fn ar_command() -> Command {
68+
let ar_path = env_var("AR");
69+
Command::new(ar_path)
70+
}
71+
6472
/// Check if target is windows-like.
6573
#[must_use]
6674
pub fn is_windows() -> bool {

‎src/tools/tidy/src/allowed_run_make_makefiles.txt

-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ run-make/incr-add-rust-src-component/Makefile
5454
run-make/incr-foreign-head-span/Makefile
5555
run-make/interdependent-c-libraries/Makefile
5656
run-make/intrinsic-unreachable/Makefile
57-
run-make/invalid-library/Makefile
5857
run-make/invalid-so/Makefile
5958
run-make/issue-107094/Makefile
6059
run-make/issue-109934-lto-debuginfo/Makefile

‎tests/run-make/invalid-library/Makefile

-6
This file was deleted.
+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
use run_make_support::fs_wrapper::create_file;
2+
use run_make_support::{ar_command, rustc};
3+
4+
fn main() {
5+
create_file("lib.rmeta");
6+
ar_command().arg("crus").arg("libfoo-ffffffff-1.0.rlib").arg("lib.rmeta").run();
7+
rustc().input("foo.rs").run_fail().assert_stderr_contains("found invalid metadata");
8+
}

0 commit comments

Comments
 (0)
Failed to load comments.