about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-11-22 18:34:13 +0000
committerbors <bors@rust-lang.org>2015-11-22 18:34:13 +0000
commitd125ddd52f8202d1f9e35d5a771d60c948ed090c (patch)
tree95ec10bf7b9b5c0cca406ad2fb4e1d27ddfb9680 /src/libstd
parente24fffef8a560ddf968a866db8da96bc461f4038 (diff)
parentdd162d77d4aaa90a841157312b8215fb24727337 (diff)
downloadrust-d125ddd52f8202d1f9e35d5a771d60c948ed090c.tar.gz
rust-d125ddd52f8202d1f9e35d5a771d60c948ed090c.zip
Auto merge of #29983 - tbu-:pr_env_windows_hidden_variables, r=alexcrichton
Fixes #29972.
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/process.rs6
1 files changed, 4 insertions, 2 deletions
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 @@ mod tests {
         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);