dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix dogfood to use cargo mod too

This commit is contained in:
Lzu Tao 2020-02-02 00:00:48 +07:00
parent 4c2a5f857a
commit 47abd0a217
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
tests/dogfood.rs
View File

@ -1,16 +1,24 @@
use std::path::PathBuf;
use std::process::Command;
#[allow(dead_code)]
mod cargo;
fn clippy_path() -> PathBuf {
let build_info = cargo::BuildInfo::new();
build_info.target_lib().join("cargo-clippy")
}
#[test] #[test]
fn dogfood_clippy() { fn dogfood_clippy() {
// run clippy on itself and fail the test if lint warnings are reported // run clippy on itself and fail the test if lint warnings are reported
if option_env!("RUSTC_TEST_SUITE").is_some() || cfg!(windows) { if option_env!("RUSTC_TEST_SUITE").is_some() || cfg!(windows) {
return; return;
} }
let root_dir = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR")); let root_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
let clippy_binary = std::path::Path::new(&root_dir) let clippy_binary = clippy_path();
.join("target")
.join(env!("PROFILE"))
.join("cargo-clippy");
let output = std::process::Command::new(clippy_binary) let output = Command::new(clippy_binary)
.current_dir(root_dir) .current_dir(root_dir)
.env("CLIPPY_DOGFOOD", "1") .env("CLIPPY_DOGFOOD", "1")
.env("CARGO_INCREMENTAL", "0") .env("CARGO_INCREMENTAL", "0")
@ -37,11 +45,8 @@ fn dogfood_subprojects() {
if option_env!("RUSTC_TEST_SUITE").is_some() || cfg!(windows) { if option_env!("RUSTC_TEST_SUITE").is_some() || cfg!(windows) {
return; return;
} }
let root_dir = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR")); let root_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
let clippy_binary = std::path::Path::new(&root_dir) let clippy_binary = clippy_path();
.join("target")
.join(env!("PROFILE"))
.join("cargo-clippy");
for d in &[ for d in &[
"clippy_workspace_tests", "clippy_workspace_tests",
@ -51,7 +56,7 @@ fn dogfood_subprojects() {
"clippy_dev", "clippy_dev",
"rustc_tools_util", "rustc_tools_util",
] { ] {
let output = std::process::Command::new(&clippy_binary) let output = Command::new(&clippy_binary)
.current_dir(root_dir.join(d)) .current_dir(root_dir.join(d))
.env("CLIPPY_DOGFOOD", "1") .env("CLIPPY_DOGFOOD", "1")
.env("CARGO_INCREMENTAL", "0") .env("CARGO_INCREMENTAL", "0")