mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #118132 - onur-ozkan:stdlib-assertion-status-to-compiletest, r=wesleywiser

Browse Source 
utilize stdlib debug assertion status in compiletest

Implemented a new flag `--with-debug-assertions` on compiletest to pass the stdlib debug assertion status from bootstrap.

Resolves #115171
This commit is contained in:
bors 2023-11-29 17:41:27 +00:00
commit b10cfcd65f
4 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bootstrap/src/core/build_steps/test.rs
View File

@ -1827,6 +1827,10 @@ fn run(self, builder: &Builder<'_>) {
cmd.arg("--json");
if builder.config.rust_debug_assertions_std {
cmd.arg("--with-debug-assertions");
};
let mut llvm_components_passed = false;
let mut copts_passed = false;
if builder.config.llvm_enabled() {

3
src/tools/compiletest/src/common.rs
View File

@ -242,6 +242,9 @@ pub struct Config {
/// Run ignored tests
pub run_ignored: bool,
/// Whether to run tests with `ignore-debug` header
pub with_debug_assertions: bool,
/// Only run tests that match these filters
pub filters: Vec<String>,

4
src/tools/compiletest/src/header/cfg.rs
View File

@ -190,8 +190,8 @@ macro_rules! condition {
}
condition! {
name: "debug",
condition: cfg!(debug_assertions),
message: "when building with debug assertions",
condition: config.with_debug_assertions,
message: "when running tests with `ignore-debug` header",
}
condition! {
name: config.debugger.as_ref().map(|d| d.to_str()),

3
src/tools/compiletest/src/lib.rs
View File

@ -81,6 +81,7 @@ pub fn parse_config(args: Vec<String>) -> Config {
)
.optopt("", "run", "whether to execute run-* tests", "auto | always | never")
.optflag("", "ignored", "run tests marked as ignored")
.optflag("", "with-debug-assertions", "whether to run tests with `ignore-debug` header")
.optmulti("", "skip", "skip tests matching SUBSTRING. Can be passed multiple times", "SUBSTRING")
.optflag("", "exact", "filters match exactly")
.optopt(
@ -203,6 +204,7 @@ fn make_absolute(path: PathBuf) -> PathBuf {
let src_base = opt_path(matches, "src-base");
let run_ignored = matches.opt_present("ignored");
let with_debug_assertions = matches.opt_present("with-debug-assertions");
let mode = matches.opt_str("mode").unwrap().parse().expect("invalid mode");
let has_tidy = if mode == Mode::Rustdoc {
Command::new("tidy")
@ -238,6 +240,7 @@ fn make_absolute(path: PathBuf) -> PathBuf {
suite: matches.opt_str("suite").unwrap(),
debugger: None,
run_ignored,
with_debug_assertions,
filters: matches.free.clone(),
skip: matches.opt_strs("skip"),
filter_exact: matches.opt_present("exact"),