about summary refs log tree commit diff
diff options
context:
space:
mode:
authorGuillaume Gomez <guillaume1.gomez@gmail.com>2024-04-09 13:39:24 +0200
committerGitHub <noreply@github.com>2024-04-09 13:39:24 +0200
commited43ac6b4546fa20709fe63b7a08e0ce49190209 (patch)
tree9ddf60d17c4d181eafe25a6fe9c040d77c9256bc
parent4f563a16f223af4ae495cad1a5a498777b4e3ead (diff)
parent8d251c215e5cbcc6b889c07278fe143ebd4d39de (diff)
downloadrust-ed43ac6b4546fa20709fe63b7a08e0ce49190209.tar.gz
rust-ed43ac6b4546fa20709fe63b7a08e0ce49190209.zip
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`
-rw-r--r--src/tools/compiletest/src/header.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/compiletest/src/header.rs b/src/tools/compiletest/src/header.rs
index e414bc384f1..626841cb1bd 100644
--- a/src/tools/compiletest/src/header.rs
+++ b/src/tools/compiletest/src/header.rs
@@ -266,7 +266,7 @@ impl TestProps {
             aux_crates: vec![],
             revisions: vec![],
             rustc_env: vec![("RUSTC_ICE".to_string(), "0".to_string())],
-            unset_rustc_env: vec![],
+            unset_rustc_env: vec![("RUSTC_LOG_COLOR".to_string())],
             exec_env: vec![],
             unset_exec_env: vec![],
             build_aux_docs: false,