Auto merge of #871 - RalfJung:miri-rustc-cleanup, r=RalfJung

Cleanup after rustc bootstrap tests Miri with a separate libstd Should only be merged after rust-lang/rust#63162 got the green light.
rust-lang · Aug 8, 2019 · b09ae31 · b09ae31
2 parents 7143ccc + bff6b05
commit b09ae31
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 9 deletions.
diff --git a/README.md b/README.md
@@ -283,8 +283,7 @@ The setup for a local rustc works as follows:
 git clone https://github.com/rust-lang/rust/ rustc
 cd rustc
 cp config.toml.example config.toml
-# Now edit `config.toml` and set `debug-assertions = true` and `test-miri = true`.
-# The latter is important to build libstd with the right flags for miri.
+# Now edit `config.toml` and set `debug-assertions = true`.
 # This step can take 30 minutes and more.
 ./x.py build src/rustc
 # If you change something, you can get a faster rebuild by doing

diff --git a/tests/compile-fail-norustc/copy_null.rs → tests/compile-fail/copy_null.rs b/tests/compile-fail-norustc/copy_null.rs → tests/compile-fail/copy_null.rs
diff --git a/...mpile-fail-norustc/copy_nonoverlapping.rs → tests/compile-fail/copy_overlapping.rs b/...mpile-fail-norustc/copy_nonoverlapping.rs → tests/compile-fail/copy_overlapping.rs
diff --git a/tests/compile-fail-norustc/copy_unaligned.rs → tests/compile-fail/copy_unaligned.rs b/tests/compile-fail-norustc/copy_unaligned.rs → tests/compile-fail/copy_unaligned.rs
diff --git a/tests/compiletest.rs b/tests/compiletest.rs
@@ -113,13 +113,6 @@ fn run_pass_miri(opt: bool) {
 
 fn compile_fail_miri(opt: bool) {
     compile_fail("tests/compile-fail", &get_target(), opt);
-    if rustc_test_suite().is_none() {
-        // FIXME: Some tests disabled in rustc test suite because
-        // they run with a debug-assertion libstd which changes the errors.
-        // We should build our own libstd for testing, see
-        // <https://github.com/rust-lang/rust/issues/61833>.
-        compile_fail("tests/compile-fail-norustc", &get_target(), opt);
-    }
 }
 
 fn test_runner(_tests: &[&()]) {