Skip to content

Commit b1709d2

Browse files
committed
update test
1 parent d48433d commit b1709d2

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

src/test/run-pass/command-before-exec.rs renamed to src/test/run-pass/command-pre-exec.rs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,53 +29,53 @@ fn main() {
2929

3030
let me = env::current_exe().unwrap();
3131

32-
let output = Command::new(&me).arg("test1").before_exec(|| {
32+
let output = unsafe { Command::new(&me).arg("test1").pre_exec(|| {
3333
println!("hello");
3434
Ok(())
35-
}).output().unwrap();
35+
}).output().unwrap() };
3636
assert!(output.status.success());
3737
assert!(output.stderr.is_empty());
3838
assert_eq!(output.stdout, b"hello\nhello2\n");
3939

40-
let output = Command::new(&me).arg("test2").before_exec(|| {
40+
let output = unsafe { Command::new(&me).arg("test2").pre_exec(|| {
4141
env::set_var("FOO", "BAR");
4242
Ok(())
43-
}).output().unwrap();
43+
}).output().unwrap() };
4444
assert!(output.status.success());
4545
assert!(output.stderr.is_empty());
4646
assert!(output.stdout.is_empty());
4747

48-
let output = Command::new(&me).arg("test3").before_exec(|| {
48+
let output = unsafe { Command::new(&me).arg("test3").pre_exec(|| {
4949
env::set_current_dir("/").unwrap();
5050
Ok(())
51-
}).output().unwrap();
51+
}).output().unwrap() };
5252
assert!(output.status.success());
5353
assert!(output.stderr.is_empty());
5454
assert!(output.stdout.is_empty());
5555

56-
let output = Command::new(&me).arg("bad").before_exec(|| {
56+
let output = unsafe { Command::new(&me).arg("bad").pre_exec(|| {
5757
Err(Error::from_raw_os_error(102))
58-
}).output().unwrap_err();
58+
}).output().unwrap_err() };
5959
assert_eq!(output.raw_os_error(), Some(102));
6060

6161
let pid = unsafe { libc::getpid() };
6262
assert!(pid >= 0);
63-
let output = Command::new(&me).arg("empty").before_exec(move || {
64-
let child = unsafe { libc::getpid() };
63+
let output = unsafe { Command::new(&me).arg("empty").pre_exec(move || {
64+
let child = libc::getpid();
6565
assert!(child >= 0);
6666
assert!(pid != child);
6767
Ok(())
68-
}).output().unwrap();
68+
}).output().unwrap() };
6969
assert!(output.status.success());
7070
assert!(output.stderr.is_empty());
7171
assert!(output.stdout.is_empty());
7272

7373
let mem = Arc::new(AtomicUsize::new(0));
7474
let mem2 = mem.clone();
75-
let output = Command::new(&me).arg("empty").before_exec(move || {
75+
let output = unsafe { Command::new(&me).arg("empty").pre_exec(move || {
7676
assert_eq!(mem2.fetch_add(1, Ordering::SeqCst), 0);
7777
Ok(())
78-
}).output().unwrap();
78+
}).output().unwrap() };
7979
assert!(output.status.success());
8080
assert!(output.stderr.is_empty());
8181
assert!(output.stdout.is_empty());

0 commit comments

Comments
 (0)