fix self_tests

Author: rchaser53

rustfmt-core/rustfmt-lib/src/test/mod.rs

@@ -7,9 +7,7 @@ use std::path::{Path, PathBuf};
 use std::str::Chars;
 use std::thread;
 
-use rustfmt_emitter::rustfmt_diff::{
-    make_diff, print_diff, Mismatch, ModifiedChunk, OutputWriter,
-};
+use rustfmt_emitter::rustfmt_diff::{make_diff, print_diff, Mismatch, ModifiedChunk, OutputWriter};
 
 use crate::config::{Color, Config, EmitMode, FileName, NewlineStyle, ReportTactic};
 use crate::formatting::{ReportedErrors, SourceFile};
@@ -96,7 +94,7 @@ fn is_file_skip(path: &Path) -> bool {
 // Returns a `Vec` containing `PathBuf`s of files with an  `rs` extension in the
 // given path. The `recursive` argument controls if files from subdirectories
 // are also returned.
-fn get_test_files(path: &Path, recursive: bool) -> Vec<PathBuf> {
+fn get_test_files(path: &Path, recursive: bool, is_file_skip: fn(&Path) -> bool) -> Vec<PathBuf> {
     let mut files = vec![];
     if path.is_dir() {
         for entry in fs::read_dir(path)
@@ -105,7 +103,7 @@ fn get_test_files(path: &Path, recursive: bool) -> Vec<PathBuf> {
             let entry = entry.expect("couldn't get `DirEntry`");
             let path = entry.path();
             if path.is_dir() && recursive {
-                files.append(&mut get_test_files(&path, recursive));
+                files.append(&mut get_test_files(&path, recursive, is_file_skip));
             } else if path.extension().map_or(false, |f| f == "rs") && !is_file_skip(&path) {
                 files.push(path);
             }
@@ -179,7 +177,7 @@ fn system_tests() {
     init_log();
     run_test_with(&TestSetting::default(), || {
         // Get all files in the tests/source directory.
-        let files = get_test_files(Path::new("tests/source"), true);
+        let files = get_test_files(Path::new("tests/source"), true, is_file_skip);
         let (_reports, count, fails) = check_files(files, &None);
 
         // Display results.
@@ -198,7 +196,7 @@ fn system_tests() {
 #[test]
 fn coverage_tests() {
     init_log();
-    let files = get_test_files(Path::new("tests/coverage/source"), true);
+    let files = get_test_files(Path::new("tests/coverage/source"), true, is_file_skip);
     let (_reports, count, fails) = check_files(files, &None);
 
     println!("Ran {} tests in coverage mode.", count);
@@ -362,7 +360,7 @@ fn idempotence_tests() {
             return;
         }
         // Get all files in the tests/target directory.
-        let files = get_test_files(Path::new("tests/target"), true);
+        let files = get_test_files(Path::new("tests/target"), true, is_file_skip);
         let (_reports, count, fails) = check_files(files, &None);
 
         // Display results.
@@ -380,12 +378,19 @@ fn idempotence_tests() {
 // no warnings are emitted.
 #[test]
 fn self_tests() {
+    fn is_file_skip(path: &Path) -> bool {
+        let skip_file_white_list = ["target", "tests"];
+        skip_file_white_list
+            .iter()
+            .any(|file_path| is_subpath(path, file_path))
+    }
+
     init_log();
     // Issue-3443: these tests require nightly
     if !is_nightly_channel!() {
         return;
     }
-    let mut files = get_test_files(Path::new("tests"), false);
+    let mut files = get_test_files(Path::new("../../rustfmt-core"), true, is_file_skip);
     files.push(PathBuf::from("src/lib.rs"));
 
     let (reports, count, fails) = check_files(files, &Some(PathBuf::from("../../rustfmt.toml")));
@@ -809,4 +814,3 @@ fn string_eq_ignore_newline_repr_test() {
     assert!(string_eq_ignore_newline_repr("a\r\n\r\n\r\nb", "a\n\n\nb"));
     assert!(!string_eq_ignore_newline_repr("a\r\nbcd", "a\nbcdefghijk"));
 }
-