From 957061bb977751767e2b543b29d65581283a94fe Mon Sep 17 00:00:00 2001 From: Arlie Davis Date: Thu, 3 Dec 2020 18:07:29 -0800 Subject: [PATCH] Fix src/test/ui/env-vars.rs on 128-core machines on Windows On Windows, the environment variable NUMBER_OF_PROCESSORS has special meaning. Unfortunately, you can get different answers, depending on whether you are enumerating all environment variables or querying a specific variable. This was causing the src/test/ui/env-vars.rs test to fail on machines with more than 64 processors when run on Windows. --- src/test/ui/env-vars.rs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/test/ui/env-vars.rs b/src/test/ui/env-vars.rs index f73902c4006..f5035bb2c69 100644 --- a/src/test/ui/env-vars.rs +++ b/src/test/ui/env-vars.rs @@ -5,6 +5,14 @@ use std::env::*; fn main() { for (k, v) in vars_os() { + // On Windows, the environment variable NUMBER_OF_PROCESSORS has special meaning. + // Unfortunately, you can get different answers, depending on whether you are + // enumerating all environment variables or querying a specific variable. + // This was causing this test to fail on machines with more than 64 processors. + if cfg!(target_os = "windows") && k == "NUMBER_OF_PROCESSORS" { + continue; + } + let v2 = var_os(&k); assert!(v2.as_ref().map(|s| &**s) == Some(&*v), "bad vars->var transition: {:?} {:?} {:?}", k, v, v2);