about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRalf Jung <post@ralfj.de>2020-05-11 12:13:53 +0200
committerRalf Jung <post@ralfj.de>2020-05-11 12:13:53 +0200
commit42f70d503b9a6c87ebb84e44842e421ef01a0421 (patch)
treed084c0a767733b9bd7fe8ab0db4e0e6a4bef6ad4
parent82e81191e44fc61c5b583608dd17d76fa8fdc06e (diff)
update miri some more
-rw-r--r--src/bootstrap/test.rs1
m---------src/tools/miri18
2 files changed, 7 insertions, 12 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 4c784796103173c503e44fcdb12cb79ef0aba82
+Subproject 10419b3f2fc625bb9d746c16d768e433a894484