From 5319203aa329beeabf69b05cd233827ccf78b1d3 Mon Sep 17 00:00:00 2001 From: Oliver Schneider Date: Thu, 2 Nov 2017 11:27:06 +0100 Subject: [PATCH] Reenable clippy testing --- src/Cargo.lock | 16 ++++++++++------ src/bootstrap/check.rs | 4 ++++ src/tools/clippy | 2 +- src/tools/toolstate.toml | 2 +- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/Cargo.lock b/src/Cargo.lock index 7f532a8fef7..bc203049453 100644 --- a/src/Cargo.lock +++ b/src/Cargo.lock @@ -269,12 +269,12 @@ dependencies = [ [[package]] name = "clippy" -version = "0.0.166" +version = "0.0.171" dependencies = [ "cargo_metadata 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "clippy-mini-macro-test 0.1.0", - "clippy_lints 0.0.166", - "compiletest_rs 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "clippy_lints 0.0.171", + "compiletest_rs 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "duct 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)", "regex 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -288,7 +288,7 @@ version = "0.1.0" [[package]] name = "clippy_lints" -version = "0.0.166" +version = "0.0.171" dependencies = [ "if_chain 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "itertools 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -354,9 +354,13 @@ dependencies = [ [[package]] name = "compiletest_rs" -version = "0.2.10" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ + "diff 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "filetime 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", + "getopts 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2606,7 +2610,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum cmake 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)" = "357c07e7a1fc95732793c1edb5901e1a1f305cfcf63a90eb12dbd22bdb6b789d" "checksum commoncrypto 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d056a8586ba25a1e4d61cb090900e495952c7886786fc55f909ab2f819b69007" "checksum commoncrypto-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1fed34f46747aa73dfaa578069fd8279d2818ade2b55f38f22a9401c7f4083e2" -"checksum compiletest_rs 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "2741d378feb7a434dba54228c89a70b4e427fee521de67cdda3750b8a0265f5a" +"checksum compiletest_rs 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "86f4663adfd113e17109c35c2067194eca782a5baf9c90f4696ca13d04631adb" "checksum core-foundation 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5909502e547762013619f4c4e01cc7393c20fe2d52d7fa471c1210adb2320dc7" "checksum core-foundation-sys 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "bc9fb3d6cb663e6fd7cf1c63f9b144ee2b1e4a78595a0451dd34bff85b9a3387" "checksum crossbeam 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "0c5ea215664ca264da8a9d9c3be80d2eaf30923c259d03e870388eb927508f97" diff --git a/src/bootstrap/check.rs b/src/bootstrap/check.rs index 11bc9f7d217..1401bc80a1a 100644 --- a/src/bootstrap/check.rs +++ b/src/bootstrap/check.rs @@ -402,6 +402,10 @@ impl Step for Clippy { cargo.env("RUSTC_NO_PREFER_DYNAMIC", "1"); // clippy tests need to know about the stage sysroot cargo.env("SYSROOT", builder.sysroot(compiler)); + cargo.env("RUSTC_TEST_SUITE", builder.rustc(compiler)); + cargo.env("RUSTC_LIB_PATH", builder.rustc_libdir(compiler)); + let host_libs = builder.stage_out(compiler, Mode::Tool).join(builder.cargo_dir()); + cargo.env("HOST_LIBS", host_libs); // clippy tests need to find the driver cargo.env("CLIPPY_DRIVER_PATH", clippy); diff --git a/src/tools/clippy b/src/tools/clippy index f76225e3887..1f6e2a63d89 160000 --- a/src/tools/clippy +++ b/src/tools/clippy @@ -1 +1 @@ -Subproject commit f76225e3887170743403af9204887918b5db5a80 +Subproject commit 1f6e2a63d89e485df6a3ee9df3e8ffbfddf26330 diff --git a/src/tools/toolstate.toml b/src/tools/toolstate.toml index f1684f4c5ac..744a0f96ad7 100644 --- a/src/tools/toolstate.toml +++ b/src/tools/toolstate.toml @@ -26,7 +26,7 @@ miri = "Broken" # ping @Manishearth @llogiq @mcarton @oli-obk -clippy = "Broken" +clippy = "Testing" # ping @nrc rls = "Testing"