Skip to content

Improve compile_test and dogfood tests - #5121

Merged
bors merged 4 commits into
rust-lang:masterfrom
tesuji:comptest
Feb 6, 2020
Merged

Improve compile_test and dogfood tests#5121
bors merged 4 commits into
rust-lang:masterfrom
tesuji:comptest

Conversation

@tesuji

@tesuji tesuji commented Feb 1, 2020 •
edited
Loading

Copy link
Copy Markdown
Contributor

changelog: none

@tesuji
tesuji requested a review from oli-obk February 1, 2020 16:51
@tesuji
tesuji force-pushed the comptest branch 4 times, most recently from 1deaa5f to 233740c Compare February 1, 2020 17:50
@tesuji

This comment has been minimized.

Sign in to view
@flip1995

flip1995 commented Feb 1, 2020

Copy link
Copy Markdown
Member

LGTM at first glance. I want to test the multiple matching crates bug. That would be great, if it would be fixed with that!

@tesuji
tesuji force-pushed the comptest branch 2 times, most recently from c1bebed to e1554ec Compare February 2, 2020 02:59
@tesuji

tesuji commented Feb 2, 2020

Copy link
Copy Markdown
Contributor Author

Ok. I think the code is now fine for reviewing.
I tested with and without CARGO_* env. Also without CARGO_* env, I tested with cargo uitest --target=x86_64-unknown-linux-gnu. All is fines.

@JohnTitor JohnTitor added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties label Feb 2, 2020
@tesuji

tesuji commented Feb 5, 2020

Copy link
Copy Markdown
Contributor Author

I want to test the multiple matching crates bug

One way to do that is to set global CARGO_TARGET_DIR env and compilean other project that use
regex too.

@flip1995

flip1995 commented Feb 5, 2020

Copy link
Copy Markdown
Member

I just simulated this, by changing the serde version in the Cargo.toml. And this change seems to work! 🎉

Only a small addition needs to be made:

normalized stderr:
error[E0464]: multiple matching crates for `serde_derive`
  --> $DIR/used_underscore_binding_macro.rs:6:1
   |
LL | extern crate serde_derive;
   | ^^^^^^^^^^^^^^^^^^^^^^^^^^
   |
   = note: candidates:
           crate `serde_derive`: /home/pkrones/Documents/rust-lang/rust-clippy/target/debug/deps/libserde_derive-31c80a559b9d6862.so
           crate `serde_derive`: /home/pkrones/Documents/rust-lang/rust-clippy/target/debug/deps/libserde_derive-9683f8b2d503da0f.so

This should be solved by adding serde_derive to the list of crates that need to be disambiguated.

@tesuji
tesuji force-pushed the comptest branch 2 times, most recently from 8c5c0a4 to 3485d22 Compare February 5, 2020 15:00
@flip1995

flip1995 commented Feb 5, 2020

Copy link
Copy Markdown
Member

Awesome! Thanks!

@bors r+

@bors

bors commented Feb 5, 2020

Copy link
Copy Markdown
Contributor

📌 Commit c4b4dd2 has been approved by flip1995

@bors

bors commented Feb 5, 2020

Copy link
Copy Markdown
Contributor

⌛ Testing commit c4b4dd2 with merge 185b11f...

bors added a commit that referenced this pull request Feb 5, 2020
@bors
Auto merge of #5121 - lzutao:comptest, r=flip1995
185b11f 
Improve compile_test and dogfood tests

* Hopefully this finally resolves the "multiple matching crates" error, e.g. #4015
* This handle some convenient CARGO env like CARGO_TARGET_DIR and CARGO_BUILD_TARGET

changelog: none
@bors

bors commented Feb 5, 2020

Copy link
Copy Markdown
Contributor

💔 Test failed - checks-travis

@flip1995

flip1995 commented Feb 5, 2020

Copy link
Copy Markdown
Member

@bors retry (timeout in integration test)

@bors

bors commented Feb 5, 2020

Copy link
Copy Markdown
Contributor

⌛ Testing commit c4b4dd2 with merge 45eba89...

bors added a commit that referenced this pull request Feb 5, 2020
@bors
Auto merge of #5121 - lzutao:comptest, r=flip1995
45eba89 
Improve compile_test and dogfood tests

* Hopefully this finally resolves the "multiple matching crates" error, e.g. #4015
* This handle some convenient CARGO env like CARGO_TARGET_DIR and CARGO_BUILD_TARGET

changelog: none
@bors

bors commented Feb 5, 2020

Copy link
Copy Markdown
Contributor

💔 Test failed - checks-travis

@flip1995 flip1995 added S-waiting-on-bors Status: The marked PR was approved and is only waiting bors and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties labels Feb 5, 2020
@flip1995

flip1995 commented Feb 6, 2020

Copy link
Copy Markdown
Member

@bors retry

@bors

bors commented Feb 6, 2020

Copy link
Copy Markdown
Contributor

⌛ Testing commit c4b4dd2 with merge c1f8be0...

bors added a commit that referenced this pull request Feb 6, 2020
@bors
Auto merge of #5121 - lzutao:comptest, r=flip1995
c1f8be0 
Improve compile_test and dogfood tests

* Hopefully this finally resolves the "multiple matching crates" error, e.g. #4015
* This handle some convenient CARGO env like CARGO_TARGET_DIR and CARGO_BUILD_TARGET

changelog: none
@bors

bors commented Feb 6, 2020

Copy link
Copy Markdown
Contributor

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

@bors
bors merged commit c4b4dd2 into rust-lang:master Feb 6, 2020
@tesuji
tesuji deleted the comptest branch February 6, 2020 09:57
@tesuji tesuji mentioned this pull request Feb 8, 2020
Merged
bors added a commit that referenced this pull request Feb 9, 2020
@bors
Auto merge of #5145 - lzutao:rmeta, r=flip1995
ab0cb30 
Fix error E0460 when compiled on Rustc repo

Sadly, this mostly reverts  #5121. Now I use HashMap to only store one rlib
per crate. But that would not work when non-compatible version of the same crate show up.

changelog: none
@camsteffen camsteffen mentioned this pull request Jun 10, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@oli-obk oli-obk Awaiting requested review from oli-obk

Assignees

No one assigned

Labels

S-waiting-on-bors Status: The marked PR was approved and is only waiting bors

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@tesuji @flip1995 @bors @JohnTitor