Skip to content

Commit

Permalink
Rewrite and rename issue-38237 to rmake
Browse files Browse the repository at this point in the history
  • Loading branch information
Oneirical committed May 22, 2024
1 parent d4e5426 commit 33f08fa
Show file tree
Hide file tree
Showing 11 changed files with 24 additions and 15 deletions.
1 change: 0 additions & 1 deletion src/tools/tidy/src/allowed_run_make_makefiles.txt
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@ run-make/issue-35164/Makefile
run-make/issue-36710/Makefile
run-make/issue-37839/Makefile
run-make/issue-37893/Makefile
run-make/issue-38237/Makefile
run-make/issue-40535/Makefile
run-make/issue-46239/Makefile
run-make/issue-47384/Makefile
Expand Down
2 changes: 1 addition & 1 deletion tests/run-make/alloc-no-oom-handling/rmake.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// This test checks that alloc can still compile correctly
// This test checks that alloc can still compile successfully
// when the unstable no_global_oom_handling feature is turned on.
// See https://github.com/rust-lang/rust/pull/84266

Expand Down
2 changes: 1 addition & 1 deletion tests/run-make/alloc-no-rc/rmake.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// This test checks that alloc can still compile correctly
// This test checks that alloc can still compile successfully
// when the unstable no_rc feature is turned on.
// See https://github.com/rust-lang/rust/pull/84266

Expand Down
2 changes: 1 addition & 1 deletion tests/run-make/alloc-no-sync/rmake.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// This test checks that alloc can still compile correctly
// This test checks that alloc can still compile successfully
// when the unstable no_sync feature is turned on.
// See https://github.com/rust-lang/rust/pull/84266

Expand Down
4 changes: 2 additions & 2 deletions tests/run-make/core-no-oom-handling/rmake.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// This test checks that the core library can still compile correctly
// This test checks that the core library can still compile successfully
// when the no_global_oom_handling feature is turned on.
// See https://github.com/rust-lang/rust/pull/110649

Expand All @@ -10,7 +10,7 @@ fn main() {
.arg("-Dwarnings")
.crate_type("rlib")
.input("../../../library/core/src/lib.rs")
.sysroot(tmp_dir().join("fakeroot"));
.sysroot(tmp_dir().join("fakeroot"))
.cfg("no_global_oom_handling")
.run();
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
16 changes: 16 additions & 0 deletions tests/run-make/deref-impl-rustdoc-ice/rmake.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
// A very specific set of circumstances (mainly, implementing Deref, and
// having a procedural macro and a Debug derivation in external crates) caused
// an internal compiler error (ICE) when trying to use rustdoc. This test
// reproduces the exact circumstances which caused the bug and checks
// that it does not happen again.
// See https://github.com/rust-lang/rust/issues/38237

//@ ignore-cross-compile

use run_make_support::{rustc, rustdoc, tmp_dir};

fn main() {
rustc().input("foo.rs").run();
rustc().input("bar.rs").run();
rustdoc().input("baz.rs").library_search_path(tmp_dir()).output(tmp_dir()).run();
}
6 changes: 0 additions & 6 deletions tests/run-make/issue-38237/Makefile

This file was deleted.

6 changes: 3 additions & 3 deletions tests/run-make/non-pie-thread-local/rmake.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// build to see if this bug makes a resurgence.
// See https://github.com/rust-lang/rust/pull/24448

//@ ignore-cross compile
//@ ignore-cross-compile
//@ only-linux

use run_make_support::{cc, run, rustc, tmp_dir};
Expand All @@ -18,7 +18,7 @@ fn main() {
.arg("--gc-sections")
.arg("-lpthread")
.arg("-ldl")
.out_exe(tmp_dir().join("foo"))
.out_exe("foo")
.run();
run("foo");
cc().input("foo.c")
Expand All @@ -30,7 +30,7 @@ fn main() {
.arg("-ldl")
.arg("-pie")
.arg("-fPIC")
.out_exe(tmp_dir().join("foo"))
.out_exe("foo")
.run();
run("foo");
}

0 comments on commit 33f08fa

Please sign in to comment.