Change explicit_counter_loop's message to add parentheses if necessary

[rust.git] / tests / dogfood.rs

diff --git a/tests/dogfood.rs b/tests/dogfood.rs
index 2f2b0cf50acf62cb4236008ca1e20f180a868e66..27a3d84da4127a972ce3c912550354b97234ad4d 100644 (file)
--- a/tests/dogfood.rs
+++ b/tests/dogfood.rs
@@ -1,22 +1,17 @@
-// Copyright 2014-2018 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 #[test]
 fn dogfood() {
-    if option_env!("RUSTC_TEST_SUITE").is_some() || cfg!(windows) {
+    if option_env!("RUSTC_TEST_SUITE").is_some() {
         return;
     }
     let root_dir = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR"));
-    let clippy_cmd = std::path::Path::new(&root_dir).join("target/debug/cargo-clippy");
+    let clippy_cmd = std::path::Path::new(&root_dir)
+        .join("target")
+        .join(env!("PROFILE"))
+        .join("cargo-clippy");
 
-    println!("{:?}", clippy_cmd);
     let output = std::process::Command::new(clippy_cmd)
+        .current_dir(root_dir)
+        .env("CLIPPY_DOGFOOD", "1")
         .arg("clippy")
         .arg("--all-targets")
         .arg("--all-features")
@@ -35,10 +30,14 @@ fn dogfood() {
 
 #[test]
 fn dogfood_tests() {
-    if option_env!("RUSTC_TEST_SUITE").is_some() || cfg!(windows) {
+    if option_env!("RUSTC_TEST_SUITE").is_some() {
         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");
 
     for d in &[
         "clippy_workspace_tests",
@@ -48,10 +47,9 @@ fn dogfood_tests() {
         "clippy_dev",
         "rustc_tools_util",
     ] {
-        let clippy_cmd = std::path::Path::new(&root_dir)
-            .join("target/debug/cargo-clippy");
-        std::env::set_current_dir(root_dir.join(d)).unwrap();
-        let output = std::process::Command::new(clippy_cmd)
+        let output = std::process::Command::new(&clippy_cmd)
+            .current_dir(root_dir.join(d))
+            .env("CLIPPY_DOGFOOD", "1")
             .arg("clippy")
             .arg("--")
             .args(&["-D", "clippy::all"])
@@ -64,5 +62,4 @@ fn dogfood_tests() {
 
         assert!(output.status.success());
     }
-    std::env::set_current_dir(root_dir).unwrap();
 }