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

Rollup merge of #109445 - Teapot4195:issue-109407-fix, r=ozkanonur

Browse Source 
Allow passing the --nocapture flag to compiletest

closes #109407
This commit is contained in:
Guillaume Gomez 2023-03-27 18:56:20 +02:00 committed by GitHub
commit df453d9528
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -384,6 +384,8 @@ pub struct Config {
pub only_modified: bool,
pub target_cfg: LazyCell<TargetCfg>,
pub nocapture: bool,
}
impl Config {

15
src/tools/compiletest/src/main.rs
View File

@ -152,6 +152,7 @@ pub fn parse_config(args: Vec<String>) -> Config {
)
.optflag("", "force-rerun", "rerun tests even if the inputs are unchanged")
.optflag("", "only-modified", "only run tests that result been modified")
.optflag("", "nocapture", "")
.optflag("h", "help", "show this message")
.reqopt("", "channel", "current Rust channel", "CHANNEL")
.optopt("", "edition", "default Rust edition", "EDITION");
@ -310,6 +311,8 @@ pub fn parse_config(args: Vec<String>) -> Config {
force_rerun: matches.opt_present("force-rerun"),
target_cfg: LazyCell::new(),
nocapture: matches.opt_present("nocapture"),
}
}
@ -502,6 +505,13 @@ fn configure_lldb(config: &Config) -> Option<Config> {
}
pub fn test_opts(config: &Config) -> test::TestOpts {
if env::var("RUST_TEST_NOCAPTURE").is_ok() {
eprintln!(
"WARNING: RUST_TEST_NOCAPTURE is no longer used. \
Use the `--nocapture` flag instead."
);
}
test::TestOpts {
exclude_should_panic: false,
filters: config.filters.clone(),
@ -511,10 +521,7 @@ pub fn test_opts(config: &Config) -> test::TestOpts {
logfile: config.logfile.clone(),
run_tests: true,
bench_benchmarks: true,
nocapture: match env::var("RUST_TEST_NOCAPTURE") {
Ok(val) => &val != "0",
Err(_) => false,
},
nocapture: config.nocapture,
color: config.color,
shuffle: false,
shuffle_seed: None,