Skip to content

Commit 92f96b2

Browse files
committed
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.
2 parents 77c995b + c2f0442 commit 92f96b2

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

src/libstd/process.rs

+1
Original file line numberDiff line numberDiff line change
@@ -807,6 +807,7 @@ mod tests {
807807
// equals signs (`=`). Those do not show up in the output of the
808808
// `set` command.
809809
assert!((cfg!(windows) && k.starts_with("=")) ||
810+
k.starts_with("DYLD") ||
810811
output.contains(&format!("{}={}", *k, *v)),
811812
"output doesn't contain `{}={}`\n{}",
812813
k, v, output);

0 commit comments

Comments
 (0)