Skip to content

Commit 636d971

Browse files
committed
rewrite incremental-session-fail to rmake
1 parent ab71510 commit 636d971

File tree

4 files changed

+18
-21
lines changed

4 files changed

+18
-21
lines changed

src/tools/tidy/src/allowed_run_make_makefiles.txt

-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ run-make/inaccessible-temp-dir/Makefile
6767
run-make/include_bytes_deps/Makefile
6868
run-make/incr-add-rust-src-component/Makefile
6969
run-make/incr-foreign-head-span/Makefile
70-
run-make/incremental-session-fail/Makefile
7170
run-make/inline-always-many-cgu/Makefile
7271
run-make/interdependent-c-libraries/Makefile
7372
run-make/intrinsic-unreachable/Makefile

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

+3-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
1-
// This test makes sure that changes to files referenced via //[debugger_visualizer]
2-
// are picked up when compiling incrementally.
3-
4-
// We have to copy the source to $(TMPDIR) because Github CI mounts the source
5-
// directory as readonly. We need to apply modifications to some of the source
6-
// file.
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
74

85
use run_make_support::{
96
fs_wrapper, invalid_utf8_contains_str, invalid_utf8_not_contains_str, rustc,

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

-14
This file was deleted.
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)