Auto merge of #45715 - oli-obk:clippy, r=kennytm

Reenable clippy testing fixes #45680
rust-lang · Nov 15, 2017 · ce2b8a4 · ce2b8a4
2 parents 3707db9 + 5319203
commit ce2b8a4
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/src/Cargo.lock b/src/Cargo.lock
diff --git 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
diff --git 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"