From 82e81191e44fc61c5b583608dd17d76fa8fdc06e Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Sun, 10 May 2020 23:55:41 +0200 Subject: [PATCH 1/2] update miri --- src/tools/miri | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/miri b/src/tools/miri index 7f3366288d126..4c78479610317 160000 --- a/src/tools/miri +++ b/src/tools/miri @@ -1 +1 @@ -Subproject commit 7f3366288d126408815eeafa8d7cd6e9f3ea56b9 +Subproject commit 4c784796103173c503e44fcdb12cb79ef0aba820 From 42f70d503b9a6c87ebb84e44842e421ef01a0421 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Mon, 11 May 2020 12:13:53 +0200 Subject: [PATCH 2/2] update miri some more --- src/bootstrap/test.rs | 1 - src/tools/miri | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs index ad3fd0d64a307..975650132652f 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 index 4c78479610317..10419b3f2fc62 160000 --- a/src/tools/miri +++ b/src/tools/miri @@ -1 +1 @@ -Subproject commit 4c784796103173c503e44fcdb12cb79ef0aba820 +Subproject commit 10419b3f2fc625bb9d746c16d768e433a894484d