Add --no-capture as a bootstrap argument

This commit is contained in:
clubby789 2024-12-26 23:41:46 +00:00
parent 19e75f4fb3
commit 4fd3baaf70
11 changed files with 24 additions and 2 deletions

View file

@ -1829,6 +1829,10 @@ NOTE: if you're sure you want to do this, please open an issue as to why. In the
cmd.arg("--force-rerun");
}
if builder.config.cmd.no_capture() {
cmd.arg("--nocapture");
}
let compare_mode =
builder.config.cmd.compare_mode().or_else(|| {
if builder.config.test_compare_mode { self.compare_mode } else { None }

View file

@ -637,6 +637,7 @@ mod dist {
run: None,
only_modified: false,
extra_checks: None,
no_capture: false,
};
let build = Build::new(config);
@ -702,6 +703,7 @@ mod dist {
run: None,
only_modified: false,
extra_checks: None,
no_capture: false,
};
// Make sure rustfmt binary not being found isn't an error.
config.channel = "beta".to_string();

View file

@ -388,6 +388,9 @@ pub enum Subcommand {
/// enable this to generate a Rustfix coverage file, which is saved in
/// `/<build_base>/rustfix_missing_coverage.txt`
rustfix_coverage: bool,
#[arg(long)]
/// don't capture stdout/stderr of tests
no_capture: bool,
},
/// Build and run some test suites *in Miri*
Miri {
@ -563,6 +566,13 @@ impl Subcommand {
}
}
pub fn no_capture(&self) -> bool {
match *self {
Subcommand::Test { no_capture, .. } => no_capture,
_ => false,
}
}
pub fn rustfix_coverage(&self) -> bool {
match *self {
Subcommand::Test { rustfix_coverage, .. } => rustfix_coverage,