Skip to content

Commit

Permalink
Auto merge of #125024 - Oneirical:master, r=jieyouxu
Browse files Browse the repository at this point in the history
Rewrite 3 very similar `run-make` alloc tests to rmake

Part of #121876

#121918 attempted to port these 3 tests 2 months ago. However, since then, the structure of `run-make-support` has changed a bit and new helper functions were added. Since there has been no activity on the PR, they are good low-hanging fruit to knock down, using the new functions of the current library.

There is also the removal of a useless import on a very similar test.
  • Loading branch information
bors committed May 13, 2024
2 parents 6be7b0c + 198b073 commit abb9563
Show file tree
Hide file tree
Showing 8 changed files with 45 additions and 25 deletions.
3 changes: 0 additions & 3 deletions src/tools/tidy/src/allowed_run_make_makefiles.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
run-make/alloc-no-oom-handling/Makefile
run-make/alloc-no-rc/Makefile
run-make/alloc-no-sync/Makefile
run-make/allocator-shim-circular-deps/Makefile
run-make/allow-non-lint-warnings-cmdline/Makefile
run-make/allow-warnings-cmdline-stability/Makefile
Expand Down
7 changes: 0 additions & 7 deletions tests/run-make/alloc-no-oom-handling/Makefile

This file was deleted.

15 changes: 15 additions & 0 deletions tests/run-make/alloc-no-oom-handling/rmake.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
// This test checks that alloc can still compile correctly
// when the unstable no_global_oom_handling feature is turned on.
// See https://github.com/rust-lang/rust/pull/84266

use run_make_support::rustc;

fn main() {
rustc()
.edition("2021")
.arg("-Dwarnings")
.crate_type("rlib")
.input("../../../library/alloc/src/lib.rs")
.cfg("no_global_oom_handling")
.run();
}
7 changes: 0 additions & 7 deletions tests/run-make/alloc-no-rc/Makefile

This file was deleted.

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

use run_make_support::rustc;

fn main() {
rustc()
.edition("2021")
.arg("-Dwarnings")
.crate_type("rlib")
.input("../../../library/alloc/src/lib.rs")
.cfg("no_rc")
.run();
}
7 changes: 0 additions & 7 deletions tests/run-make/alloc-no-sync/Makefile

This file was deleted.

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

use run_make_support::rustc;

fn main() {
rustc()
.edition("2021")
.arg("-Dwarnings")
.crate_type("rlib")
.input("../../../library/alloc/src/lib.rs")
.cfg("no_sync")
.run();
}
1 change: 0 additions & 1 deletion tests/run-make/core-no-fp-fmt-parse/rmake.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// support for formatting and parsing floating-point numbers.

use run_make_support::rustc;
use std::path::PathBuf;

fn main() {
rustc()
Expand Down

0 comments on commit abb9563

Please sign in to comment.