tests: ignore check_that_clippy_has_the_same_major_version_as_rustc()inside the rustc repo #6684
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… inside the rustc repo. Do not check if clippy version matches rustc version when runnning tests inside the rustc repo. This makes sure that upstream rustc maintainers do not have to deal with our test failing/mismatching versions when the rustc version bump is happening. cc rust-lang#6683
|
r? @flip1995 (rust-highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
flip1995
reviewed
Feb 6, 2021
| @@ -23,6 +23,12 @@ fn check_that_clippy_lints_has_the_same_version_as_clippy() { | |||
|
|
|||
| #[test] | |||
| fn check_that_clippy_has_the_same_major_version_as_rustc() { | |||
| // do not run this test inside the upstream rustc repo: | |||
| // https://github.com/rust-lang/rust-clippy/issues/6683 | |||
| if option_env!("RUSTC_TEST_SUITE").is_some() { | |||
There was a problem hiding this comment.
Couldn't you just use cargo::is_rustc_test_suite() here? If not, just r=me.
There was a problem hiding this comment.
If I use mod cargo; to make the function available in versioncheck.rs, this would need #![feature(once_cell)] inside versioncheck.rs and causes a couple of unused warnings for CARGO_TARGET_DIR and TARGET_LIB which the test does not need.
Simply copying the function body was the most straightforward way that I saw.
|
@bors r+ Thanks! |
|
📌 Commit 93daf27 has been approved by |
|
☀️ Test successful - checks-action_dev_test, checks-action_remark_test, checks-action_test |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Do not check if clippy version matches rustc version when runnning tests inside the rustc repo.
This makes sure that upstream rustc maintainers do not have to deal with our test failing/mismatching versions
when the rustc version bump is happening.
cc #6683
We already do the "don't run inside the rustc-repo" workaround for the dogfood test:
rust-clippy/tests/dogfood.rs
Line 16 in a507c27
changelog: None