diff options
| author | bors <bors@rust-lang.org> | 2020-05-12 13:59:16 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-05-12 13:59:16 +0000 |
| commit | 769d12eec1d0bc3708841dfc149d3ec98b04bec6 (patch) | |
| tree | e4f60cd2ca07f8001029fbdd7961066710e412a3 /src | |
| parent | d903a9def4c29846ec6215ccc7fa76d39428f577 (diff) | |
| parent | 42f70d503b9a6c87ebb84e44842e421ef01a0421 (diff) | |
| download | rust-769d12eec1d0bc3708841dfc149d3ec98b04bec6.tar.gz rust-769d12eec1d0bc3708841dfc149d3ec98b04bec6.zip | |
Auto merge of #72091 - RalfJung:miri, r=RalfJung
update miri Fixes https://github.com/rust-lang/rust/issues/72037 Cc @rust-lang/miri r? @ghost
Diffstat (limited to 'src')
| -rw-r--r-- | src/bootstrap/test.rs | 1 | ||||
| m--------- | src/tools/miri | 14 |
2 files changed, 7 insertions, 8 deletions
diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs index ad3fd0d64a3..97565013265 100644 --- 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 -Subproject 7f3366288d126408815eeafa8d7cd6e9f3ea56b +Subproject 10419b3f2fc625bb9d746c16d768e433a894484 |