about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2016-03-14 22:46:42 -0700
committerAlex Crichton <alex@alexcrichton.com>2016-03-14 22:46:42 -0700
commit41244661979cda16bf2b15bd802337a0ee9764dd (patch)
tree526f770fa6357c50f4676b94633916197353a042
parent01118928fc2b280e96189ed394af749d65cbcffe (diff)
downloadrust-41244661979cda16bf2b15bd802337a0ee9764dd.tar.gz
rust-41244661979cda16bf2b15bd802337a0ee9764dd.zip
std: Fix inheriting stdin on status()
This regression was accidentally introduced in #31618, and it's just flipping a
boolean!

Closes #32254
-rw-r--r--src/libstd/process.rs2
-rw-r--r--src/test/run-pass/process-status-inherits-stdin.rs41
2 files changed, 42 insertions, 1 deletions
diff --git a/src/libstd/process.rs b/src/libstd/process.rs
index 5813d82a315..9594c71267b 100644
--- a/src/libstd/process.rs
+++ b/src/libstd/process.rs
@@ -339,7 +339,7 @@ impl Command {
     /// ```
     #[stable(feature = "process", since = "1.0.0")]
     pub fn status(&mut self) -> io::Result<ExitStatus> {
-        self.inner.spawn(imp::Stdio::Inherit, false).map(Child::from_inner)
+        self.inner.spawn(imp::Stdio::Inherit, true).map(Child::from_inner)
                   .and_then(|mut p| p.wait())
     }
 }
diff --git a/src/test/run-pass/process-status-inherits-stdin.rs b/src/test/run-pass/process-status-inherits-stdin.rs
new file mode 100644
index 00000000000..2ad47c4f116
--- /dev/null
+++ b/src/test/run-pass/process-status-inherits-stdin.rs
@@ -0,0 +1,41 @@
+// Copyright 2016 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.
+
+use std::env;
+use std::io;
+use std::io::Write;
+use std::process::{Command, Stdio};
+
+fn main() {
+    let mut args = env::args();
+    let me = args.next().unwrap();
+    let arg = args.next();
+    match arg.as_ref().map(|s| &s[..]) {
+        None => {
+            let mut s = Command::new(&me)
+                                .arg("a1")
+                                .stdin(Stdio::piped())
+                                .spawn()
+                                .unwrap();
+            s.stdin.take().unwrap().write_all(b"foo\n").unwrap();
+            let s = s.wait().unwrap();
+            assert!(s.success());
+        }
+        Some("a1") => {
+            let s = Command::new(&me).arg("a2").status().unwrap();
+            assert!(s.success());
+        }
+        Some(..) => {
+            let mut s = String::new();
+            io::stdin().read_line(&mut s).unwrap();
+            assert_eq!(s, "foo\n");
+        }
+    }
+}