diff options
| author | bors <bors@rust-lang.org> | 2015-11-24 04:26:47 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-11-24 04:26:47 +0000 |
| commit | 92f96b2445db675e343b8e795faecacdee0d29cc (patch) | |
| tree | 03c85a476ed87696860433989563e4c42d54ab05 /src/libstd/process.rs | |
| parent | 77c995b96afbb0572763660b356ed9ee0363422a (diff) | |
| parent | c2f0442a2ac7a0817a58d34ac885eca6e049ca82 (diff) | |
| download | rust-92f96b2445db675e343b8e795faecacdee0d29cc.tar.gz rust-92f96b2445db675e343b8e795faecacdee0d29cc.zip | |
Auto merge of #30006 - ntrepid8:skip-check-for-DYLD-libs-in-child-proc, r=alexcrichton
It seems that OS X El Capitan does not pass DYLD_* environment variables to child processes anymore. See this link: https://forums.developer.apple.com/thread/9233 The causes a test in `src/libstd/process.rs' to fail when those environment variables are not found in the child process. This PR skips those variables similar to how the Windows envars that start with `=` are skipped.
Diffstat (limited to 'src/libstd/process.rs')
| -rw-r--r-- | src/libstd/process.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libstd/process.rs b/src/libstd/process.rs index 083205e824d..40803a4bbd6 100644 --- a/src/libstd/process.rs +++ b/src/libstd/process.rs @@ -807,6 +807,7 @@ mod tests { // equals signs (`=`). Those do not show up in the output of the // `set` command. assert!((cfg!(windows) && k.starts_with("=")) || + k.starts_with("DYLD") || output.contains(&format!("{}={}", *k, *v)), "output doesn't contain `{}={}`\n{}", k, v, output); |