Skip to content

Commit ed43ac6

Browse files
Rollup merge of #123672 - davidtwco:compiletest-unset-log-color, r=clubby789
compiletest: unset `RUSTC_LOG_COLOR` If this leaks in from the environment then it can make tests fail when they deliberately trigger `WARN` or `ERROR` logging, currently this stops these tests from failing if you set `RUSTC_LOG_COLOR=always` in the parent environment: - `tests/ui/coherence/occurs-check/associated-type.rs#next` - `tests/ui/coherence/occurs-check/associated-type.rs#old` - `tests/ui/higher-ranked/structually-relate-aliases.rs` - `tests/ui/self/arbitrary-self-from-method-substs.rs#default` - `tests/ui/traits/next-solver/issue-118950-root-region.rs`
2 parents 4f563a1 + 8d251c2 commit ed43ac6

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/tools/compiletest/src/header.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ impl TestProps {
266266
aux_crates: vec![],
267267
revisions: vec![],
268268
rustc_env: vec![("RUSTC_ICE".to_string(), "0".to_string())],
269-
unset_rustc_env: vec![],
269+
unset_rustc_env: vec![("RUSTC_LOG_COLOR".to_string())],
270270
exec_env: vec![],
271271
unset_exec_env: vec![],
272272
build_aux_docs: false,

0 commit comments

Comments
 (0)