mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rewrite extern-multiple-copies2 to rmake

Browse Source
This commit is contained in:
Oneirical 2024-07-23 12:00:46 -04:00
parent 4332f5d81a
commit 421619da48
5 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/tools/tidy/src/allowed_run_make_makefiles.txt
View File

@ -17,7 +17,6 @@ run-make/emit-to-stdout/Makefile
run-make/export-executable-symbols/Makefile run-make/export-executable-symbols/Makefile
run-make/extern-flag-disambiguates/Makefile run-make/extern-flag-disambiguates/Makefile
run-make/extern-fn-reachable/Makefile run-make/extern-fn-reachable/Makefile
run-make/extern-multiple-copies2/Makefile
run-make/fmt-write-bloat/Makefile run-make/fmt-write-bloat/Makefile
run-make/foreign-double-unwind/Makefile run-make/foreign-double-unwind/Makefile
run-make/foreign-exceptions/Makefile run-make/foreign-exceptions/Makefile

2
tests/run-make/extern-diff-internal-name/rmake.rs
View File

@ -7,8 +7,6 @@
// make a resurgence. // make a resurgence.
// See https://github.com/rust-lang/rust/pull/17189 // See https://github.com/rust-lang/rust/pull/17189
//FIXME(Oneirical): test-various
use run_make_support::{rust_lib_name, rustc}; use run_make_support::{rust_lib_name, rustc};
fn main() { fn main() {

2
tests/run-make/extern-multiple-copies/rmake.rs
View File

@ -4,8 +4,6 @@
// in successful compilation. // in successful compilation.
// https://github.com/rust-lang/rust/pull/29961 // https://github.com/rust-lang/rust/pull/29961
// FIXME(Oneirical): test-various
use run_make_support::{path, rfs, rust_lib_name, rustc}; use run_make_support::{path, rfs, rust_lib_name, rustc};
fn main() { fn main() {

11
tests/run-make/extern-multiple-copies2/Makefile
View File

@ -1,11 +0,0 @@
# ignore-cross-compile
include ../tools.mk
all:
$(RUSTC) foo1.rs
$(RUSTC) foo2.rs
mkdir $(TMPDIR)/foo
cp $(TMPDIR)/libfoo1.rlib $(TMPDIR)/foo/libfoo1.rlib
$(RUSTC) bar.rs \
--extern foo1=$(TMPDIR)/foo/libfoo1.rlib \
--extern foo2=$(TMPDIR)/libfoo2.rlib

22
tests/run-make/extern-multiple-copies2/rmake.rs Normal file
View File

@ -0,0 +1,22 @@
// Almost identical to `extern-multiple-copies`, but with a variation in the --extern calls
// and the addition of #[macro_use] in the rust code files, which used to break --extern
// until #33625.
// In this test, the rust library foo1 exists in two different locations, but only one
// is required by the --extern flag. This test checks that the copy is ignored (as --extern
// demands fetching only the original instance of foo1) and that no error is emitted, resulting
// in successful compilation.
// https://github.com/rust-lang/rust/issues/33762
use run_make_support::{path, rfs, rust_lib_name, rustc};
fn main() {
rustc().input("foo1.rs").run();
rustc().input("foo2.rs").run();
rfs::create_dir("foo");
rfs::copy(rust_lib_name("foo1"), path("foo").join(rust_lib_name("foo1")));
rustc()
.input("bar.rs")
.extern_("foo1", path("foo").join(rust_lib_name("foo1")))
.extern_("foo2", rust_lib_name("foo2"))
.run();
}