mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no longer strip Preparing a sysroot message from test output

Browse Source
This commit is contained in:
Paul Gey 2024-05-01 21:50:45 +02:00
parent 4b4262691d
commit a2b3211b19
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/tools/miri/test-cargo-miri/run-test.py
View File

@ -34,10 +34,6 @@ def normalize_stdout(str):
str = re.sub("finished in \\d+\\.\\d\\ds", "finished in $TIME", str) # the time keeps changing, obviously str = re.sub("finished in \\d+\\.\\d\\ds", "finished in $TIME", str) # the time keeps changing, obviously
return str return str
def normalize_stderr(str):
str = re.sub("Preparing a sysroot for Miri \\(target: [a-z0-9_-]+\\)\\.\\.\\. done\n", "", str) # remove leading cargo-miri setup output
return str
def check_output(actual, path, name): def check_output(actual, path, name):
if os.environ.get("RUSTC_BLESS", "0") != "0": if os.environ.get("RUSTC_BLESS", "0") != "0":
# Write the output only if bless is set # Write the output only if bless is set
@ -69,7 +65,7 @@ def test(name, cmd, stdout_ref, stderr_ref, stdin=b'', env=None):
) )
(stdout, stderr) = p.communicate(input=stdin) (stdout, stderr) = p.communicate(input=stdin)
stdout = normalize_stdout(stdout.decode("UTF-8")) stdout = normalize_stdout(stdout.decode("UTF-8"))
stderr = normalize_stderr(stderr.decode("UTF-8")) stderr = stderr.decode("UTF-8")
stdout_matches = check_output(stdout, stdout_ref, "stdout") stdout_matches = check_output(stdout, stdout_ref, "stdout")
stderr_matches = check_output(stderr, stderr_ref, "stderr") stderr_matches = check_output(stderr, stderr_ref, "stderr")