Skip to content

Commit 2b71aed

Browse files
committed
Update android tests to reflect API switch from os::env to env::vars.
1 parent 8dff0ac commit 2b71aed

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

src/libstd/old_io/process.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1074,7 +1074,7 @@ mod tests {
10741074
let mut prog = env_cmd().spawn().unwrap();
10751075
let output = String::from_utf8(prog.wait_with_output().unwrap().output).unwrap();
10761076

1077-
let r = env::vars();
1077+
let r = ::env::vars();
10781078
for (k, v) in r {
10791079
// don't check android RANDOM variables
10801080
if k != "RANDOM".to_string() {

src/libstd/process.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -832,14 +832,13 @@ mod tests {
832832
#[cfg(target_os="android")]
833833
#[test]
834834
fn test_inherit_env() {
835-
use os;
835+
use std::env;
836836
if running_on_valgrind() { return; }
837837

838838
let mut result = env_cmd().output().unwrap();
839839
let output = String::from_utf8(result.stdout).unwrap();
840840

841-
let r = os::env();
842-
for &(ref k, ref v) in &r {
841+
for (ref k, ref v) in env::vars() {
843842
// don't check android RANDOM variables
844843
if *k != "RANDOM".to_string() {
845844
assert!(output.contains(&format!("{}={}",

0 commit comments

Comments
 (0)