From b1709d25e12fbffca53c30d05c16854256185900 Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Fri, 1 Feb 2019 20:00:08 +0100
Subject: [PATCH] update test

---
 ...and-before-exec.rs => command-pre-exec.rs} | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)
 rename src/test/run-pass/{command-before-exec.rs => command-pre-exec.rs} (75%)

diff --git a/src/test/run-pass/command-before-exec.rs b/src/test/run-pass/command-pre-exec.rs
similarity index 75%
rename from src/test/run-pass/command-before-exec.rs
rename to src/test/run-pass/command-pre-exec.rs
index 91d2636b2ae6..bca2b8410fa8 100644
--- a/src/test/run-pass/command-before-exec.rs
+++ b/src/test/run-pass/command-pre-exec.rs
@@ -29,53 +29,53 @@ fn main() {
 
     let me = env::current_exe().unwrap();
 
-    let output = Command::new(&me).arg("test1").before_exec(|| {
+    let output = unsafe { Command::new(&me).arg("test1").pre_exec(|| {
         println!("hello");
         Ok(())
-    }).output().unwrap();
+    }).output().unwrap() };
     assert!(output.status.success());
     assert!(output.stderr.is_empty());
     assert_eq!(output.stdout, b"hello\nhello2\n");
 
-    let output = Command::new(&me).arg("test2").before_exec(|| {
+    let output = unsafe { Command::new(&me).arg("test2").pre_exec(|| {
         env::set_var("FOO", "BAR");
         Ok(())
-    }).output().unwrap();
+    }).output().unwrap() };
     assert!(output.status.success());
     assert!(output.stderr.is_empty());
     assert!(output.stdout.is_empty());
 
-    let output = Command::new(&me).arg("test3").before_exec(|| {
+    let output = unsafe { Command::new(&me).arg("test3").pre_exec(|| {
         env::set_current_dir("/").unwrap();
         Ok(())
-    }).output().unwrap();
+    }).output().unwrap() };
     assert!(output.status.success());
     assert!(output.stderr.is_empty());
     assert!(output.stdout.is_empty());
 
-    let output = Command::new(&me).arg("bad").before_exec(|| {
+    let output = unsafe { Command::new(&me).arg("bad").pre_exec(|| {
         Err(Error::from_raw_os_error(102))
-    }).output().unwrap_err();
+    }).output().unwrap_err() };
     assert_eq!(output.raw_os_error(), Some(102));
 
     let pid = unsafe { libc::getpid() };
     assert!(pid >= 0);
-    let output = Command::new(&me).arg("empty").before_exec(move || {
-        let child = unsafe { libc::getpid() };
+    let output = unsafe { Command::new(&me).arg("empty").pre_exec(move || {
+        let child = libc::getpid();
         assert!(child >= 0);
         assert!(pid != child);
         Ok(())
-    }).output().unwrap();
+    }).output().unwrap() };
     assert!(output.status.success());
     assert!(output.stderr.is_empty());
     assert!(output.stdout.is_empty());
 
     let mem = Arc::new(AtomicUsize::new(0));
     let mem2 = mem.clone();
-    let output = Command::new(&me).arg("empty").before_exec(move || {
+    let output = unsafe { Command::new(&me).arg("empty").pre_exec(move || {
         assert_eq!(mem2.fetch_add(1, Ordering::SeqCst), 0);
         Ok(())
-    }).output().unwrap();
+    }).output().unwrap() };
     assert!(output.status.success());
     assert!(output.stderr.is_empty());
     assert!(output.stdout.is_empty());