Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanup after rustc bootstrap tests Miri with a separate libstd #871

Merged
merged 3 commits into from
Aug 8, 2019
Merged

Cleanup after rustc bootstrap tests Miri with a separate libstd #871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6c545ba
the compile-fail-norustc hack is no longer needed
RalfJung Jul 31, 2019
40d647a
test-miri is no longer a thing
RalfJung Jul 31, 2019
bff6b05
more consistent test name
RalfJung Aug 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0 tests/compile-fail-norustc/copy_null.rs → tests/compile-fail/copy_null.rs
View file
Open in desktop
File renamed without changes.
0 ...mpile-fail-norustc/copy_nonoverlapping.rs → tests/compile-fail/copy_overlapping.rs
View file
Open in desktop
File renamed without changes.
0 tests/compile-fail-norustc/copy_unaligned.rs → tests/compile-fail/copy_unaligned.rs
View file
Open in desktop
File renamed without changes.
7 changes: 0 additions & 7 deletions tests/compiletest.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
// <https://github.com/rust-lang/rust/issues/61833>.
compile_fail("tests/compile-fail-norustc", &get_target(), opt);
}
}

fn test_runner(_tests: &[&()]) {
Expand Down