rerun failed tests

rerun failed tests

Author: jdonszelmann

src/bootstrap/src/core/build_steps/test/failed_tests.rs

@@ -1,4 +1,6 @@
-use std::fs;
+use std::collections::HashSet;
+use std::fs::{self, File};
+use std::io::{BufRead, BufReader, ErrorKind};
 use std::path::{Path, PathBuf};
 
 use crate::core::builder::{Builder, ShouldRun, Step};
@@ -31,9 +33,9 @@ impl Step for SetupFailedTestsFile {
             return RecordFailedTests { failed_tests_path: None };
         }
 
-        let failed_tests_path = builder.out.join(&builder.config.record_failed_tests_path);
+        let failed_tests_path = builder.config.record_failed_tests_path.clone();
         println!(
-            "setting up tracking of failed tests in {} (--record was passed)",
+            "setting up tracking of failed tests in {} (`--record` was passed)",
             failed_tests_path.display()
         );
         if failed_tests_path.exists() {
@@ -43,3 +45,58 @@ impl Step for SetupFailedTestsFile {
         RecordFailedTests { failed_tests_path: Some(failed_tests_path) }
     }
 }
+
+pub fn collect_previously_failed_tests(failed_tests_file_path: &PathBuf, paths: &mut Vec<PathBuf>) {
+    println!(
+        "`--rerun` passed so looking for failed tests in {}",
+        failed_tests_file_path.display()
+    );
+
+    let lines: Vec<String> = match File::open(failed_tests_file_path) {
+        Ok(f) => t!(BufReader::new(f).lines().collect()),
+        Err(e) if e.kind() == ErrorKind::NotFound => {
+            println!(
+                "WARNING: failed tests file doesn't exist: `--rerun` only makes sense after a previous test run with `--record`"
+            );
+            return;
+        }
+        Err(e) => t!(Err(e)),
+    };
+
+    let mut set_tracking_duplicates = HashSet::new();
+    let mut num_printed = 0;
+    const MAX_RERUN_PRINTS: usize = 10;
+
+    for line in lines {
+        let trimmed = line.as_str().trim();
+        let without_revision =
+            trimmed.rsplit_once("#").map(|(before, _)| before).unwrap_or(&trimmed);
+        let without_suite_prefix = without_revision
+            .strip_prefix("[")
+            .and_then(|rest| rest.split_once("]"))
+            .map(|(_, after)| after.trim())
+            .unwrap_or(without_revision);
+
+        let failed_test_path = PathBuf::from(without_suite_prefix.to_string());
+        if set_tracking_duplicates.insert(failed_test_path.clone()) {
+            if num_printed == 0 {
+                println!("rerunning previousy failed tests:");
+            }
+            if num_printed < MAX_RERUN_PRINTS {
+                println!("    {}", failed_test_path.display());
+                num_printed += 1;
+            }
+            paths.push(failed_test_path);
+        }
+    }
+
+    if num_printed == MAX_RERUN_PRINTS && set_tracking_duplicates.len() > MAX_RERUN_PRINTS {
+        println!("    and {} more...", set_tracking_duplicates.len() - MAX_RERUN_PRINTS)
+    }
+
+    if set_tracking_duplicates.is_empty() {
+        println!(
+            "WARNING: failed tests file doesn't contain any failed tests: `--rerun` only makes sense after a previous test run with `--record`"
+        );
+    }
+}

src/bootstrap/src/core/config/config.rs

@@ -30,6 +30,7 @@ use tracing::{instrument, span};
 
 use crate::core::build_steps::llvm;
 use crate::core::build_steps::llvm::LLVM_INVALIDATION_PATHS;
+use crate::core::build_steps::test::failed_tests::collect_previously_failed_tests;
 pub use crate::core::config::flags::Subcommand;
 use crate::core::config::flags::{Color, Flags, Warnings};
 use crate::core::config::target_selection::TargetSelectionList;
@@ -1307,6 +1308,19 @@ impl Config {
         );
         let verbose_tests = rust_verbose_tests.unwrap_or(exec_ctx.is_verbose());
 
+        let record_failed_tests_path =
+            out.join(build_record_failed_tests_path.unwrap_or_else(|| "failed-tests".to_string()));
+
+        let paths = {
+            let mut paths = Vec::new();
+            if flags_cmd.rerun() {
+                collect_previously_failed_tests(&record_failed_tests_path, &mut paths);
+            } else {
+                paths.extend(flags_paths);
+            }
+            paths
+        };
+
         Config {
             // tidy-alphabetical-start
             android_ndk: build_android_ndk,
@@ -1437,16 +1451,14 @@ impl Config {
             out,
             patch_binaries_for_nix: build_patch_binaries_for_nix,
             path_modification_cache,
-            paths: flags_paths,
+            paths,
             prefix: install_prefix.map(PathBuf::from),
             print_step_rusage: build_print_step_rusage.unwrap_or(false),
             print_step_timings: build_print_step_timings.unwrap_or(false),
             profiler: build_profiler.unwrap_or(false),
             python: build_python.map(PathBuf::from),
             quiet: flags_quiet,
-            record_failed_tests_path: build_record_failed_tests_path
-                .unwrap_or_else(|| "failed-tests".to_string())
-                .into(),
+            record_failed_tests_path,
             reproducible_artifacts: flags_reproducible_artifact,
             reuse: build_reuse.map(PathBuf::from),
             rust_analyzer_info,

src/bootstrap/src/utils/render_tests.rs

@@ -113,7 +113,7 @@ impl<'a> Renderer<'a> {
                 Ok(f) => Some(f),
                 Err(e) => {
                     println!(
-                        "Couldn't open file {} to write test failutes to: {e}. (attempted because --record was passed). Test failures will not be recorded.",
+                        "Couldn't open file {} to write test failutes to: {e}. (attempted because `--record` was passed). Test failures will not be recorded.",
                         path.display()
                     );
                     None
@@ -394,7 +394,7 @@ impl<'a> Renderer<'a> {
                 if let Some(failed_tests) = &mut self.failed_tests {
                     if let Err(e) = writeln!(failed_tests, "{}", outcome.name) {
                         eprintln!(
-                            "failed to write test failure to file: {e} (attempted because --record was passed)"
+                            "failed to write test failure to file: {e} (attempted because `--record` was passed)"
                         );
                     }
                 }