From 192b535adc32d96795ad4e39cc199ab68a28a60b Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Sat, 12 Sep 2020 13:57:49 +0200
Subject: [PATCH] cleaner output for cargo-miri-test harness

---
 test-cargo-miri/run-test.py | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/test-cargo-miri/run-test.py b/test-cargo-miri/run-test.py
index 78b10d1f2bfb..bbb8df9059ac 100755
--- a/test-cargo-miri/run-test.py
+++ b/test-cargo-miri/run-test.py
@@ -22,7 +22,7 @@ def cargo_miri(cmd):
     return args
 
 def test(name, cmd, stdout_ref, stderr_ref, stdin=b'', env={}):
-    print("==> Testing {} <==".format(name))
+    print("Testing {}...".format(name))
     ## Call `cargo miri`, capture all output
     p_env = os.environ.copy()
     p_env.update(env)
@@ -36,18 +36,17 @@ def test(name, cmd, stdout_ref, stderr_ref, stdin=b'', env={}):
     (stdout, stderr) = p.communicate(input=stdin)
     stdout = stdout.decode("UTF-8")
     stderr = stderr.decode("UTF-8")
+    if p.returncode == 0 and stdout == open(stdout_ref).read() and stderr == open(stderr_ref).read():
+        # All good!
+        return
     # Show output
-    print("=> captured stdout <=")
+    print("--- BEGIN stdout ---")
     print(stdout, end="")
-    print("=> captured stderr <=")
+    print("--- END stdout ---")
+    print("--- BEGIN stderr ---")
     print(stderr, end="")
-    # Test for failures
-    if p.returncode != 0:
-        fail("Non-zero exit status")
-    if stdout != open(stdout_ref).read():
-        fail("stdout does not match reference")
-    if stderr != open(stderr_ref).read():
-        fail("stderr does not match reference")
+    print("--- END stderr ---")
+    fail("exit code was {}".format(p.returncode))
 
 def test_cargo_miri_run():
     test("`cargo miri run` (no isolation)",
@@ -96,7 +95,7 @@ def test_cargo_miri_test():
         cargo_miri("test") + ["--bin", "cargo-miri-test", "--", "--format=pretty"],
         "test.stdout.ref4", "test.stderr.ref2",
     )
-    test("`cargo miri test` (subcrate)",
+    test("`cargo miri test` (subcrate, no isolation)",
         cargo_miri("test") + ["-p", "subcrate"],
         "test.stdout.ref5", "test.stderr.ref2",
         env={'MIRIFLAGS': "-Zmiri-disable-isolation"},