Unify stderr/stdout handling

Author: oli-obk

test-cargo-miri/run-test.py

@@ -28,6 +28,7 @@ def normalize_stdout(str):
     return re.sub("finished in \d+\.\d\ds", "finished in $TIME", str)
 
 def check_output(expected, actual, path, name):
+    expected = open(path).read()
     if expected == actual:
         return True
     print(f"{path} did not match reference!")
@@ -53,8 +54,7 @@ def test(name, cmd, stdout_ref, stderr_ref, stdin=b'', env={}):
     stdout = stdout.decode("UTF-8")
     stderr = stderr.decode("UTF-8")
     stdout = normalize_stdout(stdout)
-    expected_stdout = open(stdout_ref).read()
-    if p.returncode == 0 and check_output(expected_stdout, stdout, stdout_ref, "stdout") and check_output(open(stderr_ref).read(), stderr, stderr_ref, "stderr"):
+    if p.returncode == 0 and check_output(stdout, stdout_ref, "stdout") and check_output(stderr, stderr_ref, "stderr"):
         # All good!
         return
     fail("exit code was {}".format(p.returncode))