Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Test Unicode support of process spawning
Added a run-pass test to ensure that processes can be correctly spawned using non-ASCII arguments, working directory, and environment variables. It also tests Unicode support of os::env_as_bytes. An additional assertion was added to the test for make_command_line to verify it handles Unicode correctly.
- Loading branch information
1 parent
d9eca56
commit b8e3f3a
Showing
2 changed files
with
90 additions
and
0 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,86 @@ | ||
// 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. | ||
|
||
// no-prefer-dynamic | ||
|
||
// The test copies itself into a subdirectory with a non-ASCII name and then | ||
// runs it as a child process within the subdirectory. The parent process | ||
// also adds an environment variable and an argument, both containing | ||
// non-ASCII characters. The child process ensures all the strings are | ||
// intact. | ||
|
||
extern crate native; | ||
|
||
use std::io; | ||
use std::io::fs; | ||
use std::io::process::Process; | ||
use std::io::process::ProcessConfig; | ||
use std::os; | ||
use std::path::Path; | ||
|
||
fn main() { | ||
let my_args = os::args(); | ||
let my_cwd = os::getcwd(); | ||
let my_env = os::env(); | ||
let my_path = Path::new(os::self_exe_name().unwrap()); | ||
let my_dir = my_path.dir_path(); | ||
let my_ext = my_path.extension_str().unwrap_or(""); | ||
|
||
// some non-ASCII characters | ||
let blah = "\u03c0\u042f\u97f3\u00e6\u221e"; | ||
|
||
let child_name = "child"; | ||
let child_dir = "process-spawn-with-unicode-params-" + blah; | ||
|
||
// parameters sent to child / expected to be received from parent | ||
let arg = blah; | ||
let cwd = my_dir.join(Path::new(child_dir.clone())); | ||
let env = ("RUST_TEST_PROC_SPAWN_UNICODE".to_owned(), blah.to_owned()); | ||
|
||
// am I the parent or the child? | ||
if my_args.len() == 1 { // parent | ||
|
||
let child_filestem = Path::new(child_name); | ||
let child_filename = child_filestem.with_extension(my_ext); | ||
let child_path = cwd.join(child_filename.clone()); | ||
|
||
// make a separate directory for the child | ||
drop(fs::mkdir(&cwd, io::UserRWX).is_ok()); | ||
assert!(fs::copy(&my_path, &child_path).is_ok()); | ||
|
||
// run child | ||
let p = Process::configure(ProcessConfig { | ||
program: child_path.as_str().unwrap(), | ||
args: [arg.to_owned()], | ||
cwd: Some(&cwd), | ||
env: Some(my_env.append_one(env).as_slice()), | ||
.. ProcessConfig::new() | ||
}).unwrap().wait_with_output(); | ||
|
||
// display the output | ||
assert!(io::stdout().write(p.output.as_slice()).is_ok()); | ||
assert!(io::stderr().write(p.error.as_slice()).is_ok()); | ||
|
||
// make sure the child succeeded | ||
assert!(p.status.success()); | ||
|
||
} else { // child | ||
|
||
// check working directory (don't try to compare with `cwd` here!) | ||
assert!(my_cwd.ends_with_path(&Path::new(child_dir))); | ||
|
||
// check arguments | ||
assert_eq!(my_args.get(1).as_slice(), arg); | ||
|
||
// check environment variable | ||
assert!(my_env.contains(&env)); | ||
|
||
}; | ||
} |
b8e3f3a
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 Rufflewind@b8e3f3a
b8e3f3a
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 Rufflewind/rust/patch-3 = b8e3f3a into auto
b8e3f3a
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.
Rufflewind/rust/patch-3 = b8e3f3a merged ok, testing candidate = cb115ac
b8e3f3a
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/5756
success: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/5755
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/4850
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/4858
success: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/5854
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/4942
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/4950
success: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/5856
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/4941
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/4947
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android/builds/5009
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android-t/builds/2743
success: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/5849
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/4945
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/4960
b8e3f3a
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 = cb115ac