Auto merge of #72091 - RalfJung:miri, r=RalfJung

update miri Fixes #72037 Cc @rust-lang/miri r? @ghost
rust-lang · May 12, 2020 · 769d12e · 769d12e
2 parents d903a9d + 42f70d5
commit 769d12e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
@@ -436,7 +436,6 @@ impl Step for Miri {
 
             // miri tests need to know about the stage sysroot
             cargo.env("MIRI_SYSROOT", miri_sysroot);
-            cargo.env("RUSTC_TEST_SUITE", builder.rustc(compiler));
             cargo.env("RUSTC_LIB_PATH", builder.rustc_libdir(compiler));
             cargo.env("MIRI_PATH", miri);
 

diff --git a/src/tools/miri b/src/tools/miri
+35 −70		.appveyor.yml
+21 −27		.travis.yml
+9 −2		README.md
+12 −11		ci.sh
+1 −1		rust-version
+116 −155		src/bin/cargo-miri.rs
+63 −43		src/bin/miri.rs
+1 −1		src/diagnostics.rs
+1 −1		src/helpers.rs
+2 −2		src/machine.rs
+7 −5		src/shims/fs.rs
+28 −28		src/shims/sync.rs
+3 −4		src/thread.rs
+1 −1		tests/compile-fail/validity/invalid_wide_raw.rs
+14 −38		tests/compiletest.rs