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.

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

Prepare Miri for rustc bootstrap building a separate libstd for it #870

Merged
merged 2 commits into from
Aug 2, 2019

Conversation

RalfJung
Copy link
Member

No description provided.

@RalfJung
Copy link
Member Author

r? @oli-obk

This is required for rust-lang/rust#63162, and should also still work with our old rustc integration (so there's no harm in landing it earlier then the rest).

@oli-obk
Copy link
Contributor

oli-obk commented Aug 2, 2019

@bors r+

@bors
Copy link
Contributor

bors commented Aug 2, 2019

📌 Commit 56630e0 has been approved by oli-obk

@bors
Copy link
Contributor

bors commented Aug 2, 2019

⌛ Testing commit 56630e0 with merge f0e8717...

bors added a commit that referenced this pull request Aug 2, 2019
Prepare Miri for rustc bootstrap building a separate libstd for it
@bors
Copy link
Contributor

bors commented Aug 2, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: oli-obk
Pushing f0e8717 to master...

@bors bors merged commit 56630e0 into rust-lang:master Aug 2, 2019
Centril added a commit to Centril/rust that referenced this pull request Aug 8, 2019
Miri tests: use xargo to build separate libstd

This uses `cargo miri setup` to prepare the libstd that is used for testing Miri, instead of adjusting the entire bootstrap process to make sure the libstd that already gets built is fit for Miri.

The issue with our current approach is that with `test-miri = true`, libstd and the test suite get built with `--cfg miri`, which e.g. means hashbrown uses no SIMD, and not all things are tested. Such global side-effects seem like footguns waiting to go off.

On the other hand, the new approach means we install xargo as a side-effect of doing `./x.py test src/tools/miri`, which might be surprising, and we also both have to build xargo and another libstd which costs some extra time. Not sure if the tools builders have enough time budget for that. Maybe there is a way to cache xargo?

We have to first first land rust-lang/miri#870 in Miri and then update this PR to include that change (also to get CI to test Miri before bors), but I wanted to get the review started here.

Cc @oli-obk (for Miri) @alexcrichton (for CI) @Mark-Simulacrum (for bootstrap)

Fixes rust-lang#61833, fixes rust-lang#63219
Centril added a commit to Centril/rust that referenced this pull request Aug 8, 2019
Miri tests: use xargo to build separate libstd

This uses `cargo miri setup` to prepare the libstd that is used for testing Miri, instead of adjusting the entire bootstrap process to make sure the libstd that already gets built is fit for Miri.

The issue with our current approach is that with `test-miri = true`, libstd and the test suite get built with `--cfg miri`, which e.g. means hashbrown uses no SIMD, and not all things are tested. Such global side-effects seem like footguns waiting to go off.

On the other hand, the new approach means we install xargo as a side-effect of doing `./x.py test src/tools/miri`, which might be surprising, and we also both have to build xargo and another libstd which costs some extra time. Not sure if the tools builders have enough time budget for that. Maybe there is a way to cache xargo?

We have to first first land rust-lang/miri#870 in Miri and then update this PR to include that change (also to get CI to test Miri before bors), but I wanted to get the review started here.

Cc @oli-obk (for Miri) @alexcrichton (for CI) @Mark-Simulacrum (for bootstrap)

Fixes rust-lang#61833, fixes rust-lang#63219
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants