diff options
| author | flip1995 <philipp.krones@embecosm.com> | 2021-02-25 11:25:45 +0100 |
|---|---|---|
| committer | flip1995 <philipp.krones@embecosm.com> | 2021-02-25 11:25:45 +0100 |
| commit | b303f7d6f9bcd3f0fbb7c3cec5dc3e0afdc84ac4 (patch) | |
| tree | 0f2f1f3debbe08234dff7e8d10afeb03d012231f | |
| parent | f64149dd04514e850374d2b94ecc91ce18d1b39e (diff) | |
| download | rust-b303f7d6f9bcd3f0fbb7c3cec5dc3e0afdc84ac4.tar.gz rust-b303f7d6f9bcd3f0fbb7c3cec5dc3e0afdc84ac4.zip | |
Fix Clippy build and test
| -rw-r--r-- | Cargo.toml | 3 | ||||
| -rw-r--r-- | tests/versioncheck.rs | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/Cargo.toml b/Cargo.toml index 1d6bf1ea0eb..ea32a8edd1f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,9 +18,6 @@ build = "build.rs" edition = "2018" publish = false -[workspace] -exclude = ["clippy_dev", "mini-macro", "target/lintcheck/crates"] - [[bin]] name = "cargo-clippy" test = false diff --git a/tests/versioncheck.rs b/tests/versioncheck.rs index 1c954c57a85..922a8207cea 100644 --- a/tests/versioncheck.rs +++ b/tests/versioncheck.rs @@ -3,6 +3,12 @@ use rustc_tools_util::VersionInfo; #[test] fn check_that_clippy_lints_and_clippy_utils_have_the_same_version_as_clippy() { + // 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_meta = cargo_metadata::MetadataCommand::new() .no_deps() .exec() |