2580950fcd
* Command::envs() now takes anything that is IntoIterator<Item=(K, V)> where both K and V are AsRef<OsStr>. * Since we're not 100% sure that's the right signature, envs() is now marked unstable. (You can use envs() with HashMap<str, str> but not Vec<(str, str)>, for instance.) * Update the test to match. * By analogy, args() now takes any IntoIterator<Item=S>, S: AsRef<OsStr>. This should be uncontroversial.
63 lines
1.7 KiB
Rust
63 lines
1.7 KiB
Rust
// Copyright 2014, 2017 The Rust Project Developers. See the COPYRIGHT
|
|
// file at the top-level directory of this distribution and at
|
|
// http://rust-lang.org/COPYRIGHT.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
|
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
|
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
|
// option. This file may not be copied, modified, or distributed
|
|
// except according to those terms.
|
|
|
|
// ignore-emscripten
|
|
|
|
#![feature(command_envs)]
|
|
|
|
use std::process::Command;
|
|
use std::env;
|
|
use std::collections::HashMap;
|
|
|
|
#[cfg(all(unix, not(target_os="android")))]
|
|
pub fn env_cmd() -> Command {
|
|
Command::new("env")
|
|
}
|
|
#[cfg(target_os="android")]
|
|
pub fn env_cmd() -> Command {
|
|
let mut cmd = Command::new("/system/bin/sh");
|
|
cmd.arg("-c").arg("set");
|
|
cmd
|
|
}
|
|
|
|
#[cfg(windows)]
|
|
pub fn env_cmd() -> Command {
|
|
let mut cmd = Command::new("cmd");
|
|
cmd.arg("/c").arg("set");
|
|
cmd
|
|
}
|
|
|
|
fn main() {
|
|
// save original environment
|
|
let old_env = env::var_os("RUN_TEST_NEW_ENV");
|
|
|
|
env::set_var("RUN_TEST_NEW_ENV", "123");
|
|
|
|
// create filtered environment vector
|
|
let filtered_env : HashMap<String, String> =
|
|
env::vars().filter(|&(ref k, _)| k == "PATH").collect();
|
|
|
|
let mut cmd = env_cmd();
|
|
cmd.env_clear();
|
|
cmd.envs(&filtered_env);
|
|
|
|
// restore original environment
|
|
match old_env {
|
|
None => env::remove_var("RUN_TEST_NEW_ENV"),
|
|
Some(val) => env::set_var("RUN_TEST_NEW_ENV", &val)
|
|
}
|
|
|
|
let result = cmd.output().unwrap();
|
|
let output = String::from_utf8_lossy(&result.stdout);
|
|
|
|
assert!(!output.contains("RUN_TEST_NEW_ENV"),
|
|
"found RUN_TEST_NEW_ENV inside of:\n\n{}", output);
|
|
}
|