Skip to content

Commit

Permalink
rewrite archive-duplicate-names to rmake
Browse files Browse the repository at this point in the history
  • Loading branch information
Oneirical committed Jul 16, 2024
1 parent bfa10ac commit 3a14ef0
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 17 deletions.
1 change: 0 additions & 1 deletion src/tools/tidy/src/allowed_run_make_makefiles.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
run-make/archive-duplicate-names/Makefile
run-make/atomic-lock-free/Makefile
run-make/branch-protection-check-IBT/Makefile
run-make/c-dynamic-dylib/Makefile
Expand Down
16 changes: 0 additions & 16 deletions tests/run-make/archive-duplicate-names/Makefile

This file was deleted.

37 changes: 37 additions & 0 deletions tests/run-make/archive-duplicate-names/rmake.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
// When two object archives with the same filename are present, an iterator is supposed to
// inspect each object, recognize the duplication and extract each one to a different directory.
// This test checks that this duplicate handling behaviour has not been broken.
// See https://github.com/rust-lang/rust/pull/24439

//@ ignore-cross-compile
// Reason: the compiled binary is executed

use run_make_support::{cc, fs_wrapper, is_msvc, llvm_ar, run, rustc};

fn main() {
fs_wrapper::create_dir("a");
fs_wrapper::create_dir("b");
compile_obj_force_foo("a", "foo");
compile_obj_force_foo("b", "bar");
let mut ar = llvm_ar();
ar.obj_to_ar().arg("libfoo.a");
if is_msvc() {
ar.arg("a/foo.obj").arg("b/foo.obj").run();
} else {
ar.arg("a/foo.o").arg("b/foo.o").run();
}
rustc().input("foo.rs").run();
rustc().input("bar.rs").run();
run("bar");
}

#[track_caller]
pub fn compile_obj_force_foo(dir: &str, lib_name: &str) {
let obj_file = if is_msvc() { format!("{dir}/foo") } else { format!("{dir}/foo.o") };
let src = format!("{lib_name}.c");
if is_msvc() {
cc().arg("-c").out_exe(&obj_file).input(src).run();
} else {
cc().arg("-v").arg("-c").out_exe(&obj_file).input(src).run();
};
}

0 comments on commit 3a14ef0

Please sign in to comment.