Commit e664e7e

committed

Move RUST_TEST_NOCAPTURE warning to early config check

1 parent f03074d commit e664e7eCopy full SHA for e664e7e

File tree

-6

lines changed

-6

lines changed

Lines changed: 7 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -51,12 +51,6 @@ use crate::util::logv;`
`51`	`51`	`/// some code here that inspects environment variables or even runs executables`
`52`	`52`	`/// (e.g. when discovering debugger versions).`
`53`	`53`	`pub fn parse_config(args: Vec<String>) -> Config {`
`54`		`- if env::var("RUST_TEST_NOCAPTURE").is_ok() {`
`55`		`- eprintln!(`
`56`		- "WARNING: RUST_TEST_NOCAPTURE is not supported. Use the `--no-capture` flag instead."
`57`		`- );`
`58`		`- }`
`59`		`-`
`60`	`54`	`let mut opts = Options::new();`
`61`	`55`	`opts.reqopt("", "compile-lib-path", "path to host shared libraries", "PATH")`
`62`	`56`	`.reqopt("", "run-lib-path", "path to target shared libraries", "PATH")`
@@ -1125,4 +1119,11 @@ WARNING: profiler runtime is not available, so `.coverage` files won't be {actio
`1125`	`1119`	help: try setting `profiler = true` in the `[build]` section of `bootstrap.toml`"#
`1126`	`1120`	`);`
`1127`	`1121`	`}`
	`1122`	`+`
	`1123`	+ // `RUST_TEST_NOCAPTURE` is a libtest env var, but we don't callout to libtest.
	`1124`	`+ if env::var("RUST_TEST_NOCAPTURE").is_ok() {`
	`1125`	`+ eprintln!(`
	`1126`	+ "WARNING: RUST_TEST_NOCAPTURE is not supported. Use the `--no-capture` flag instead."
	`1127`	`+ );`
	`1128`	`+ }`
`1128`	`1129`	`}`

Comments

(0)