From 6c545ba340fb50e33bf4b71672e3919a84ba4f3c Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Wed, 31 Jul 2019 15:15:55 +0200 Subject: [PATCH 1/3] the compile-fail-norustc hack is no longer needed --- .../copy_nonoverlapping.rs | 0 tests/{compile-fail-norustc => compile-fail}/copy_null.rs | 0 .../copy_unaligned.rs | 0 tests/compiletest.rs | 7 ------- 4 files changed, 7 deletions(-) rename tests/{compile-fail-norustc => compile-fail}/copy_nonoverlapping.rs (100%) rename tests/{compile-fail-norustc => compile-fail}/copy_null.rs (100%) rename tests/{compile-fail-norustc => compile-fail}/copy_unaligned.rs (100%) diff --git a/tests/compile-fail-norustc/copy_nonoverlapping.rs b/tests/compile-fail/copy_nonoverlapping.rs similarity index 100% rename from tests/compile-fail-norustc/copy_nonoverlapping.rs rename to tests/compile-fail/copy_nonoverlapping.rs diff --git a/tests/compile-fail-norustc/copy_null.rs b/tests/compile-fail/copy_null.rs similarity index 100% rename from tests/compile-fail-norustc/copy_null.rs rename to tests/compile-fail/copy_null.rs diff --git a/tests/compile-fail-norustc/copy_unaligned.rs b/tests/compile-fail/copy_unaligned.rs similarity index 100% rename from tests/compile-fail-norustc/copy_unaligned.rs rename to tests/compile-fail/copy_unaligned.rs diff --git a/tests/compiletest.rs b/tests/compiletest.rs index 9394084ad3..757e8c1a64 100644 --- a/tests/compiletest.rs +++ b/tests/compiletest.rs @@ -108,13 +108,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 - // . - compile_fail("tests/compile-fail-norustc", &get_target(), opt); - } } fn test_runner(_tests: &[&()]) { From 40d647a060d4da5a3d28d92c9a782b370ab3a4f0 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Wed, 31 Jul 2019 15:28:31 +0200 Subject: [PATCH 2/3] test-miri is no longer a thing --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index e21ee98712..2eae254802 100644 --- a/README.md +++ b/README.md @@ -282,8 +282,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 From bff6b05424e9cf1a9b9afc9f5d6953ba4f1c0ea6 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Sat, 3 Aug 2019 17:27:50 +0200 Subject: [PATCH 3/3] more consistent test name --- .../compile-fail/{copy_nonoverlapping.rs => copy_overlapping.rs} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename tests/compile-fail/{copy_nonoverlapping.rs => copy_overlapping.rs} (100%) diff --git a/tests/compile-fail/copy_nonoverlapping.rs b/tests/compile-fail/copy_overlapping.rs similarity index 100% rename from tests/compile-fail/copy_nonoverlapping.rs rename to tests/compile-fail/copy_overlapping.rs