X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=tests%2Fdogfood.rs;h=81af3d3033b23c268a152258d74a30a8cd0d4ecc;hb=e820a03d1c905d58b27d7ac6d85f450f9754ba79;hp=4153c9ef06e4cc2731f75e40c8f15387abc57188;hpb=1cf5d7f04cc73f99ee19be6b93304666f5845665;p=rust.git diff --git a/tests/dogfood.rs b/tests/dogfood.rs index 4153c9ef06e..81af3d3033b 100644 --- a/tests/dogfood.rs +++ b/tests/dogfood.rs @@ -1,17 +1,28 @@ +// Dogfood cannot run on Windows +#![cfg(not(windows))] + +use lazy_static::lazy_static; +use std::path::PathBuf; +use std::process::Command; + +mod cargo; + +lazy_static! { + static ref CLIPPY_PATH: PathBuf = cargo::TARGET_LIB.join("cargo-clippy"); +} + #[test] -fn dogfood() { - if option_env!("RUSTC_TEST_SUITE").is_some() { +fn dogfood_clippy() { + // run clippy on itself and fail the test if lint warnings are reported + if cargo::is_rustc_test_suite() { return; } - let root_dir = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR")); - let clippy_cmd = std::path::Path::new(&root_dir) - .join("target") - .join(env!("PROFILE")) - .join("cargo-clippy"); + let root_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR")); - let output = std::process::Command::new(clippy_cmd) + let output = Command::new(&*CLIPPY_PATH) .current_dir(root_dir) .env("CLIPPY_DOGFOOD", "1") + .env("CARGO_INCREMENTAL", "0") .arg("clippy-preview") .arg("--all-targets") .arg("--all-features") @@ -19,6 +30,7 @@ fn dogfood() { .args(&["-D", "clippy::all"]) .args(&["-D", "clippy::internal"]) .args(&["-D", "clippy::pedantic"]) + .arg("-Cdebuginfo=0") // disable debuginfo to generate less data in the target dir .output() .unwrap(); println!("status: {}", output.status); @@ -29,15 +41,12 @@ fn dogfood() { } #[test] -fn dogfood_tests() { - if option_env!("RUSTC_TEST_SUITE").is_some() { +fn dogfood_subprojects() { + // run clippy on remaining subprojects and fail the test if lint warnings are reported + if cargo::is_rustc_test_suite() { return; } - let root_dir = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR")); - let clippy_cmd = std::path::Path::new(&root_dir) - .join("target") - .join(env!("PROFILE")) - .join("cargo-clippy"); + let root_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR")); for d in &[ "clippy_workspace_tests", @@ -47,13 +56,15 @@ fn dogfood_tests() { "clippy_dev", "rustc_tools_util", ] { - let output = std::process::Command::new(&clippy_cmd) + let output = Command::new(&*CLIPPY_PATH) .current_dir(root_dir.join(d)) .env("CLIPPY_DOGFOOD", "1") + .env("CARGO_INCREMENTAL", "0") .arg("clippy") .arg("--") .args(&["-D", "clippy::all"]) .args(&["-D", "clippy::pedantic"]) + .arg("-Cdebuginfo=0") // disable debuginfo to generate less data in the target dir .output() .unwrap(); println!("status: {}", output.status);