Use dogfood_runner for deterministic test ordering

rust-lang · Dec 6, 2018 · 66251c3 · 66251c3
1 parent 1db535a
commit 66251c3
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/tests/dogfood.rs b/tests/dogfood.rs
@@ -8,14 +8,19 @@
 // except according to those terms.
 
 #[test]
+fn dogfood_runner() {
+    dogfood();
+    dogfood_tests();
+}
+
 fn dogfood() {
     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).join("target/debug/cargo-clippy");
 
-    println!("{:?}", clippy_cmd);
+    std::env::set_current_dir(root_dir).unwrap();
     let output = std::process::Command::new(clippy_cmd)
         .arg("clippy")
         .arg("--all-targets")
@@ -33,7 +38,6 @@ fn dogfood() {
     assert!(output.status.success());
 }
 
-#[test]
 fn dogfood_tests() {
     if option_env!("RUSTC_TEST_SUITE").is_some() || cfg!(windows) {
         return;
@@ -64,5 +68,4 @@ fn dogfood_tests() {
 
         assert!(output.status.success());
     }
-    std::env::set_current_dir(root_dir).unwrap();
 }