Add find_files helper function to run-make-support

Author: Oneirical

src/tools/run-make-support/src/lib.rs

@@ -247,23 +247,16 @@ pub fn test_while_readonly<P: AsRef<Path>, F: FnOnce() + std::panic::UnwindSafe>
     success.unwrap();
 }
 
-/// Browse the directory `path` non-recursively and return the first file path which starts with `prefix` and has the
-/// file extension `extension`.
+/// Browse the directory `path` non-recursively and return all files which respect the parameters
+/// outlined by `closure`.
 #[track_caller]
-pub fn find_files_by_prefix_and_extension<P: AsRef<Path>>(
-    path: P,
-    prefix: &str,
-    extension: &str,
-) -> Vec<PathBuf> {
+pub fn find_files<P: AsRef<Path>, F: Fn(&PathBuf) -> bool>(path: P, closure: F) -> Vec<PathBuf> {
     let mut matching_files = Vec::new();
     for entry in fs_wrapper::read_dir(path) {
         let entry = entry.expect("failed to read directory entry.");
         let path = entry.path();
 
-        if path.is_file()
-            && path.file_name().unwrap().to_str().unwrap().starts_with(prefix)
-            && path.extension().unwrap().to_str().unwrap() == extension
-        {
+        if path.is_file() && closure(&path) {
             matching_files.push(path);
         }
     }
@@ -275,6 +268,16 @@ pub fn find_files_by_prefix_and_extension<P: AsRef<Path>>(
     }
 }
 
+/// Returns true if the filename at `path` starts with `prefix`.
+pub fn has_prefix<P: AsRef<Path>>(path: P, prefix: &str) -> bool {
+    path.as_ref().file_name().unwrap().to_str().unwrap().starts_with(prefix)
+}
+
+/// Returns true if the filename at `path` has the extension `extension`.
+pub fn has_extension<P: AsRef<Path>>(path: P, extension: &str) -> bool {
+    path.as_ref().extension().unwrap().to_str().unwrap() == extension
+}
+
 /// Use `cygpath -w` on a path to get a Windows path string back. This assumes that `cygpath` is
 /// available on the platform!
 #[track_caller]

tests/run-make/pgo-gen/rmake.rs

@@ -6,13 +6,15 @@
 //@ needs-profiler-support
 //@ ignore-cross-compile
 
-use run_make_support::{cwd, find_files_by_prefix_and_extension, run, rustc};
+use run_make_support::{cwd, find_files, has_extension, has_prefix, run, rustc};
 
 fn main() {
-    rustc().arg("-g").profile_generate(cwd()).run();
+    rustc().arg("-g").profile_generate(cwd()).input("test.rs").run();
     run("test");
     assert!(
-        find_files_by_prefix_and_extension(cwd(), "default", "profraw").len() > 0,
+        find_files(cwd(), |path| { has_prefix(path, "default") && has_extension(path, "profraw") })
+            .len()
+            > 0,
         "no .profraw file generated"
     );
 }

tests/run-make/pgo-use/rmake.rs

@@ -9,7 +9,7 @@
 //@ ignore-cross-compile
 
 use run_make_support::{
-    cwd, find_files_by_prefix_and_extension, fs_wrapper, llvm_filecheck, llvm_profdata,
+    cwd, find_files, fs_wrapper, has_extension, has_prefix, llvm_filecheck, llvm_profdata,
     run_with_args, rustc,
 };
 
@@ -31,7 +31,10 @@ fn main() {
     llvm_profdata()
         .merge()
         .output("merged.profdata")
-        .input(find_files_by_prefix_and_extension(cwd(), "default", "profraw").get(0).unwrap())
+        .input(
+            find_files(cwd(), |path| has_prefix(path, "default") && has_extension(path, "profraw"))
+                [0],
+        )
         .run();
     // Compile the test program again, making use of the profiling data
     rustc()
@@ -48,7 +51,7 @@ fn main() {
     // line with the function name before the line with the function attributes.
     // FileCheck only supports checking that something matches on the next line,
     // but not if something matches on the previous line.
-    let mut bytes = fs_wrapper::read("interesting.ll");
+    let mut bytes = fs_wrapper::read("main.ll");
     bytes.reverse();
     llvm_filecheck().patterns("filecheck-patterns.txt").stdin(bytes).run();
 }