Skip to content

Commit 503e82a

Browse files
committed
no longer strip Preparing a sysroot message from test output
1 parent 63f4291 commit 503e82a

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

test-cargo-miri/run-test.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,6 @@ def normalize_stdout(str):
3434
str = re.sub("finished in \\d+\\.\\d\\ds", "finished in $TIME", str) # the time keeps changing, obviously
3535
return str
3636

37-
def normalize_stderr(str):
38-
str = re.sub("Preparing a sysroot for Miri \\(target: [a-z0-9_-]+\\)\\.\\.\\. done\n", "", str) # remove leading cargo-miri setup output
39-
return str
40-
4137
def check_output(actual, path, name):
4238
if os.environ.get("RUSTC_BLESS", "0") != "0":
4339
# Write the output only if bless is set
@@ -69,7 +65,7 @@ def test(name, cmd, stdout_ref, stderr_ref, stdin=b'', env=None):
6965
)
7066
(stdout, stderr) = p.communicate(input=stdin)
7167
stdout = normalize_stdout(stdout.decode("UTF-8"))
72-
stderr = normalize_stderr(stderr.decode("UTF-8"))
68+
stderr = stderr.decode("UTF-8")
7369

7470
stdout_matches = check_output(stdout, stdout_ref, "stdout")
7571
stderr_matches = check_output(stderr, stderr_ref, "stderr")

0 commit comments

Comments
 (0)