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 286af42fd914ac9c2c1309e5dca41beb753c55bb..27a3d84da4127a972ce3c912550354b97234ad4d 100644 (file)
--- a/tests/dogfood.rs
+++ b/tests/dogfood.rs
@@ -1,20 +1,6 @@
-// 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_runner() {
-    dogfood();
-    dogfood_tests();
-}
-
 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"));
@@ -23,8 +9,8 @@ fn dogfood() {
         .join(env!("PROFILE"))
         .join("cargo-clippy");
 
-    std::env::set_current_dir(root_dir).unwrap();
     let output = std::process::Command::new(clippy_cmd)
+        .current_dir(root_dir)
         .env("CLIPPY_DOGFOOD", "1")
         .arg("clippy")
         .arg("--all-targets")
@@ -42,8 +28,9 @@ fn dogfood() {
     assert!(output.status.success());
 }
 
+#[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"));
@@ -60,8 +47,8 @@ fn dogfood_tests() {
         "clippy_dev",
         "rustc_tools_util",
     ] {
-        std::env::set_current_dir(root_dir.join(d)).unwrap();
         let output = std::process::Command::new(&clippy_cmd)
+            .current_dir(root_dir.join(d))
             .env("CLIPPY_DOGFOOD", "1")
             .arg("clippy")
             .arg("--")