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 https://github.com/rust-lang/rust/pull/63162 got the green light.
This commit is contained in:
bors 2019-08-08 20:43:47 +00:00
commit b09ae31da0
5 changed files with 1 additions and 9 deletions

View File

@ -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

View File

@ -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: &[&()]) {