diff options
| author | binarycat <binarycat@envs.net> | 2024-07-23 11:32:00 -0400 |
|---|---|---|
| committer | binarycat <binarycat@envs.net> | 2024-07-25 12:18:23 -0400 |
| commit | bade1428eebc2f477549c6c025cb9b51f6fe1f9d (patch) | |
| tree | ce4e018228ef712a2016df5612a2a9627e4ef336 | |
| parent | 54be9ad5eb47207d155904f6c912a9526133f75f (diff) | |
| download | rust-bade1428eebc2f477549c6c025cb9b51f6fe1f9d.tar.gz rust-bade1428eebc2f477549c6c025cb9b51f6fe1f9d.zip | |
migrate tests/run-make/extern-flag-disambiguates to rmake
| -rw-r--r-- | tests/run-make/extern-flag-disambiguates/Makefile | 26 | ||||
| -rw-r--r-- | tests/run-make/extern-flag-disambiguates/rmake.rs | 30 |
2 files changed, 30 insertions, 26 deletions
diff --git a/tests/run-make/extern-flag-disambiguates/Makefile b/tests/run-make/extern-flag-disambiguates/Makefile deleted file mode 100644 index e54a537ecd0..00000000000 --- a/tests/run-make/extern-flag-disambiguates/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# ignore-cross-compile -include ../tools.mk - -# Attempt to build this dependency tree: -# -# A.1 A.2 -# |\ | -# | \ | -# B \ C -# \ | / -# \|/ -# D -# -# Note that A.1 and A.2 are crates with the same name. - -all: - $(RUSTC) -C metadata=1 -C extra-filename=-1 a.rs - $(RUSTC) -C metadata=2 -C extra-filename=-2 a.rs - $(RUSTC) b.rs --extern a=$(TMPDIR)/liba-1.rlib - $(RUSTC) c.rs --extern a=$(TMPDIR)/liba-2.rlib - @echo before - $(RUSTC) --cfg before d.rs --extern a=$(TMPDIR)/liba-1.rlib - $(call RUN,d) - @echo after - $(RUSTC) --cfg after d.rs --extern a=$(TMPDIR)/liba-1.rlib - $(call RUN,d) diff --git a/tests/run-make/extern-flag-disambiguates/rmake.rs b/tests/run-make/extern-flag-disambiguates/rmake.rs new file mode 100644 index 00000000000..8e84b06713e --- /dev/null +++ b/tests/run-make/extern-flag-disambiguates/rmake.rs @@ -0,0 +1,30 @@ +//@ ignore-cross-compile + +use run_make_support::{cwd, run, run_in_tmpdir, rustc}; + +// Attempt to build this dependency tree: +// +// A.1 A.2 +// |\ | +// | \ | +// B \ C +// \ | / +// \|/ +// D +// +// Note that A.1 and A.2 are crates with the same name. + +fn main() { + run_in_tmpdir(|| { + rustc().metadata("1").extra_filename("-1").input("a.rs").run(); + rustc().metadata("2").extra_filename("-2").input("a.rs").run(); + rustc().input("b.rs").extern_("a", "liba-1.rlib").run(); + rustc().input("c.rs").extern_("a", "liba-2.rlib").run(); + println!("before"); + rustc().cfg("before").input("d.rs").extern_("a", "liba-1.rlib").run(); + run("d"); + println!("after"); + rustc().cfg("after").input("d.rs").extern_("a", "liba-1.rlib").run(); + run("d"); + }); +} |