From: Tobias Bucher <tobiasbucher5991@gmail.com>
Date: Sun, 22 Nov 2015 11:12:18 +0000 (+0000)
Subject: test_inherit_env: Don't look for hidden environment variables on Windows
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=dd162d77d4aaa90a841157312b8215fb24727337;p=rust.git

test_inherit_env: Don't look for hidden environment variables on Windows

Fixes #29972.
---

diff --git a/src/libstd/process.rs b/src/libstd/process.rs
index d26641dbfcf..083205e824d 100644
--- a/src/libstd/process.rs
+++ b/src/libstd/process.rs
@@ -803,8 +803,10 @@ fn test_inherit_env() {
         let output = String::from_utf8(result.stdout).unwrap();
 
         for (ref k, ref v) in env::vars() {
-            // don't check windows magical empty-named variables
-            assert!(k.is_empty() ||
+            // Windows has hidden environment variables whose names start with
+            // equals signs (`=`). Those do not show up in the output of the
+            // `set` command.
+            assert!((cfg!(windows) && k.starts_with("=")) ||
                     output.contains(&format!("{}={}", *k, *v)),
                     "output doesn't contain `{}={}`\n{}",
                     k, v, output);