Skip to content

Commit

Permalink
Auto merge of #79685 - sivadeilra:fix_env_vars_win, r=davidtwco
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
bors committed Dec 5, 2020
2 parents 15eaa00 + 957061b commit e792288
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions src/test/ui/env-vars.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit e792288

Please sign in to comment.