diff options
| author | Guillaume Gomez <guillaume1.gomez@gmail.com> | 2023-03-27 18:56:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-27 18:56:20 +0200 |
| commit | df453d9528efeb0e23520c6966d26d8de9005f4e (patch) | |
| tree | 6a1df7cb63fae0fcd3b1ab911f1c4e58e7c3c296 | |
| parent | b1e8be783f13dfb2f6e7ade995bde66778a5a43d (diff) | |
| parent | 2fe4cad77f03e9eb323382e531d136f0e32b3645 (diff) | |
| download | rust-df453d9528efeb0e23520c6966d26d8de9005f4e.tar.gz rust-df453d9528efeb0e23520c6966d26d8de9005f4e.zip | |
Rollup merge of #109445 - Teapot4195:issue-109407-fix, r=ozkanonur
Allow passing the --nocapture flag to compiletest closes #109407
| -rw-r--r-- | src/tools/compiletest/src/common.rs | 2 | ||||
| -rw-r--r-- | src/tools/compiletest/src/main.rs | 15 |
2 files changed, 13 insertions, 4 deletions
diff --git a/src/tools/compiletest/src/common.rs b/src/tools/compiletest/src/common.rs index 7691f5c32b2..28c045f8382 100644 --- a/src/tools/compiletest/src/common.rs +++ b/src/tools/compiletest/src/common.rs @@ -384,6 +384,8 @@ pub struct Config { pub only_modified: bool, pub target_cfg: LazyCell<TargetCfg>, + + pub nocapture: bool, } impl Config { diff --git a/src/tools/compiletest/src/main.rs b/src/tools/compiletest/src/main.rs index cbaa599f793..bce61c55c3d 100644 --- a/src/tools/compiletest/src/main.rs +++ b/src/tools/compiletest/src/main.rs @@ -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, |