Skip to content

Commit acce968

Browse files
OneiricalOneirical
committed
massive refactor of reproducible-build test
1 parent 5015a26 commit acce968

File tree

1 file changed

+174
-155
lines changed
  • tests/run-make/reproducible-build

1 file changed

+174
-155
lines changed

‎tests/run-make/reproducible-build/rmake.rs

+174-155
Original file line numberDiff line numberDiff line change
@@ -18,205 +18,224 @@
1818
// - Trait object shims
1919
// - Fn Pointer shims
2020
// See https://github.com/rust-lang/rust/pull/32293
21+
// Tracking Issue: https://github.com/rust-lang/rust/issues/129080
2122

22-
// FIXME(Oneirical): ignore-musl
23-
// FIXME(Oneirical): two of these test blocks will apparently fail on windows
24-
// FIXME(Oneirical): try it on test-various
23+
// FIXME(Oneirical): ignore-windows
2524
// # FIXME: Builds of `bin` crate types are not deterministic with debuginfo=2 on
2625
// # Windows.
2726
// # See: https://github.com/rust-lang/rust/pull/87320#issuecomment-920105533
2827
// # Issue: https://github.com/rust-lang/rust/issues/88982
2928

30-
use run_make_support::{bin_name, cwd, diff, rfs, run_in_tmpdir, rust_lib_name, rustc};
29+
use run_make_support::{bin_name, cwd, diff, is_darwin, rfs, run_in_tmpdir, rust_lib_name, rustc};
3130

3231
fn main() {
33-
run_in_tmpdir(|| {
34-
rustc().input("linker.rs").opt().run();
35-
rustc().input("reproducible-build-aux.rs").run();
36-
rustc()
37-
.input("reproducible-build.rs")
38-
.linker(&cwd().join(bin_name("linker")).display().to_string())
39-
.run();
40-
rustc()
41-
.input("reproducible-build.rs")
42-
.linker(&cwd().join(bin_name("linker")).display().to_string())
43-
.run();
44-
diff().actual_file("linker-arguments1").expected_file("linker-arguments2").run();
45-
});
32+
// Smoke tests. Simple flags, build should be reproducible.
33+
eprintln!("smoke_test => None");
34+
smoke_test(None);
35+
eprintln!("smoke_test => SmokeFlag::Debug");
36+
smoke_test(Some(SmokeFlag::Debug));
37+
eprintln!("smoke_test => SmokeFlag::Opt");
38+
smoke_test(Some(SmokeFlag::Opt));
4639

47-
run_in_tmpdir(|| {
48-
rustc().input("linker.rs").opt().run();
49-
rustc().arg("-g").input("reproducible-build-aux.rs").run();
50-
rustc()
51-
.arg("-g")
52-
.input("reproducible-build.rs")
53-
.linker(&cwd().join(bin_name("linker")).display().to_string())
54-
.run();
55-
rustc()
56-
.arg("-g")
57-
.input("reproducible-build.rs")
58-
.linker(&cwd().join(bin_name("linker")).display().to_string())
59-
.run();
60-
diff().actual_file("linker-arguments1").expected_file("linker-arguments2").run();
61-
});
40+
// Builds should be reproducible even through custom library search paths
41+
// or remap path prefixes.
42+
eprintln!("paths_test => PathsFlag::Link");
43+
paths_test(PathsFlag::Link);
44+
eprintln!("paths_test => PathsFlag::Remap");
45+
paths_test(PathsFlag::Remap);
6246

63-
run_in_tmpdir(|| {
64-
rustc().input("linker.rs").opt().run();
65-
rustc().opt().input("reproducible-build-aux.rs").run();
66-
rustc()
67-
.opt()
68-
.input("reproducible-build.rs")
69-
.linker(&cwd().join(bin_name("linker")).display().to_string())
70-
.run();
71-
rustc()
72-
.opt()
73-
.input("reproducible-build.rs")
74-
.linker(&cwd().join(bin_name("linker")).display().to_string())
75-
.run();
76-
diff().actual_file("linker-arguments1").expected_file("linker-arguments2").run();
77-
});
47+
// Builds should be reproducible even if each build is done in a different directory,
48+
// with both --remap-path-prefix and -Z remap-cwd-prefix.
7849

79-
run_in_tmpdir(|| {
80-
rustc().input("reproducible-build-aux.rs").run();
81-
rustc().input("reproducible-build.rs").crate_type("rlib").library_search_path("b").run();
82-
rfs::copy(rust_lib_name("reproducible_build"), rust_lib_name("foo"));
83-
rustc().input("reproducible-build.rs").crate_type("rlib").library_search_path("a").run();
84-
assert_eq!(rfs::read(rust_lib_name("reproducible_build")), rfs::read(rust_lib_name("foo")));
85-
});
50+
// FIXME(Oneirical): Building with crate type set to `bin` AND having -Cdebuginfo=2
51+
// (or `-g`, the shorthand form) enabled will cause reproducibility failures.
52+
// See https://github.com/rust-lang/rust/issues/89911
53+
54+
if !is_darwin() {
55+
// FIXME(Oneirical): Bin builds are not reproducible on OSX.
56+
eprintln!("diff_dir_test => Bin, Path");
57+
diff_dir_test(CrateType::Bin, RemapType::Path);
58+
}
59+
60+
eprintln!("diff_dir_test => Rlib, Path");
61+
diff_dir_test(CrateType::Rlib, RemapType::Path);
62+
63+
// FIXME(Oneirical): This specific case would fail on Linux, should -Cdebuginfo=2
64+
// be added.
65+
// FIXME(Oneirical): Bin builds are not reproducible on OSX.
66+
// See https://github.com/rust-lang/rust/issues/89911
67+
if !is_darwin() {
68+
eprintln!("diff_dir_test => Bin, Cwd false");
69+
diff_dir_test(CrateType::Bin, RemapType::Cwd { is_empty: false });
70+
}
71+
72+
eprintln!("diff_dir_test => Rlib, Cwd false");
73+
diff_dir_test(CrateType::Rlib, RemapType::Cwd { is_empty: false });
74+
eprintln!("diff_dir_test => Rlib, Cwd true");
75+
diff_dir_test(CrateType::Rlib, RemapType::Cwd { is_empty: true });
8676

77+
eprintln!("final extern test");
78+
// Builds should be reproducible when using the --extern flag.
8779
run_in_tmpdir(|| {
8880
rustc().input("reproducible-build-aux.rs").run();
8981
rustc()
9082
.input("reproducible-build.rs")
9183
.crate_type("rlib")
92-
.arg("--remap-path-prefix=/a=/c")
84+
.extern_("reproducible_build_aux", rust_lib_name("reproducible_build_aux"))
9385
.run();
9486
rfs::copy(rust_lib_name("reproducible_build"), rust_lib_name("foo"));
87+
rfs::copy(rust_lib_name("reproducible_build_aux"), rust_lib_name("bar"));
9588
rustc()
9689
.input("reproducible-build.rs")
9790
.crate_type("rlib")
98-
.arg("--remap-path-prefix=/b=/c")
91+
.extern_("reproducible_build_aux", rust_lib_name("bar"))
9992
.run();
100-
assert_eq!(rfs::read(rust_lib_name("reproducible_build")), rfs::read(rust_lib_name("foo")));
93+
assert_eq!(rfs::read(rust_lib_name("foo")), rfs::read(rust_lib_name("reproducible_build")));
10194
});
95+
}
10296

97+
#[track_caller]
98+
fn smoke_test(flag: Option<SmokeFlag>) {
10399
run_in_tmpdir(|| {
100+
rustc().input("linker.rs").opt().run();
104101
rustc().input("reproducible-build-aux.rs").run();
105-
rfs::create_dir("test");
106-
rfs::copy("reproducible-build.rs", "test/reproducible-build.rs");
107-
rustc()
102+
let mut compiler1 = rustc();
103+
let mut compiler2 = rustc();
104+
if let Some(flag) = flag {
105+
match flag {
106+
SmokeFlag::Debug => {
107+
compiler1.arg("-g");
108+
compiler2.arg("-g");
109+
}
110+
SmokeFlag::Opt => {
111+
compiler1.opt();
112+
compiler2.opt();
113+
}
114+
};
115+
};
116+
compiler1
108117
.input("reproducible-build.rs")
109-
.crate_type("bin")
110-
.arg(&format!("--remap-path-prefix={}=/b", cwd().display()))
118+
.linker(&cwd().join(bin_name("linker")).display().to_string())
111119
.run();
112-
eprintln!("{:#?}", rfs::shallow_find_dir_entries(cwd()));
113-
rfs::copy(bin_name("reproducible_build"), bin_name("foo"));
114-
rustc()
115-
.input("test/reproducible-build.rs")
116-
.crate_type("bin")
117-
.arg("--remap-path-prefix=/test=/b")
120+
compiler2
121+
.input("reproducible-build.rs")
122+
.linker(&cwd().join(bin_name("linker")).display().to_string())
118123
.run();
119-
assert_eq!(rfs::read(bin_name("reproducible_build")), rfs::read(bin_name("foo")));
124+
diff().actual_file("linker-arguments1").expected_file("linker-arguments2").run();
120125
});
126+
}
121127

128+
#[track_caller]
129+
fn paths_test(flag: PathsFlag) {
122130
run_in_tmpdir(|| {
123131
rustc().input("reproducible-build-aux.rs").run();
124-
rfs::create_dir("test");
125-
rfs::copy("reproducible-build.rs", "test/reproducible-build.rs");
126-
rustc()
127-
.input("reproducible-build.rs")
128-
.crate_type("rlib")
129-
.arg(&format!("--remap-path-prefix={}=/b", cwd().display()))
130-
.run();
131-
rfs::copy(rust_lib_name("reproducible_build"), rust_lib_name("foo"));
132-
rustc()
133-
.input("test/reproducible-build.rs")
134-
.crate_type("rlib")
135-
.arg("--remap-path-prefix=/test=/b")
136-
.run();
132+
let mut compiler1 = rustc();
133+
let mut compiler2 = rustc();
134+
match flag {
135+
PathsFlag::Link => {
136+
compiler1.library_search_path("a");
137+
compiler2.library_search_path("b");
138+
}
139+
PathsFlag::Remap => {
140+
compiler1.arg("--remap-path-prefix=/a=/c");
141+
compiler2.arg("--remap-path-prefix=/b=/c");
142+
}
143+
}
144+
compiler1.input("reproducible-build.rs").crate_type("rlib").run();
145+
rfs::rename(rust_lib_name("reproducible_build"), rust_lib_name("foo"));
146+
compiler2.input("reproducible-build.rs").crate_type("rlib").run();
137147
assert_eq!(rfs::read(rust_lib_name("reproducible_build")), rfs::read(rust_lib_name("foo")));
138148
});
149+
}
139150

151+
#[track_caller]
152+
fn diff_dir_test(crate_type: CrateType, remap_type: RemapType) {
140153
run_in_tmpdir(|| {
154+
let base_dir = cwd();
141155
rustc().input("reproducible-build-aux.rs").run();
142156
rfs::create_dir("test");
143157
rfs::copy("reproducible-build.rs", "test/reproducible-build.rs");
144-
rustc()
158+
let mut compiler1 = rustc();
159+
let mut compiler2 = rustc();
160+
match crate_type {
161+
CrateType::Bin => {
162+
compiler1.crate_type("bin");
163+
compiler2.crate_type("bin");
164+
}
165+
CrateType::Rlib => {
166+
compiler1.crate_type("rlib");
167+
compiler2.crate_type("rlib");
168+
}
169+
}
170+
match remap_type {
171+
RemapType::Path => {
172+
compiler1.arg(&format!("--remap-path-prefix={}=/b", cwd().display()));
173+
compiler2
174+
.arg(format!("--remap-path-prefix={}=/b", base_dir.join("test").display()));
175+
}
176+
RemapType::Cwd { is_empty } => {
177+
// FIXME(Oneirical): Building with crate type set to `bin` AND having -Cdebuginfo=2
178+
// (or `-g`, the shorthand form) enabled will cause reproducibility failures.
179+
// See https://github.com/rust-lang/rust/issues/89911
180+
if !matches!(crate_type, CrateType::Bin) {
181+
compiler1.arg("-Cdebuginfo=2");
182+
compiler2.arg("-Cdebuginfo=2");
183+
}
184+
if is_empty {
185+
compiler1.arg("-Zremap-cwd-prefix=");
186+
compiler2.arg("-Zremap-cwd-prefix=");
187+
} else {
188+
compiler1.arg("-Zremap-cwd-prefix=.");
189+
compiler2.arg("-Zremap-cwd-prefix=.");
190+
}
191+
}
192+
}
193+
compiler1.input("reproducible-build.rs").run();
194+
match crate_type {
195+
CrateType::Bin => {
196+
rfs::rename(bin_name("reproducible-build"), bin_name("foo"));
197+
}
198+
CrateType::Rlib => {
199+
rfs::rename(rust_lib_name("reproducible_build"), rust_lib_name("foo"));
200+
}
201+
}
202+
std::env::set_current_dir("test").unwrap();
203+
compiler2
145204
.input("reproducible-build.rs")
146-
.crate_type("bin")
147-
.arg("-Zremap-path-prefix=.")
148-
.arg("-Cdebuginfo=2")
149-
.run();
150-
rfs::copy(bin_name("reproducible_build"), bin_name("first"));
151-
rustc()
152-
.input("test/reproducible-build.rs")
153-
.crate_type("bin")
154-
.arg("-Zremap-path-prefix=.")
155-
.arg("-Cdebuginfo=2")
156-
.run();
157-
assert_eq!(rfs::read(bin_name("first")), rfs::read(bin_name("reproducible_build")));
205+
.library_search_path(&base_dir)
206+
.out_dir(&base_dir)
207+
.run();
208+
std::env::set_current_dir(&base_dir).unwrap();
209+
match crate_type {
210+
CrateType::Bin => {
211+
assert!(rfs::read(bin_name("reproducible-build")) == rfs::read(bin_name("foo")));
212+
}
213+
CrateType::Rlib => {
214+
assert_eq!(
215+
rfs::read(rust_lib_name("foo")),
216+
rfs::read(rust_lib_name("reproducible_build"))
217+
);
218+
}
219+
}
158220
});
221+
}
159222

160-
run_in_tmpdir(|| {
161-
rustc().input("reproducible-build-aux.rs").run();
162-
rfs::create_dir("test");
163-
rfs::copy("reproducible-build.rs", "test/reproducible-build.rs");
164-
rustc()
165-
.input("reproducible-build.rs")
166-
.crate_type("rlib")
167-
.arg("-Zremap-path-prefix=.")
168-
.arg("-Cdebuginfo=2")
169-
.run();
170-
rfs::copy("reproducible_build", "first");
171-
rustc()
172-
.input("test/reproducible-build.rs")
173-
.crate_type("rlib")
174-
.arg("-Zremap-path-prefix=.")
175-
.arg("-Cdebuginfo=2")
176-
.run();
177-
assert_eq!(
178-
rfs::read(rust_lib_name("first")),
179-
rfs::read(rust_lib_name("reproducible_build"))
180-
);
181-
});
223+
enum SmokeFlag {
224+
Debug,
225+
Opt,
226+
}
182227

183-
run_in_tmpdir(|| {
184-
rustc().input("reproducible-build-aux.rs").run();
185-
rfs::create_dir("test");
186-
rfs::copy("reproducible-build.rs", "test/reproducible-build.rs");
187-
rustc()
188-
.input("reproducible-build.rs")
189-
.crate_type("rlib")
190-
.arg("-Zremap-path-prefix=")
191-
.arg("-Cdebuginfo=2")
192-
.run();
193-
rfs::copy(rust_lib_name("reproducible_build"), rust_lib_name("first"));
194-
rustc()
195-
.input("test/reproducible-build.rs")
196-
.crate_type("rlib")
197-
.arg("-Zremap-path-prefix=")
198-
.arg("-Cdebuginfo=2")
199-
.run();
200-
assert_eq!(
201-
rfs::read(rust_lib_name("first")),
202-
rfs::read(rust_lib_name("reproducible_build"))
203-
);
204-
});
228+
enum PathsFlag {
229+
Link,
230+
Remap,
231+
}
205232

206-
run_in_tmpdir(|| {
207-
rustc().input("reproducible-build-aux.rs").run();
208-
rustc()
209-
.input("reproducible-build.rs")
210-
.crate_type("rlib")
211-
.extern_("reproducible_build_aux", rust_lib_name("reproducible_build_aux"))
212-
.run();
213-
rfs::copy(rust_lib_name("reproducible_build"), rust_lib_name("foo"));
214-
rfs::copy(rust_lib_name("reproducible_build_aux"), rust_lib_name("bar"));
215-
rustc()
216-
.input("reproducible-build.rs")
217-
.crate_type("rlib")
218-
.extern_("reproducible_build_aux", rust_lib_name("bar"))
219-
.run();
220-
assert_eq!(rfs::read(rust_lib_name("foo")), rfs::read(rust_lib_name("reproducible_build")));
221-
});
233+
enum CrateType {
234+
Bin,
235+
Rlib,
236+
}
237+
238+
enum RemapType {
239+
Path,
240+
Cwd { is_empty: bool },
222241
}

0 commit comments

Comments
 (0)