1
Fork 0

Auto merge of #22920 - tshepang:remove-some-warnings, r=huonw

This commit is contained in:
bors 2015-03-04 12:16:51 +00:00
commit bdf6e4fcf5
12 changed files with 25 additions and 31 deletions

View file

@ -803,14 +803,13 @@ mod tests {
#[cfg(not(target_os="android"))]
#[test]
fn test_inherit_env() {
use os;
use std::env;
if running_on_valgrind() { return; }
let result = env_cmd().output().unwrap();
let output = String::from_utf8(result.stdout).unwrap();
let r = os::env();
for &(ref k, ref v) in &r {
for (ref k, ref v) in env::vars() {
// don't check windows magical empty-named variables
assert!(k.is_empty() ||
output.contains(format!("{}={}", *k, *v).as_slice()),