Skip to content

Commit

Permalink
Auto merge of rust-lang#127693 - Rejyr:migrate-crate-hash-rustc-versi…
Browse files Browse the repository at this point in the history
…on-rmake, r=<try>

Migrate `crate-hash-rustc-version` to `rmake`

Part of rust-lang#121876.

r? `@jieyouxu`

try-job: x86_64-msvc
try-job: aarch64-apple
try-job: dist-x86_64-linux
  • Loading branch information
bors committed Jul 14, 2024
2 parents 8a63c84 + 3f904e0 commit 3804d28
Show file tree
Hide file tree
Showing 3 changed files with 46 additions and 39 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
Expand Up @@ -12,7 +12,6 @@ run-make/cdylib-dylib-linkage/Makefile
run-make/compiler-lookup-paths-2/Makefile
run-make/compiler-lookup-paths/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-pgo-smoketest/Makefile
run-make/cross-lang-lto-upstream-rlibs/Makefile
Expand Down
38 changes: 0 additions & 38 deletions tests/run-make/crate-hash-rustc-version/Makefile

This file was deleted.

46 changes: 46 additions & 0 deletions tests/run-make/crate-hash-rustc-version/rmake.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
// Ensure that crates compiled with different rustc versions cannot
// be dynamically linked.

//@ ignore-cross-compile

use run_make_support::{cmd, diff, dynamic_lib_name, is_darwin, run, run_fail, rustc};

fn main() {
let flags = ["-Cprefer-dynamic", "-Csymbol-mangling-version=v0"];
let nm_flag = if is_darwin() { ["-D"].as_slice() } else { [].as_slice() };

// a.rs is a dylib
rustc().input("a.rs").crate_type("dylib").args(&flags).run();

// Write symbols to disk.
let symbols_before = cmd("nm").args(nm_flag).arg(&dynamic_lib_name("a")).run().stdout_utf8();

// b.rs is 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, write symbols to disk again.
let symbols_after = cmd("nm").args(nm_flag).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");
}

0 comments on commit 3804d28

Please sign in to comment.