Fix run-test.py

Author: oli-obk

test-cargo-miri/run-test.py

@@ -27,7 +27,7 @@ def normalize_stdout(str):
     str = str.replace("src\\", "src/") # normalize paths across platforms
     return re.sub("finished in \d+\.\d\ds", "finished in $TIME", str)
 
-def check_output(expected, actual, path, name):
+def check_output(actual, path, name):
     expected = open(path).read()
     if expected == actual:
         return True
@@ -54,7 +54,11 @@ 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)
-    if p.returncode == 0 and check_output(stdout, stdout_ref, "stdout") and check_output(stderr, stderr_ref, "stderr"):
+
+    stdout_matches = check_output(stdout, stdout_ref, "stdout")
+    stderr_matches = check_output(stderr, stderr_ref, "stderr")
+    
+    if p.returncode == 0 and stdout_matches and stderr_matches:
         # All good!
         return
     fail("exit code was {}".format(p.returncode))