Skip to content

Commit 578c14a

Browse files
borsbors
committed
Auto merge of #126801 - Oneirical:seek-and-testroy, r=<try>
Migrate `remap-path-prefix`, `debug-assertions` and `emit-stack-sizes` `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 OSX/MSVC try jobs. try-job: aarch64-apple try-job: x86_64-msvc
2 parents c1b336c + 2931afd commit 578c14a

File tree

9 files changed

+133
-78
lines changed

9 files changed

+133
-78
lines changed

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

+11
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,17 @@ impl Rustc {
106106
self
107107
}
108108

109+
/// Remap source path prefixes in all output.
110+
pub fn remap_path_prefix<P: AsRef<Path>>(&mut self, from: P, to: P) -> &mut Self {
111+
let from = from.as_ref().to_string_lossy();
112+
let to = to.as_ref().to_string_lossy();
113+
114+
self.cmd.arg("--remap-path-prefix");
115+
self.cmd.arg(format!("{from}={to}"));
116+
117+
self
118+
}
119+
109120
/// Specify path to the input file.
110121
pub fn input<P: AsRef<Path>>(&mut self, path: P) -> &mut Self {
111122
self.cmd.arg(path.as_ref());

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

-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ run-make/cross-lang-lto-clang/Makefile
1919
run-make/cross-lang-lto-pgo-smoketest/Makefile
2020
run-make/cross-lang-lto-upstream-rlibs/Makefile
2121
run-make/cross-lang-lto/Makefile
22-
run-make/debug-assertions/Makefile
2322
run-make/dep-info-doesnt-run-much/Makefile
2423
run-make/dep-info-spaces/Makefile
2524
run-make/dep-info/Makefile
@@ -28,7 +27,6 @@ run-make/dump-mono-stats/Makefile
2827
run-make/dylib-chain/Makefile
2928
run-make/emit-path-unhashed/Makefile
3029
run-make/emit-shared-files/Makefile
31-
run-make/emit-stack-sizes/Makefile
3230
run-make/emit-to-stdout/Makefile
3331
run-make/env-dep-info/Makefile
3432
run-make/error-writing-dependencies/Makefile
@@ -157,7 +155,6 @@ run-make/redundant-libs/Makefile
157155
run-make/relocation-model/Makefile
158156
run-make/relro-levels/Makefile
159157
run-make/remap-path-prefix-dwarf/Makefile
160-
run-make/remap-path-prefix/Makefile
161158
run-make/reproducible-build-2/Makefile
162159
run-make/reproducible-build/Makefile
163160
run-make/return-non-c-like-enum-from-c/Makefile

‎tests/run-make/debug-assertions/Makefile

-27
This file was deleted.

‎tests/run-make/debug-assertions/debug.rs

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
1+
#![allow(internal_features)]
12
#![feature(rustc_attrs)]
23
#![deny(warnings)]
34

4-
use std::env;
55
use std::thread;
66

77
fn main() {
8-
let should_fail = env::args().nth(1) == Some("bad".to_string());
9-
10-
assert_eq!(thread::spawn(debug_assert_eq).join().is_err(), should_fail);
11-
assert_eq!(thread::spawn(debug_assert).join().is_err(), should_fail);
12-
assert_eq!(thread::spawn(overflow).join().is_err(), should_fail);
8+
assert!(thread::spawn(debug_assert_eq).join().is_ok());
9+
assert!(thread::spawn(debug_assert).join().is_ok());
10+
assert!(thread::spawn(overflow).join().is_ok());
1311
}
1412

1513
fn debug_assert_eq() {

‎tests/run-make/debug-assertions/rmake.rs

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
// debug.rs contains some "debug assertion" statements which
2+
// should only be enabled in either non-optimized builds or when
3+
// `-C debug-assertions` is set to yes. These debug assertions
4+
// are guaranteed to fail, so this test checks that the run command
5+
// fails where debug assertions should be activated, and succeeds where
6+
// debug assertions should be disabled.
7+
// See https://github.com/rust-lang/rust/pull/22980
8+
9+
//@ ignore-cross-compile
10+
//@ needs-unwind
11+
12+
use run_make_support::{run, run_fail, rustc};
13+
14+
fn main() {
15+
rustc().input("debug.rs").arg("-Cdebug-assertions=no").run();
16+
run("debug");
17+
rustc().input("debug.rs").opt_level("0").run();
18+
run_fail("debug");
19+
rustc().input("debug.rs").opt_level("1").run();
20+
run("debug");
21+
rustc().input("debug.rs").opt_level("2").run();
22+
run("debug");
23+
rustc().input("debug.rs").opt_level("3").run();
24+
run("debug");
25+
rustc().input("debug.rs").opt_level("s").run();
26+
run("debug");
27+
rustc().input("debug.rs").opt_level("z").run();
28+
run("debug");
29+
rustc().input("debug.rs").opt().run();
30+
run("debug");
31+
rustc().input("debug.rs").run();
32+
run_fail("debug");
33+
rustc().input("debug.rs").opt().arg("-Cdebug-assertions=yes").run();
34+
run_fail("debug");
35+
rustc().input("debug.rs").opt_level("1").arg("-Cdebug-assertions=yes").run();
36+
run_fail("debug");
37+
}

‎tests/run-make/emit-stack-sizes/Makefile

-12
This file was deleted.

‎tests/run-make/emit-stack-sizes/rmake.rs

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
// Running rustc with the -Z emit-stack-sizes
2+
// flag enables diagnostics to seek stack overflows
3+
// at compile time. This test compiles a rust file
4+
// with this flag, then checks that the output object
5+
// file contains the section "stack_sizes", where
6+
// this diagnostics information should be located.
7+
// See https://github.com/rust-lang/rust/pull/51946
8+
// FIXME(Oneirical): temporarily disabled ignore flags for test
9+
// here is ignore-windows
10+
// and ignore-apple
11+
// Supposedly, this feature only works when the output object format is ELF so we ignore
12+
// Apple and Windows
13+
14+
use run_make_support::{llvm_readobj, rustc};
15+
16+
fn main() {
17+
rustc().opt_level("3").arg("-Zemit-stack-sizes").emit("obj").input("foo.rs").run();
18+
llvm_readobj()
19+
.arg("--section-headers")
20+
.input("foo.o")
21+
.run()
22+
.assert_stdout_contains(".stack_sizes");
23+
}

‎tests/run-make/remap-path-prefix/Makefile

-30
This file was deleted.

‎tests/run-make/remap-path-prefix/rmake.rs

+58
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
// Generating metadata alongside remap-path-prefix would fail to actually remap the path
2+
// in the metadata. After this was fixed in #85344, this test checks that "auxiliary" is being
3+
// successfully remapped to "/the/aux" in the rmeta files.
4+
// See https://github.com/rust-lang/rust/pull/85344
5+
6+
// FIXME(Oneirical): check if works without ignore-windows
7+
8+
use run_make_support::{invalid_utf8_contains, invalid_utf8_not_contains, is_darwin, rustc};
9+
10+
fn main() {
11+
let mut out_simple = rustc();
12+
let mut out_object = rustc();
13+
let mut out_macro = rustc();
14+
let mut out_diagobj = rustc();
15+
out_simple
16+
.remap_path_prefix("auxiliary", "/the/aux")
17+
.crate_type("lib")
18+
.emit("metadata")
19+
.input("auxiliary/lib.rs");
20+
out_object
21+
.remap_path_prefix("auxiliary", "/the/aux")
22+
.crate_type("lib")
23+
.emit("metadata")
24+
.input("auxiliary/lib.rs");
25+
out_macro
26+
.remap_path_prefix("auxiliary", "/the/aux")
27+
.crate_type("lib")
28+
.emit("metadata")
29+
.input("auxiliary/lib.rs");
30+
out_diagobj
31+
.remap_path_prefix("auxiliary", "/the/aux")
32+
.crate_type("lib")
33+
.emit("metadata")
34+
.input("auxiliary/lib.rs");
35+
36+
out_simple.run();
37+
invalid_utf8_contains("liblib.rmeta", "/the/aux/lib.rs");
38+
invalid_utf8_not_contains("liblib.rmeta", "auxiliary");
39+
40+
out_object.arg("-Zremap-path-scope=object");
41+
out_macro.arg("-Zremap-path-scope=macro");
42+
out_diagobj.arg("-Zremap-path-scope=diagnostics,object");
43+
if is_darwin() {
44+
out_object.arg("-Csplit-debuginfo=off");
45+
out_macro.arg("-Csplit-debuginfo=off");
46+
out_diagobj.arg("-Csplit-debuginfo=off");
47+
}
48+
49+
out_object.run();
50+
invalid_utf8_contains("liblib.rmeta", "/the/aux/lib.rs");
51+
invalid_utf8_not_contains("liblib.rmeta", "auxiliary");
52+
out_macro.run();
53+
invalid_utf8_contains("liblib.rmeta", "/the/aux/lib.rs");
54+
invalid_utf8_not_contains("liblib.rmeta", "auxiliary");
55+
out_diagobj.run();
56+
invalid_utf8_contains("liblib.rmeta", "/the/aux/lib.rs");
57+
invalid_utf8_not_contains("liblib.rmeta", "auxiliary");
58+
}

0 commit comments

Comments
 (0)