mirror of
https://github.com/rust-lang/rust.git
synced 2025-05-14 02:49:40 +00:00
Rollup merge of #127693 - Rejyr:migrate-crate-hash-rustc-version-rmake, r=jieyouxu
Migrate `crate-hash-rustc-version` to `rmake` Part of #121876. r? ``@jieyouxu`` try-job: x86_64-gnu-llvm-18 try-job: dist-x86_64-linux
This commit is contained in:
commit
aa6ae4beca
src/tools/tidy/src
tests/run-make/crate-hash-rustc-version
@ -9,7 +9,6 @@ run-make/cat-and-grep-sanity-check/Makefile
|
|||||||
run-make/cdylib-dylib-linkage/Makefile
|
run-make/cdylib-dylib-linkage/Makefile
|
||||||
run-make/compiler-lookup-paths-2/Makefile
|
run-make/compiler-lookup-paths-2/Makefile
|
||||||
run-make/compiler-rt-works-on-mingw/Makefile
|
run-make/compiler-rt-works-on-mingw/Makefile
|
||||||
run-make/crate-hash-rustc-version/Makefile
|
|
||||||
run-make/cross-lang-lto-clang/Makefile
|
run-make/cross-lang-lto-clang/Makefile
|
||||||
run-make/cross-lang-lto-pgo-smoketest/Makefile
|
run-make/cross-lang-lto-pgo-smoketest/Makefile
|
||||||
run-make/cross-lang-lto-upstream-rlibs/Makefile
|
run-make/cross-lang-lto-upstream-rlibs/Makefile
|
||||||
|
@ -1,38 +0,0 @@
|
|||||||
# ignore-cross-compile
|
|
||||||
include ../tools.mk
|
|
||||||
|
|
||||||
# Ensure that crates compiled with different rustc versions cannot
|
|
||||||
# be dynamically linked.
|
|
||||||
|
|
||||||
FLAGS := -Cprefer-dynamic -Csymbol-mangling-version=v0
|
|
||||||
UNAME := $(shell uname)
|
|
||||||
ifeq ($(UNAME),Linux)
|
|
||||||
EXT=".so"
|
|
||||||
NM_CMD := nm -D
|
|
||||||
endif
|
|
||||||
ifeq ($(UNAME),Darwin)
|
|
||||||
EXT=".dylib"
|
|
||||||
NM_CMD := nm
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifndef NM_CMD
|
|
||||||
all:
|
|
||||||
exit 0
|
|
||||||
else
|
|
||||||
all:
|
|
||||||
# a.rs is a dylib
|
|
||||||
$(RUSTC) a.rs --crate-type=dylib $(FLAGS)
|
|
||||||
# Write symbols to disk.
|
|
||||||
$(NM_CMD) $(call DYLIB,a) > $(TMPDIR)/symbolsbefore
|
|
||||||
# b.rs is a binary
|
|
||||||
$(RUSTC) b.rs --extern a=$(TMPDIR)/liba$(EXT) --crate-type=bin -Crpath $(FLAGS)
|
|
||||||
$(call RUN,b)
|
|
||||||
# Now re-compile a.rs with another rustc version
|
|
||||||
RUSTC_FORCE_RUSTC_VERSION=deadfeed $(RUSTC) a.rs --crate-type=dylib $(FLAGS)
|
|
||||||
# After compiling with a different rustc version, write symbols to disk again.
|
|
||||||
$(NM_CMD) $(call DYLIB,a) > $(TMPDIR)/symbolsafter
|
|
||||||
# As a sanity check, test if the symbols changed:
|
|
||||||
# If the symbols are identical, there's been an error.
|
|
||||||
if diff $(TMPDIR)/symbolsbefore $(TMPDIR)/symbolsafter; then exit 1; fi
|
|
||||||
$(call FAIL,b)
|
|
||||||
endif
|
|
57
tests/run-make/crate-hash-rustc-version/rmake.rs
Normal file
57
tests/run-make/crate-hash-rustc-version/rmake.rs
Normal file
@ -0,0 +1,57 @@
|
|||||||
|
// Ensure that crates compiled with different rustc versions cannot
|
||||||
|
// be dynamically linked.
|
||||||
|
|
||||||
|
//@ ignore-cross-compile
|
||||||
|
//@ only-unix
|
||||||
|
|
||||||
|
use run_make_support::llvm;
|
||||||
|
use run_make_support::{diff, dynamic_lib_name, is_darwin, run, run_fail, rustc};
|
||||||
|
|
||||||
|
fn llvm_readobj() -> llvm::LlvmReadobj {
|
||||||
|
let mut cmd = llvm::llvm_readobj();
|
||||||
|
if is_darwin() {
|
||||||
|
cmd.symbols();
|
||||||
|
} else {
|
||||||
|
cmd.dynamic_table();
|
||||||
|
}
|
||||||
|
cmd
|
||||||
|
}
|
||||||
|
|
||||||
|
fn main() {
|
||||||
|
let flags = ["-Cprefer-dynamic", "-Csymbol-mangling-version=v0"];
|
||||||
|
|
||||||
|
// a.rs is compiled to a dylib
|
||||||
|
rustc().input("a.rs").crate_type("dylib").args(&flags).run();
|
||||||
|
|
||||||
|
// Store symbols
|
||||||
|
let symbols_before = llvm_readobj().arg(dynamic_lib_name("a")).run().stdout_utf8();
|
||||||
|
|
||||||
|
// b.rs is compiled to a binary
|
||||||
|
rustc()
|
||||||
|
.input("b.rs")
|
||||||
|
.extern_("a", dynamic_lib_name("a"))
|
||||||
|
.crate_type("bin")
|
||||||
|
.arg("-Crpath")
|
||||||
|
.args(&flags)
|
||||||
|
.run();
|
||||||
|
run("b");
|
||||||
|
|
||||||
|
// Now re-compile a.rs with another rustc version
|
||||||
|
rustc()
|
||||||
|
.env("RUSTC_FORCE_RUSTC_VERSION", "deadfeed")
|
||||||
|
.input("a.rs")
|
||||||
|
.crate_type("dylib")
|
||||||
|
.args(&flags)
|
||||||
|
.run();
|
||||||
|
|
||||||
|
// After compiling with a different rustc version, store symbols again.
|
||||||
|
let symbols_after = llvm_readobj().arg(dynamic_lib_name("a")).run().stdout_utf8();
|
||||||
|
|
||||||
|
// As a sanity check, test if the symbols changed:
|
||||||
|
// If the symbols are identical, there's been an error.
|
||||||
|
diff()
|
||||||
|
.expected_text("symbols_before", symbols_before)
|
||||||
|
.actual_text("symbols_after", symbols_after)
|
||||||
|
.run_fail();
|
||||||
|
run_fail("b");
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user