From 3de5bd7decec2440a7696fdad72bf6f7698afa61 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Sun, 1 Dec 2019 12:57:09 +0100 Subject: [PATCH] run-test: make sure the sysroot building output does not distort our tests --- test-cargo-miri/run-test.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test-cargo-miri/run-test.py b/test-cargo-miri/run-test.py index 499c2e896f17..a4086bcc8c99 100755 --- a/test-cargo-miri/run-test.py +++ b/test-cargo-miri/run-test.py @@ -67,6 +67,10 @@ def test_cargo_miri_test(): os.chdir(os.path.dirname(os.path.realpath(__file__))) +if not 'MIRI_SYSROOT' in os.environ: + # Make sure we got a working sysroot. + # (If the sysroot gets built later when output is compared, that leads to test failures.) + subprocess.run(cargo_miri("setup"), check=True) test_cargo_miri_run() test_cargo_miri_test()