From 857d6aed1f8c75d5e15dec4551748abbeba1c422 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Sat, 8 Oct 2022 09:04:54 +0200 Subject: [PATCH] bless cargo-miri output I think cargo has a bug here: https://github.com/rust-lang/cargo/issues/11191 but for now we bless its output so that we can keep CI green --- test-cargo-miri/run-test.py | 2 +- test-cargo-miri/test.filter.cross-target.stdout.ref | 4 ++++ test-cargo-miri/test.filter.stdout.ref | 10 +++++----- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/test-cargo-miri/run-test.py b/test-cargo-miri/run-test.py index 4485d3252c..20f3f4c057 100755 --- a/test-cargo-miri/run-test.py +++ b/test-cargo-miri/run-test.py @@ -36,7 +36,7 @@ def check_output(actual, path, name): expected = open(path).read() if expected == actual: return True - print(f"{path} did not match reference!") + print(f"output did not match reference in {path}!") print(f"--- BEGIN diff {name} ---") for text in difflib.unified_diff(expected.split("\n"), actual.split("\n")): print(text) diff --git a/test-cargo-miri/test.filter.cross-target.stdout.ref b/test-cargo-miri/test.filter.cross-target.stdout.ref index bb0282d6c9..776ed6538b 100644 --- a/test-cargo-miri/test.filter.cross-target.stdout.ref +++ b/test-cargo-miri/test.filter.cross-target.stdout.ref @@ -1,6 +1,10 @@ running 0 tests +test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out + +running 0 tests + test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 2 filtered out imported main diff --git a/test-cargo-miri/test.filter.stdout.ref b/test-cargo-miri/test.filter.stdout.ref index c618956656..39e1857060 100644 --- a/test-cargo-miri/test.filter.stdout.ref +++ b/test-cargo-miri/test.filter.stdout.ref @@ -1,4 +1,9 @@ +running 0 tests + +test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out + + running 0 tests test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 2 filtered out @@ -10,8 +15,3 @@ test simple ... ok test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 5 filtered out - -running 0 tests - -test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 4 filtered out; finished in $TIME -