Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 83e9b93

Browse files
committed
Auto merge of #127095 - Oneirical:testiary-education, r=jieyouxu
Migrate `reproducible-build-2` and `stable-symbol-names` `run-make` tests to rmake Part of #121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html). Needs try-jobs. try-job: x86_64-msvc try-job: armhf-gnu try-job: test-various try-job: aarch64-apple try-job: i686-msvc try-job: x86_64-mingw
2 parents 9179d9b + 94da7b1 commit 83e9b93

File tree

7 files changed

+138
-76
lines changed

7 files changed

+138
-76
lines changed

‎src/tools/run-make-support/src/external_deps/llvm.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,8 @@ impl LlvmReadobj {
151151
self
152152
}
153153

154-
/// Pass `--symbols` to display the symbol.
154+
/// Pass `--symbols` to display the symbol table, including both local
155+
/// and global symbols.
155156
pub fn symbols(&mut self) -> &mut Self {
156157
self.cmd.arg("--symbols");
157158
self

‎src/tools/run-make-support/src/fs.rs

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,19 @@ pub fn create_symlink<P: AsRef<Path>, Q: AsRef<Path>>(original: P, link: Q) {
99
if link.as_ref().exists() {
1010
std::fs::remove_dir(link.as_ref()).unwrap();
1111
}
12-
std::os::windows::fs::symlink_file(original.as_ref(), link.as_ref()).expect(&format!(
13-
"failed to create symlink {:?} for {:?}",
14-
link.as_ref().display(),
15-
original.as_ref().display(),
16-
));
12+
if original.as_ref().is_file() {
13+
std::os::windows::fs::symlink_file(original.as_ref(), link.as_ref()).expect(&format!(
14+
"failed to create symlink {:?} for {:?}",
15+
link.as_ref().display(),
16+
original.as_ref().display(),
17+
));
18+
} else {
19+
std::os::windows::fs::symlink_dir(original.as_ref(), link.as_ref()).expect(&format!(
20+
"failed to create symlink {:?} for {:?}",
21+
link.as_ref().display(),
22+
original.as_ref().display(),
23+
));
24+
}
1725
}
1826

1927
/// Creates a new symlink to a path on the filesystem, adjusting for Windows or Unix.
@@ -41,6 +49,8 @@ pub fn copy_dir_all(src: impl AsRef<Path>, dst: impl AsRef<Path>) {
4149
let ty = entry.file_type()?;
4250
if ty.is_dir() {
4351
copy_dir_all_inner(entry.path(), dst.join(entry.file_name()))?;
52+
} else if ty.is_symlink() {
53+
copy_symlink(entry.path(), dst.join(entry.file_name()))?;
4454
} else {
4555
std::fs::copy(entry.path(), dst.join(entry.file_name()))?;
4656
}
@@ -59,6 +69,12 @@ pub fn copy_dir_all(src: impl AsRef<Path>, dst: impl AsRef<Path>) {
5969
}
6070
}
6171

72+
fn copy_symlink<P: AsRef<Path>, Q: AsRef<Path>>(from: P, to: Q) -> io::Result<()> {
73+
let target_path = std::fs::read_link(from).unwrap();
74+
create_symlink(target_path, to);
75+
Ok(())
76+
}
77+
6278
/// Helper for reading entries in a given directory.
6379
pub fn read_dir_entries<P: AsRef<Path>, F: FnMut(&Path)>(dir: P, mut callback: F) {
6480
for entry in read_dir(dir) {

‎src/tools/tidy/src/allowed_run_make_makefiles.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,10 @@ run-make/raw-dylib-alt-calling-convention/Makefile
2727
run-make/raw-dylib-c/Makefile
2828
run-make/redundant-libs/Makefile
2929
run-make/remap-path-prefix-dwarf/Makefile
30-
run-make/reproducible-build-2/Makefile
3130
run-make/reproducible-build/Makefile
3231
run-make/rlib-format-packed-bundled-libs/Makefile
3332
run-make/simd-ffi/Makefile
3433
run-make/split-debuginfo/Makefile
35-
run-make/stable-symbol-names/Makefile
3634
run-make/staticlib-dylib-linkage/Makefile
3735
run-make/symbol-mangling-hashed/Makefile
3836
run-make/sysroot-crates-are-unstable/Makefile

‎tests/run-make/reproducible-build-2/Makefile

Lines changed: 0 additions & 27 deletions
This file was deleted.
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
// Builds with fat link-time-optimizations and the --sysroot flag used to be
2+
// non-deterministic - that means, compiling twice with no changes would create
3+
// slightly different outputs. This has been fixed by #63352 and #63505.
4+
// Test 1: Compile with fat-lto twice, check that both compilation outputs are identical.
5+
// Test 2: Compile with sysroot, then change the sysroot path from absolute to relative.
6+
// Outputs should be identical.
7+
// See https://github.com/rust-lang/rust/issues/34902
8+
9+
//@ ignore-windows
10+
// Reasons:
11+
// 1. The object files are reproducible, but their paths are not, which causes
12+
// the first assertion in the test to fail.
13+
// 2. When the sysroot gets copied, some symlinks must be re-created,
14+
// which is a privileged action on Windows.
15+
16+
use run_make_support::{bin_name, rfs, rust_lib_name, rustc};
17+
18+
fn main() {
19+
// test 1: fat lto
20+
rustc().input("reproducible-build-aux.rs").run();
21+
rustc().input("reproducible-build.rs").arg("-Clto=fat").output("reproducible-build").run();
22+
rfs::rename("reproducible-build", "reproducible-build-a");
23+
rustc().input("reproducible-build.rs").arg("-Clto=fat").output("reproducible-build").run();
24+
assert_eq!(rfs::read("reproducible-build"), rfs::read("reproducible-build-a"));
25+
26+
// test 2: sysroot
27+
let sysroot = rustc().print("sysroot").run().stdout_utf8();
28+
let sysroot = sysroot.trim();
29+
30+
rustc().input("reproducible-build-aux.rs").run();
31+
rustc()
32+
.input("reproducible-build.rs")
33+
.crate_type("rlib")
34+
.sysroot(&sysroot)
35+
.arg(format!("--remap-path-prefix={sysroot}=/sysroot"))
36+
.run();
37+
rfs::copy_dir_all(&sysroot, "sysroot");
38+
rfs::rename(rust_lib_name("reproducible_build"), rust_lib_name("foo"));
39+
rustc()
40+
.input("reproducible-build.rs")
41+
.crate_type("rlib")
42+
.sysroot("sysroot")
43+
.arg("--remap-path-prefix=/sysroot=/sysroot")
44+
.run();
45+
46+
assert_eq!(rfs::read(rust_lib_name("reproducible_build")), rfs::read(rust_lib_name("foo")));
47+
}

‎tests/run-make/stable-symbol-names/Makefile

Lines changed: 0 additions & 41 deletions
This file was deleted.
Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
// A typo in rustc caused generic symbol names to be non-deterministic -
2+
// that is, it was possible to compile the same file twice with no changes
3+
// and get outputs with different symbol names.
4+
// This test compiles each of the two crates twice, and checks that each output
5+
// contains exactly the same symbol names.
6+
// Additionally, both crates should agree on the same symbol names for monomorphic
7+
// functions.
8+
// See https://github.com/rust-lang/rust/issues/32554
9+
10+
use std::collections::HashSet;
11+
12+
use run_make_support::{llvm_readobj, regex, rfs, rust_lib_name, rustc};
13+
14+
static LEGACY_PATTERN: std::sync::OnceLock<regex::Regex> = std::sync::OnceLock::new();
15+
static V0_PATTERN: std::sync::OnceLock<regex::Regex> = std::sync::OnceLock::new();
16+
17+
fn main() {
18+
LEGACY_PATTERN.set(regex::Regex::new(r"_ZN.*E").unwrap()).unwrap();
19+
V0_PATTERN.set(regex::Regex::new(r"_R[a-zA-Z0-9_]*").unwrap()).unwrap();
20+
// test 1: first file
21+
rustc().input("stable-symbol-names1.rs").run();
22+
let sym1 = process_symbols("stable_symbol_names1", "generic_|mono_");
23+
rfs::remove_file(rust_lib_name("stable_symbol_names1"));
24+
rustc().input("stable-symbol-names1.rs").run();
25+
let sym2 = process_symbols("stable_symbol_names1", "generic_|mono_");
26+
assert_eq!(sym1, sym2);
27+
28+
// test 2: second file
29+
rustc().input("stable-symbol-names2.rs").run();
30+
let sym1 = process_symbols("stable_symbol_names2", "generic_|mono_");
31+
rfs::remove_file(rust_lib_name("stable_symbol_names2"));
32+
rustc().input("stable-symbol-names2.rs").run();
33+
let sym2 = process_symbols("stable_symbol_names2", "generic_|mono_");
34+
assert_eq!(sym1, sym2);
35+
36+
// test 3: crossed files
37+
let sym1 = process_symbols("stable_symbol_names1", "mono_");
38+
let sym2 = process_symbols("stable_symbol_names2", "mono_");
39+
assert_eq!(sym1, sym2);
40+
}
41+
42+
#[track_caller]
43+
fn process_symbols(path: &str, symbol: &str) -> Vec<String> {
44+
// Dump all symbols.
45+
let out = llvm_readobj().input(rust_lib_name(path)).symbols().run().stdout_utf8();
46+
// Extract only lines containing `symbol`.
47+
let symbol_regex = regex::Regex::new(symbol).unwrap();
48+
let out = out.lines().filter(|&line| symbol_regex.find(line).is_some());
49+
50+
// HashSet - duplicates should be excluded!
51+
let mut symbols: HashSet<String> = HashSet::new();
52+
// From those lines, extract just the symbol name via `regex`, which:
53+
// * always starts with "_ZN" and ends with "E" (`legacy` mangling)
54+
// * always starts with "_R" (`v0` mangling)
55+
for line in out {
56+
if let Some(mat) = LEGACY_PATTERN.get().unwrap().find(line) {
57+
symbols.insert(mat.as_str().to_string());
58+
}
59+
if let Some(mat) = V0_PATTERN.get().unwrap().find(line) {
60+
symbols.insert(mat.as_str().to_string());
61+
}
62+
}
63+
64+
let mut symbols: Vec<String> = symbols.into_iter().collect();
65+
// Sort those symbol names for deterministic comparison.
66+
symbols.sort();
67+
symbols
68+
}

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /