From 03fb5ad7c25eda9582d8da215bc1697af8f2c2ff Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Wed, 7 Dec 2016 17:26:48 -0800 Subject: [PATCH] rustbuild: Print out failing commands Just ensure that we always print out the command line which should aid in debugging. Closes #38228 --- src/bootstrap/check.rs | 3 +-- src/build_helper/lib.rs | 6 ++++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/bootstrap/check.rs b/src/bootstrap/check.rs index c5675fd46cbe0..72e12c55bfce2 100644 --- a/src/bootstrap/check.rs +++ b/src/bootstrap/check.rs @@ -464,8 +464,7 @@ fn krate_emscripten(build: &Build, println!("running {}", test_file_name); let nodejs = build.config.nodejs.as_ref().expect("nodejs not configured"); let mut cmd = Command::new(nodejs); - cmd.arg(&test_file_name) - .stderr(::std::process::Stdio::inherit()); + cmd.arg(&test_file_name); if build.config.quiet_tests { cmd.arg("--quiet"); } diff --git a/src/build_helper/lib.rs b/src/build_helper/lib.rs index 38844fb6c9ef0..07f9c91d3c787 100644 --- a/src/build_helper/lib.rs +++ b/src/build_helper/lib.rs @@ -21,7 +21,8 @@ pub fn run(cmd: &mut Command) { pub fn run_silent(cmd: &mut Command) { let status = match cmd.status() { Ok(status) => status, - Err(e) => fail(&format!("failed to execute command: {}", e)), + Err(e) => fail(&format!("failed to execute command: {:?}\nerror: {}", + cmd, e)), }; if !status.success() { fail(&format!("command did not execute successfully: {:?}\n\ @@ -63,7 +64,8 @@ pub fn cc2ar(cc: &Path, target: &str) -> Option { pub fn output(cmd: &mut Command) -> String { let output = match cmd.stderr(Stdio::inherit()).output() { Ok(status) => status, - Err(e) => fail(&format!("failed to execute command: {}", e)), + Err(e) => fail(&format!("failed to execute command: {:?}\nerror: {}", + cmd, e)), }; if !output.status.success() { panic!("command did not execute successfully: {:?}\n\