Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 33f08fa

Browse files
committedMay 22, 2024
Rewrite and rename issue-38237 to rmake
1 parent d4e5426 commit 33f08fa

File tree

11 files changed

+24
-15
lines changed

11 files changed

+24
-15
lines changed
 

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

-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ run-make/issue-35164/Makefile
107107
run-make/issue-36710/Makefile
108108
run-make/issue-37839/Makefile
109109
run-make/issue-37893/Makefile
110-
run-make/issue-38237/Makefile
111110
run-make/issue-40535/Makefile
112111
run-make/issue-46239/Makefile
113112
run-make/issue-47384/Makefile

‎tests/run-make/alloc-no-oom-handling/rmake.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// This test checks that alloc can still compile correctly
1+
// This test checks that alloc can still compile successfully
22
// when the unstable no_global_oom_handling feature is turned on.
33
// See https://github.com/rust-lang/rust/pull/84266
44

‎tests/run-make/alloc-no-rc/rmake.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// This test checks that alloc can still compile correctly
1+
// This test checks that alloc can still compile successfully
22
// when the unstable no_rc feature is turned on.
33
// See https://github.com/rust-lang/rust/pull/84266
44

‎tests/run-make/alloc-no-sync/rmake.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// This test checks that alloc can still compile correctly
1+
// This test checks that alloc can still compile successfully
22
// when the unstable no_sync feature is turned on.
33
// See https://github.com/rust-lang/rust/pull/84266
44

‎tests/run-make/core-no-oom-handling/rmake.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// This test checks that the core library can still compile correctly
1+
// This test checks that the core library can still compile successfully
22
// when the no_global_oom_handling feature is turned on.
33
// See https://github.com/rust-lang/rust/pull/110649
44

@@ -10,7 +10,7 @@ fn main() {
1010
.arg("-Dwarnings")
1111
.crate_type("rlib")
1212
.input("../../../library/core/src/lib.rs")
13-
.sysroot(tmp_dir().join("fakeroot"));
13+
.sysroot(tmp_dir().join("fakeroot"))
1414
.cfg("no_global_oom_handling")
1515
.run();
1616
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
// A very specific set of circumstances (mainly, implementing Deref, and
2+
// having a procedural macro and a Debug derivation in external crates) caused
3+
// an internal compiler error (ICE) when trying to use rustdoc. This test
4+
// reproduces the exact circumstances which caused the bug and checks
5+
// that it does not happen again.
6+
// See https://github.com/rust-lang/rust/issues/38237
7+
8+
//@ ignore-cross-compile
9+
10+
use run_make_support::{rustc, rustdoc, tmp_dir};
11+
12+
fn main() {
13+
rustc().input("foo.rs").run();
14+
rustc().input("bar.rs").run();
15+
rustdoc().input("baz.rs").library_search_path(tmp_dir()).output(tmp_dir()).run();
16+
}

‎tests/run-make/issue-38237/Makefile

-6
This file was deleted.

‎tests/run-make/non-pie-thread-local/rmake.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// build to see if this bug makes a resurgence.
55
// See https://github.com/rust-lang/rust/pull/24448
66

7-
//@ ignore-cross compile
7+
//@ ignore-cross-compile
88
//@ only-linux
99

1010
use run_make_support::{cc, run, rustc, tmp_dir};
@@ -18,7 +18,7 @@ fn main() {
1818
.arg("--gc-sections")
1919
.arg("-lpthread")
2020
.arg("-ldl")
21-
.out_exe(tmp_dir().join("foo"))
21+
.out_exe("foo")
2222
.run();
2323
run("foo");
2424
cc().input("foo.c")
@@ -30,7 +30,7 @@ fn main() {
3030
.arg("-ldl")
3131
.arg("-pie")
3232
.arg("-fPIC")
33-
.out_exe(tmp_dir().join("foo"))
33+
.out_exe("foo")
3434
.run();
3535
run("foo");
3636
}

0 commit comments

Comments
 (0)
Failed to load comments.