Skip to content

Commit b8e3f3a

Browse files
committed
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.
1 parent d9eca56 commit b8e3f3a

File tree

2 files changed

+90
-0
lines changed

2 files changed

+90
-0
lines changed

src/libnative/io/process.rs

+4
Original file line numberDiff line numberDiff line change
@@ -864,5 +864,9 @@ mod tests {
864864
make_command_line("echo", ["a b c".to_owned()]),
865865
"echo \"a b c\"".to_owned()
866866
);
867+
assert_eq!(
868+
make_command_line("\u03c0\u042f\u97f3\u00e6\u221e", []),
869+
"\u03c0\u042f\u97f3\u00e6\u221e".to_owned()
870+
);
867871
}
868872
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
// no-prefer-dynamic
12+
13+
// The test copies itself into a subdirectory with a non-ASCII name and then
14+
// runs it as a child process within the subdirectory. The parent process
15+
// also adds an environment variable and an argument, both containing
16+
// non-ASCII characters. The child process ensures all the strings are
17+
// intact.
18+
19+
extern crate native;
20+
21+
use std::io;
22+
use std::io::fs;
23+
use std::io::process::Process;
24+
use std::io::process::ProcessConfig;
25+
use std::os;
26+
use std::path::Path;
27+
28+
fn main() {
29+
let my_args = os::args();
30+
let my_cwd = os::getcwd();
31+
let my_env = os::env();
32+
let my_path = Path::new(os::self_exe_name().unwrap());
33+
let my_dir = my_path.dir_path();
34+
let my_ext = my_path.extension_str().unwrap_or("");
35+
36+
// some non-ASCII characters
37+
let blah = "\u03c0\u042f\u97f3\u00e6\u221e";
38+
39+
let child_name = "child";
40+
let child_dir = "process-spawn-with-unicode-params-" + blah;
41+
42+
// parameters sent to child / expected to be received from parent
43+
let arg = blah;
44+
let cwd = my_dir.join(Path::new(child_dir.clone()));
45+
let env = ("RUST_TEST_PROC_SPAWN_UNICODE".to_owned(), blah.to_owned());
46+
47+
// am I the parent or the child?
48+
if my_args.len() == 1 { // parent
49+
50+
let child_filestem = Path::new(child_name);
51+
let child_filename = child_filestem.with_extension(my_ext);
52+
let child_path = cwd.join(child_filename.clone());
53+
54+
// make a separate directory for the child
55+
drop(fs::mkdir(&cwd, io::UserRWX).is_ok());
56+
assert!(fs::copy(&my_path, &child_path).is_ok());
57+
58+
// run child
59+
let p = Process::configure(ProcessConfig {
60+
program: child_path.as_str().unwrap(),
61+
args: [arg.to_owned()],
62+
cwd: Some(&cwd),
63+
env: Some(my_env.append_one(env).as_slice()),
64+
.. ProcessConfig::new()
65+
}).unwrap().wait_with_output();
66+
67+
// display the output
68+
assert!(io::stdout().write(p.output.as_slice()).is_ok());
69+
assert!(io::stderr().write(p.error.as_slice()).is_ok());
70+
71+
// make sure the child succeeded
72+
assert!(p.status.success());
73+
74+
} else { // child
75+
76+
// check working directory (don't try to compare with `cwd` here!)
77+
assert!(my_cwd.ends_with_path(&Path::new(child_dir)));
78+
79+
// check arguments
80+
assert_eq!(my_args.get(1).as_slice(), arg);
81+
82+
// check environment variable
83+
assert!(my_env.contains(&env));
84+
85+
};
86+
}

0 commit comments

Comments
 (0)