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

Fix compile-test from forcing a rebuild. #4115

Merged
merged 1 commit into from May 19, 2019

Conversation

ehuss
Copy link
Contributor

@ehuss ehuss commented May 19, 2019

If the compile-test test was run, then running a cargo build command immediately after caused everything to be rebuilt. This is because the compile-test test was deleting all .rmeta files in the target directory. Cargo recently switched to always generating .rmeta files (rust-lang/cargo#6883), and when the files are deleted, it thinks it needs to be rebuilt.

I am not very familiar with compiletest or clippy, so please take a close look and test this out (with the most recent nightly). In particular, make sure it doesn't revert the fixes from #3380 (it seems to work for me). Also @oli-obk mentioned something related in rust-lang/rust#60190 (comment), and I want to make sure that is addressed as well.

Fixes #4114

@Manishearth
Copy link
Member

Yeah, I think that fix is back from a time when cargo was worse at dealing with multiple crates.

@bors r+

@bors
Copy link
Collaborator

bors commented May 19, 2019

📌 Commit a8bf501 has been approved by Manishearth

@bors
Copy link
Collaborator

bors commented May 19, 2019

⌛ Testing commit a8bf501 with merge cbae9ed...

bors added a commit that referenced this pull request May 19, 2019
Fix compile-test from forcing a rebuild.

If the `compile-test` test was run, then running a cargo build command immediately after caused everything to be rebuilt. This is because the `compile-test` test was deleting all `.rmeta` files in the target directory. Cargo recently switched to always generating `.rmeta` files (rust-lang/cargo#6883), and when the files are deleted, it thinks it needs to be rebuilt.

I am not very familiar with compiletest or clippy, so please take a close look and test this out (with the most recent nightly). In particular, make sure it doesn't revert the fixes from #3380 (it seems to work for me). Also @oli-obk mentioned something related in rust-lang/rust#60190 (comment), and I want to make sure that is addressed as well.

Fixes #4114
@oli-obk
Copy link
Contributor

oli-obk commented May 19, 2019

We'll need to check if we can revert 568a3ec after this PR

@bors
Copy link
Collaborator

bors commented May 19, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: Manishearth
Pushing cbae9ed to master...

@bors bors merged commit a8bf501 into rust-lang:master May 19, 2019
bors added a commit that referenced this pull request May 20, 2019
Revert "Turn off two tests broken due to #4108"

This reverts commit 568a3ec which is unnecessary after #4115

changelog: none
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.

compiletest test causes everything to rebuild
4 participants