Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move alloc tests to rmake #121918

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/tools/run-make-support/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,12 @@ impl RustcInvocationBuilder {
self
}

pub fn arg_path(&mut self, path: &[&str]) -> &mut RustcInvocationBuilder {
let path_buf = path.iter().collect::<PathBuf>();
self.cmd.arg(path_buf.to_str().unwrap());
self
}

#[track_caller]
pub fn run(&mut self) -> Output {
let caller_location = std::panic::Location::caller();
Expand Down
4 changes: 0 additions & 4 deletions tests/run-make/alloc-no-oom-handling/Makefile

This file was deleted.

19 changes: 19 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,19 @@
// ignore-tidy-linelength

extern crate run_make_support;

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

fn main() {
rustc()
.arg("--edition")
.arg("2021")
.arg("-Dwarnings")
.arg("--crate-type")
.arg("rlib")
.arg_path(&["..", "..", "..", "library", "alloc", "src", "lib.rs"])
.arg("--cfg")
.arg("no_global_oom_handling")
.run();
}
4 changes: 0 additions & 4 deletions tests/run-make/alloc-no-rc/Makefile

This file was deleted.

19 changes: 19 additions & 0 deletions tests/run-make/alloc-no-rc/rmake.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
// ignore-tidy-linelength

extern crate run_make_support;

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

fn main() {
rustc()
.arg("--edition")
.arg("2021")
.arg("-Dwarnings")
.arg("--crate-type")
.arg("rlib")
.arg_path(&["..", "..", "..", "library", "alloc", "src", "lib.rs"])
.arg("--cfg")
.arg("no_rc")
.run();
}
4 changes: 0 additions & 4 deletions tests/run-make/alloc-no-sync/Makefile

This file was deleted.

19 changes: 19 additions & 0 deletions tests/run-make/alloc-no-sync/rmake.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
// ignore-tidy-linelength

extern crate run_make_support;

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

fn main() {
rustc()
.arg("--edition")
.arg("2021")
.arg("-Dwarnings")
.arg("--crate-type")
.arg("rlib")
.arg_path(&["..", "..", "..", "library", "alloc", "src", "lib.rs"])
.arg("--cfg")
.arg("no_sync")
.run();
}
Loading