Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix a race condition between remove_from_env and other io::process te…
…sts.
- Loading branch information
Showing
2 changed files
with
53 additions
and
26 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,53 @@ | ||
// Copyright 2014 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. | ||
|
||
use std::io::Command; | ||
use std::os; | ||
|
||
#[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 = os::getenv("RUN_TEST_NEW_ENV"); | ||
|
||
os::setenv("RUN_TEST_NEW_ENV", "123"); | ||
|
||
let mut cmd = env_cmd(); | ||
cmd.env_remove("RUN_TEST_NEW_ENV"); | ||
|
||
// restore original environment | ||
match old_env { | ||
None => os::unsetenv("RUN_TEST_NEW_ENV"), | ||
Some(val) => os::setenv("RUN_TEST_NEW_ENV", val.as_slice()) | ||
} | ||
|
||
let prog = cmd.spawn().unwrap(); | ||
let result = prog.wait_with_output().unwrap(); | ||
let output = String::from_utf8_lossy(result.output.as_slice()); | ||
|
||
assert!(!output.as_slice().contains("RUN_TEST_NEW_ENV"), | ||
"found RUN_TEST_NEW_ENV inside of:\n\n{}", output); | ||
} |
ef69388
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
r+ p=10
ef69388
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
saw approval from alexcrichton
at eddyb@ef69388
ef69388
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
merging eddyb/rust/fix-process-test = ef69388 into auto
ef69388
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
eddyb/rust/fix-process-test = ef69388 merged ok, testing candidate = 449191fe
ef69388
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
some tests failed:
exception: http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/1648
exception: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/1645
exception: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/1639
exception: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/1645
exception: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/1642
exception: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/1641
exception: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/1641
exception: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/1645
exception: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/1639
exception: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/1638
exception: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android-t/builds/1641
exception: http://buildbot.rust-lang.org/builders/auto-win-64-opt/builds/131
ef69388
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
saw approval from alexcrichton
at eddyb@ef69388
ef69388
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
merging eddyb/rust/fix-process-test = ef69388 into auto
ef69388
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
eddyb/rust/fix-process-test = ef69388 merged ok, testing candidate = 8c16885c
ef69388
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
some tests failed:
exception: http://buildbot.rust-lang.org/builders/auto-win-64-nopt-c/builds/133