Skip to content

Commit 67cfc3a

Browse files
borsbors
committed
Auto merge of #126490 - Oneirical:testicide, r=jieyouxu
Migrate `extern-flag-fun`, `incremental-debugger-visualiser` and `incremental-session-fail` `run-make` tests to `rmake.rs` Part of #121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html). try-job: arm-android try-job: armhf-gnu try-job: test-various try-job: x86_64-msvc try-job: dist-i686-mingw
2 parents c2932aa + cdfcc94 commit 67cfc3a

File tree

8 files changed

+137
-86
lines changed

8 files changed

+137
-86
lines changed

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

+28
Original file line numberDiff line numberDiff line change
@@ -303,6 +303,34 @@ pub fn set_host_rpath(cmd: &mut Command) {
303303
});
304304
}
305305

306+
/// Read the contents of a file that cannot simply be read by
307+
/// read_to_string, due to invalid utf8 data, then assert that it contains `expected`.
308+
#[track_caller]
309+
pub fn invalid_utf8_contains<P: AsRef<Path>>(path: P, expected: &str) {
310+
let buffer = fs_wrapper::read(path.as_ref());
311+
if !String::from_utf8_lossy(&buffer).contains(expected) {
312+
eprintln!("=== FILE CONTENTS (LOSSY) ===");
313+
eprintln!("{}", String::from_utf8_lossy(&buffer));
314+
eprintln!("=== SPECIFIED TEXT ===");
315+
eprintln!("{}", expected);
316+
panic!("specified text was not found in file");
317+
}
318+
}
319+
320+
/// Read the contents of a file that cannot simply be read by
321+
/// read_to_string, due to invalid utf8 data, then assert that it does not contain `expected`.
322+
#[track_caller]
323+
pub fn invalid_utf8_not_contains<P: AsRef<Path>>(path: P, expected: &str) {
324+
let buffer = fs_wrapper::read(path.as_ref());
325+
if String::from_utf8_lossy(&buffer).contains(expected) {
326+
eprintln!("=== FILE CONTENTS (LOSSY) ===");
327+
eprintln!("{}", String::from_utf8_lossy(&buffer));
328+
eprintln!("=== SPECIFIED TEXT ===");
329+
eprintln!("{}", expected);
330+
panic!("specified text was unexpectedly found in file");
331+
}
332+
}
333+
306334
/// Copy a directory into another.
307335
pub fn copy_dir_all(src: impl AsRef<Path>, dst: impl AsRef<Path>) {
308336
fn copy_dir_all_inner(src: impl AsRef<Path>, dst: impl AsRef<Path>) -> io::Result<()> {

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

-3
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ run-make/error-writing-dependencies/Makefile
4040
run-make/export-executable-symbols/Makefile
4141
run-make/extern-diff-internal-name/Makefile
4242
run-make/extern-flag-disambiguates/Makefile
43-
run-make/extern-flag-fun/Makefile
4443
run-make/extern-flag-pathless/Makefile
4544
run-make/extern-flag-rename-transitive/Makefile
4645
run-make/extern-fn-explicit-align/Makefile
@@ -64,8 +63,6 @@ run-make/glibc-staticlib-args/Makefile
6463
run-make/include_bytes_deps/Makefile
6564
run-make/incr-add-rust-src-component/Makefile
6665
run-make/incr-foreign-head-span/Makefile
67-
run-make/incremental-debugger-visualizer/Makefile
68-
run-make/incremental-session-fail/Makefile
6966
run-make/inline-always-many-cgu/Makefile
7067
run-make/interdependent-c-libraries/Makefile
7168
run-make/intrinsic-unreachable/Makefile

‎tests/run-make/extern-flag-fun/Makefile

-20
This file was deleted.

‎tests/run-make/extern-flag-fun/rmake.rs

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
// The --extern flag can override the default crate search of
2+
// the compiler and directly fetch a given path. There are a few rules
3+
// to follow: for example, there can't be more than one rlib, the crates must
4+
// be valid ("no-exist" in this test), and private crates can't be loaded
5+
// as non-private. This test checks that these rules are enforced.
6+
// See https://github.com/rust-lang/rust/pull/15319
7+
8+
use run_make_support::{rust_lib_name, rustc};
9+
10+
fn main() {
11+
rustc().input("bar.rs").crate_type("rlib").run();
12+
// Exactly the same rlib as the first line, only the filename changes.
13+
rustc().input("bar.rs").crate_type("rlib").extra_filename("-a").run();
14+
rustc().input("bar-alt.rs").crate_type("rlib").run();
15+
// The crate must be valid.
16+
rustc().input("foo.rs").extern_("bar", "no-exist").run_fail();
17+
rustc().input("foo.rs").extern_("bar", "foo.rs").run_fail();
18+
// Compilation fails with two different rlibs.
19+
rustc()
20+
.input("foo.rs")
21+
.extern_("bar", rust_lib_name("bar"))
22+
.extern_("bar", rust_lib_name("bar-alt"))
23+
.run_fail();
24+
// Even though this one has seemingly two rlibs, they are one and the same.
25+
rustc()
26+
.input("foo.rs")
27+
.extern_("bar", rust_lib_name("bar"))
28+
.extern_("bar", rust_lib_name("bar-a"))
29+
.run();
30+
rustc().input("foo.rs").extern_("bar", rust_lib_name("bar")).run();
31+
// Try to be sneaky and load a private crate from with a non-private name.
32+
rustc().input("rustc.rs").arg("-Zforce-unstable-if-unmarked").crate_type("rlib").run();
33+
rustc()
34+
.input("gated_unstable.rs")
35+
.extern_("alloc", rust_lib_name("rustc"))
36+
.run_fail()
37+
.assert_stderr_contains("rustc_private");
38+
}

‎tests/run-make/incremental-debugger-visualizer/Makefile

-49
This file was deleted.

‎tests/run-make/incremental-debugger-visualizer/rmake.rs

+56
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
// This test ensures that changes to files referenced via #[debugger_visualizer]
2+
// (in this case, foo.py and foo.natvis) are picked up when compiling incrementally.
3+
// See https://github.com/rust-lang/rust/pull/111641
4+
5+
use run_make_support::{fs_wrapper, invalid_utf8_contains, invalid_utf8_not_contains, rustc};
6+
use std::io::Read;
7+
8+
fn main() {
9+
fs_wrapper::create_file("foo.py");
10+
fs_wrapper::write("foo.py", "GDB script v1");
11+
fs_wrapper::create_file("foo.natvis");
12+
fs_wrapper::write("foo.natvis", "Natvis v1");
13+
rustc()
14+
.input("foo.rs")
15+
.crate_type("rlib")
16+
.emit("metadata")
17+
.incremental("incremental")
18+
.arg("-Zincremental-verify-ich")
19+
.run();
20+
21+
invalid_utf8_contains("libfoo.rmeta", "GDB script v1");
22+
invalid_utf8_contains("libfoo.rmeta", "Natvis v1");
23+
24+
// Change only the GDB script and check that the change has been picked up
25+
fs_wrapper::remove_file("foo.py");
26+
fs_wrapper::create_file("foo.py");
27+
fs_wrapper::write("foo.py", "GDB script v2");
28+
rustc()
29+
.input("foo.rs")
30+
.crate_type("rlib")
31+
.emit("metadata")
32+
.incremental("incremental")
33+
.arg("-Zincremental-verify-ich")
34+
.run();
35+
36+
invalid_utf8_contains("libfoo.rmeta", "GDB script v2");
37+
invalid_utf8_not_contains("libfoo.rmeta", "GDB script v1");
38+
invalid_utf8_contains("libfoo.rmeta", "Natvis v1");
39+
40+
// Now change the Natvis version and check that the change has been picked up
41+
fs_wrapper::remove_file("foo.natvis");
42+
fs_wrapper::create_file("foo.natvis");
43+
fs_wrapper::write("foo.natvis", "Natvis v2");
44+
rustc()
45+
.input("foo.rs")
46+
.crate_type("rlib")
47+
.emit("metadata")
48+
.incremental("incremental")
49+
.arg("-Zincremental-verify-ich")
50+
.run();
51+
52+
invalid_utf8_contains("libfoo.rmeta", "GDB script v2");
53+
invalid_utf8_not_contains("libfoo.rmeta", "GDB script v1");
54+
invalid_utf8_not_contains("libfoo.rmeta", "Natvis v1");
55+
invalid_utf8_contains("libfoo.rmeta", "Natvis v2");
56+
}

‎tests/run-make/incremental-session-fail/Makefile

-14
This file was deleted.

‎tests/run-make/incremental-session-fail/rmake.rs

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
// Failing to create the directory where output incremental
2+
// files would be stored used to cause an ICE (Internal Compiler
3+
// Error). This was patched in #85698, and this test checks that
4+
// the ensuing compilation failure is not an ICE.
5+
// See https://github.com/rust-lang/rust/pull/85698
6+
7+
use run_make_support::{fs_wrapper, rustc};
8+
9+
fn main() {
10+
fs_wrapper::create_file("session");
11+
// rustc should fail to create the session directory here.
12+
let out = rustc().input("foo.rs").crate_type("rlib").incremental("session").run_fail();
13+
out.assert_stderr_contains("could not create incremental compilation crate directory");
14+
out.assert_stderr_not_contains("internal compiler error");
15+
}

0 commit comments

Comments
 (0)