-
Notifications
You must be signed in to change notification settings - Fork 12.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
native: Search the child's PATH on win32
In order to have the spawning semantics be the same for unix/windows, the child's PATH environment variable needs to be searched rather than the parent's environment variable. If the child is inheriting the parent's PATH, then no action need be taken as windows will do the heavy lifting. If the child specifies its own PATH, then it is searched beforehand for the target program and the result is favored if a hit is found. cc #15149, but does not close the issue because libgreen still needs to be updated.
- Loading branch information
1 parent
fbeee04
commit b1a964a
Showing
2 changed files
with
77 additions
and
1 deletion.
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,56 @@ | ||
// 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. | ||
|
||
#![feature(phase)] | ||
extern crate native; | ||
#[phase(plugin)] | ||
extern crate green; | ||
|
||
use native::NativeTaskBuilder; | ||
use std::io::{TempDir, Command, fs}; | ||
use std::os; | ||
use std::task::TaskBuilder; | ||
|
||
// FIXME(#15149) libgreen still needs to be update. There is an open PR for it | ||
// but it is not yet merged. | ||
// green_start!(main) | ||
|
||
fn main() { | ||
// If we're the child, make sure we were invoked correctly | ||
let args = os::args(); | ||
if args.len() > 1 && args.get(1).as_slice() == "child" { | ||
return assert_eq!(args.get(0).as_slice(), "mytest"); | ||
} | ||
|
||
test(); | ||
let (tx, rx) = channel(); | ||
TaskBuilder::new().native().spawn(proc() { | ||
tx.send(test()); | ||
}); | ||
rx.recv(); | ||
} | ||
|
||
fn test() { | ||
// If we're the parent, copy our own binary to a tempr directory, and then | ||
// make it executable. | ||
let dir = TempDir::new("mytest").unwrap(); | ||
let me = os::self_exe_name().unwrap(); | ||
let dest = dir.path().join(format!("mytest{}", os::consts::EXE_SUFFIX)); | ||
fs::copy(&me, &dest).unwrap(); | ||
|
||
// Append the temp directory to our own PATH. | ||
let mut path = os::split_paths(os::getenv("PATH").unwrap_or(String::new())); | ||
path.push(dir.path().clone()); | ||
let path = os::join_paths(path.as_slice()).unwrap(); | ||
|
||
Command::new("mytest").env("PATH", path.as_slice()) | ||
.arg("child") | ||
.spawn().unwrap(); | ||
} |
b1a964a
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 brson
at alexcrichton@b1a964a
b1a964a
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 alexcrichton/rust/windows-paths = b1a964a into auto
b1a964a
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.
alexcrichton/rust/windows-paths = b1a964a merged ok, testing candidate = a35774b
b1a964a
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.
all tests pass:
success: http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/319
success: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/320
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/319
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/320
success: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/322
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/323
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/322
success: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/328
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/323
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/322
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android-t/builds/325
success: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/323
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/323
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/324
b1a964a
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.
fast-forwarding master to auto = a35774b