refactor nfc, fix

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/wdriver.rs b/wdriver.rs
index a48824d963027013f27821a4d7d2a21da9084773..10233c75a63c1ad60e6969223dea606404738691 100644 (file)
--- a/wdriver.rs
+++ b/wdriver.rs
@@ -106,6 +106,7 @@ fn prepare_tmpdir(opts: &Opts, current_exe: &str) -> String {
 
 #[throws(AE)]
 fn fork_something_which_prints(mut cmd: Command) -> String {
+  cmd.stdout(Stdio::piped());
   let mut child = cmd.spawn().context("spawn")?;
   let mut report = BufReader::new(child.stdout.take().unwrap()).lines();
 
@@ -138,8 +139,7 @@ fn prepare_xserver() {
            -terminate \
            -wr \
            -displayfd 1".split(' '))
-    .arg(format!(":{}", DISPLAY))
-    .stdout(Stdio::piped());
+    .arg(format!(":{}", DISPLAY));
 
   let l = fork_something_which_prints(xcmd).context("Xvfb")?;