diff options
| author | Felix S. Klock II <pnkfelix@pnkfx.org> | 2015-04-01 11:59:51 +0200 |
|---|---|---|
| committer | Felix S. Klock II <pnkfelix@pnkfx.org> | 2015-04-01 11:59:51 +0200 |
| commit | 2b71aed003997cc09b85c01306083187cb924a29 (patch) | |
| tree | 451f704eef5a5c33ef3aa36a04c498f855cb4fb8 /src/libstd | |
| parent | 8dff0ac143a689b7a1e04e55273d3f006b8369d1 (diff) | |
| download | rust-2b71aed003997cc09b85c01306083187cb924a29.tar.gz rust-2b71aed003997cc09b85c01306083187cb924a29.zip | |
Update android tests to reflect API switch from `os::env` to `env::vars`.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/old_io/process.rs | 2 | ||||
| -rw-r--r-- | src/libstd/process.rs | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/libstd/old_io/process.rs b/src/libstd/old_io/process.rs index 7e1865a9ed6..ad2d5b46819 100644 --- a/src/libstd/old_io/process.rs +++ b/src/libstd/old_io/process.rs @@ -1074,7 +1074,7 @@ mod tests { let mut prog = env_cmd().spawn().unwrap(); let output = String::from_utf8(prog.wait_with_output().unwrap().output).unwrap(); - let r = env::vars(); + let r = ::env::vars(); for (k, v) in r { // don't check android RANDOM variables if k != "RANDOM".to_string() { diff --git a/src/libstd/process.rs b/src/libstd/process.rs index c2d43ba2a05..52f5965db80 100644 --- a/src/libstd/process.rs +++ b/src/libstd/process.rs @@ -832,14 +832,13 @@ mod tests { #[cfg(target_os="android")] #[test] fn test_inherit_env() { - use os; + use std::env; if running_on_valgrind() { return; } let mut 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 android RANDOM variables if *k != "RANDOM".to_string() { assert!(output.contains(&format!("{}={}", |