run_make_support: rename Command::stdin to stdin_buf and add std{in,out,err} config helpers

Previously `Command::stdin` was actually just a stdin buffer helper, but
this is different from `std::process::Command::stdin`. This is
needlessly confusing, and blocks support to add `std{in,out,err}` config
that tests may want to use to e.g. redirect to `/dev/ptmx`.

Author: jieyouxu

src/tools/run-make-support/src/command.rs

@@ -29,20 +29,58 @@ use crate::{
 #[derive(Debug)]
 pubstructCommand{
 cmd:StdCommand,
-stdin:Option<Box<[u8]>>,
+// Convience for providing a quick stdin buffer.
+stdin_buf:Option<Box<[u8]>>,
+
+// Configurations for child process's std{in,out,err} handles.
+stdin:Option<Stdio>,
+stdout:Option<Stdio>,
+stderr:Option<Stdio>,
+
 drop_bomb:DropBomb,
 }
 
 implCommand{
 #[track_caller]
 pubfnnew<P:AsRef<OsStr>>(program:P) -> Self{
 let program = program.as_ref();
-Self{cmd:StdCommand::new(program),stdin:None,drop_bomb:DropBomb::arm(program)}
+Self{
+cmd:StdCommand::new(program),
+stdin_buf:None,
+drop_bomb:DropBomb::arm(program),
+stdin:None,
+stdout:None,
+stderr:None,
+}
+}
+
+/// Specify a stdin input buffer. This is a convenience helper,
+pubfnstdin_buf<I:AsRef<[u8]>>(&mutself,input:I) -> &mutSelf{
+self.stdin_buf = Some(input.as_ref().to_vec().into_boxed_slice());
+self
+}
+
+/// Configuration for the child process’s standard input (stdin) handle.
+///
+/// See [`std::process::Command::stdin`].
+pubfnstdin<T:Into<Stdio>>(&mutself,cfg:T) -> &mutSelf{
+self.stdin = Some(cfg.into());
+self
+}
+
+/// Configuration for the child process’s standard output (stdout) handle.
+///
+/// See [`std::process::Command::stdout`].
+pubfnstdout<T:Into<Stdio>>(&mutself,cfg:T) -> &mutSelf{
+self.stdout = Some(cfg.into());
+self
 }
 
-/// Specify a stdin input
-pubfnstdin<I:AsRef<[u8]>>(&mutself,input:I) -> &mutSelf{
-self.stdin = Some(input.as_ref().to_vec().into_boxed_slice());
+/// Configuration for the child process’s standard error (stderr) handle.
+///
+/// See [`std::process::Command::stderr`].
+pubfnstderr<T:Into<Stdio>>(&mutself,cfg:T) -> &mutSelf{
+self.stderr = Some(cfg.into());
 self
 }
 
@@ -105,6 +143,8 @@ impl Command {
 }
 
 /// Run the constructed command and assert that it is successfully run.
+///
+/// By default, std{in,out,err} are [`Stdio::piped()`].
 #[track_caller]
 pubfnrun(&mutself) -> CompletedProcess{
 let output = self.command_output();
@@ -115,6 +155,8 @@ impl Command {
 }
 
 /// Run the constructed command and assert that it does not successfully run.
+///
+/// By default, std{in,out,err} are [`Stdio::piped()`].
 #[track_caller]
 pubfnrun_fail(&mutself) -> CompletedProcess{
 let output = self.command_output();
@@ -124,10 +166,10 @@ impl Command {
  output
 }
 
-/// Run the command but do not check its exit status.
-/// Only use if you explicitly don't care about the exit status.
-/// Prefer to use [`Self::run`] and [`Self::run_fail`]
-/// whenever possible.
+/// Run the command but do not check its exit status. Only use if you explicitly don't care
+/// about the exit status.
+///
+/// Prefer to use [`Self::run`] and [`Self::run_fail`] whenever possible.
 #[track_caller]
 pubfnrun_unchecked(&mutself) -> CompletedProcess{
 self.command_output()
@@ -137,11 +179,11 @@ impl Command {
 fncommand_output(&mutself) -> CompletedProcess{
 self.drop_bomb.defuse();
 // let's make sure we piped all the input and outputs
-self.cmd.stdin(Stdio::piped());
-self.cmd.stdout(Stdio::piped());
-self.cmd.stderr(Stdio::piped());
+self.cmd.stdin(self.stdin.take().unwrap_or(Stdio::piped()));
+self.cmd.stdout(self.stdout.take().unwrap_or(Stdio::piped()));
+self.cmd.stderr(self.stderr.take().unwrap_or(Stdio::piped()));
 
-let output = ifletSome(input) = &self.stdin{
+let output = ifletSome(input) = &self.stdin_buf{
 letmut child = self.cmd.spawn().unwrap();
 
 {

src/tools/run-make-support/src/external_deps/llvm.rs

@@ -227,9 +227,10 @@ impl LlvmFilecheck {
 Self{ cmd }
 }
 
-/// Pipe a read file into standard input containing patterns that will be matched against the .patterns(path) call.
-pubfnstdin<I:AsRef<[u8]>>(&mutself,input:I) -> &mutSelf{
-self.cmd.stdin(input);
+/// Provide a buffer representing standard input containing patterns that will be matched
+/// against the `.patterns(path)` call.
+pubfnstdin_buf<I:AsRef<[u8]>>(&mutself,input:I) -> &mutSelf{
+self.cmd.stdin_buf(input);
 self
 }
 

src/tools/run-make-support/src/external_deps/rustc.rs

@@ -291,9 +291,9 @@ impl Rustc {
 self
 }
 
-/// Specify a stdin input
-pubfnstdin<I:AsRef<[u8]>>(&mutself,input:I) -> &mutSelf{
-self.cmd.stdin(input);
+/// Specify a stdin input buffer.
+pubfnstdin_buf<I:AsRef<[u8]>>(&mutself,input:I) -> &mutSelf{
+self.cmd.stdin_buf(input);
 self
 }
 

src/tools/run-make-support/src/external_deps/rustdoc.rs

@@ -85,9 +85,9 @@ impl Rustdoc {
 self
 }
 
-/// Specify a stdin input
-pubfnstdin<I:AsRef<[u8]>>(&mutself,input:I) -> &mutSelf{
-self.cmd.stdin(input);
+/// Specify a stdin input buffer.
+pubfnstdin_buf<I:AsRef<[u8]>>(&mutself,input:I) -> &mutSelf{
+self.cmd.stdin_buf(input);
 self
 }
 

src/tools/run-make-support/src/lib.rs

@@ -34,13 +34,15 @@ pub mod rfs {
 }
 
 // Re-exports of third-party library crates.
+// tidy-alphabetical-start
 pubuse bstr;
 pubuse gimli;
 pubuse libc;
 pubuse object;
 pubuse regex;
 pubuse serde_json;
 pubuse wasmparser;
+// tidy-alphabetical-end
 
 // Re-exports of external dependencies.
 pubuse external_deps::{c_build, cc, clang, htmldocck, llvm, python, rustc, rustdoc};