From 93daf27a4006f4d06f8b1653c23783ec52e93a75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Kr=C3=BCger?= Date: Sat, 6 Feb 2021 00:56:54 +0100 Subject: [PATCH] tests: ignore check_that_clippy_has_the_same_major_version_as_rustc() 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 #6683 --- tests/versioncheck.rs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/versioncheck.rs b/tests/versioncheck.rs index 76b6126c76c..bc5ed0816cc 100644 --- a/tests/versioncheck.rs +++ b/tests/versioncheck.rs @@ -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() { + return; + } + let clippy_version = rustc_tools_util::get_version_info!(); let clippy_major = clippy_version.major; let clippy_minor = clippy_version.minor;