From 19fb53e8a3e72159c2105d497fd23d4d4f34ee3a Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Sat, 12 Oct 2019 18:11:44 +0200
Subject: [PATCH] better debugging for sysroot check

---
 src/bin/cargo-miri.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/bin/cargo-miri.rs b/src/bin/cargo-miri.rs
index 43e8761d48c..30b1d863e0c 100644
--- a/src/bin/cargo-miri.rs
+++ b/src/bin/cargo-miri.rs
@@ -136,8 +136,12 @@ fn test_sysroot_consistency() {
             .output().expect("Failed to run rustc to get sysroot info");
         let stdout = String::from_utf8(out.stdout).expect("stdout is not valid UTF-8");
         let stderr = String::from_utf8(out.stderr).expect("stderr is not valid UTF-8");
+        assert!(
+            out.status.success(),
+            "Bad status code {} when getting sysroot info via {:?}.\nstdout:\n{}\nstderr:\n{}",
+            out.status, cmd, stdout, stderr,
+        );
         let stdout = stdout.trim();
-        assert!(out.status.success(), "Bad status code when getting sysroot info.\nstdout:\n{}\nstderr:\n{}", stdout, stderr);
         PathBuf::from(stdout).canonicalize()
             .unwrap_or_else(|_| panic!("Failed to canonicalize sysroot: {}", stdout))
     }