diff --git a/tests/dogfood.rs b/tests/dogfood.rs index 1f03ba3950ab..944f3c2c0138 100644 --- a/tests/dogfood.rs +++ b/tests/dogfood.rs @@ -1,17 +1,19 @@ #[test] -fn dogfood() { +fn dogfood_clippy() { + // run clippy on itself and fail the test if lint warnings are reported if option_env!("RUSTC_TEST_SUITE").is_some() || cfg!(windows) { return; } let root_dir = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR")); - let clippy_cmd = std::path::Path::new(&root_dir) + let clippy_binary = std::path::Path::new(&root_dir) .join("target") .join(env!("PROFILE")) .join("cargo-clippy"); - let output = std::process::Command::new(clippy_cmd) + let output = std::process::Command::new(clippy_binary) .current_dir(root_dir) .env("CLIPPY_DOGFOOD", "1") + .env("CARGO_INCREMENTAL", "0") .arg("clippy-preview") .arg("--all-targets") .arg("--all-features") @@ -19,6 +21,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,12 +32,13 @@ fn dogfood() { } #[test] -fn dogfood_tests() { +fn dogfood_subprojects() { + // run clippy on remaining subprojects and fail the test if lint warnings are reported if option_env!("RUSTC_TEST_SUITE").is_some() || cfg!(windows) { return; } let root_dir = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR")); - let clippy_cmd = std::path::Path::new(&root_dir) + let clippy_binary = std::path::Path::new(&root_dir) .join("target") .join(env!("PROFILE")) .join("cargo-clippy"); @@ -47,13 +51,15 @@ fn dogfood_tests() { "clippy_dev", "rustc_tools_util", ] { - let output = std::process::Command::new(&clippy_cmd) + let output = std::process::Command::new(&clippy_binary) .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);