custom routine for --failed flag

Author: darklyspaced

src/bootstrap/builder/tests.rs

@@ -576,6 +576,7 @@ mod dist {
         config.cmd = Subcommand::Test {
             test_args: vec![],
             rustc_args: vec![],
+            failed: false,
             no_fail_fast: false,
             no_doc: true,
             doc: false,
@@ -649,6 +650,7 @@ mod dist {
             test_args: vec![],
             rustc_args: vec![],
             no_fail_fast: false,
+            failed: false,
             doc: true,
             no_doc: false,
             skip: vec![],

src/bootstrap/failed.rs

@@ -0,0 +1,41 @@
+use std::{
+    collections::HashSet,
+    fs::File,
+    io::Read,
+    path::{Path, PathBuf},
+};
+
+use crate::builder::Builder;
+
+pub const TRACKER_FILE: &'static str = "./src/bootstrap/test.tracker";
+
+/// Runs all the tests that failed on their last run
+pub fn failed(_builder: &Builder<'_>) {
+    let _failed_tests = get_failed_tests();
+}
+
+/// Returns a list of paths of tests that failed the last time that they were run
+fn get_failed_tests() -> Vec<PathBuf> {
+    let contents = {
+        let path = Path::new(TRACKER_FILE);
+        let mut f = File::open(path).unwrap_or_else(|_| {
+            eprintln!("Please run `x.py test` atleast once before running this command");
+            panic!();
+        });
+
+        let mut buf = String::new();
+        f.read_to_string(&mut buf).expect(&format!("failed to read {}", TRACKER_FILE));
+
+        buf
+    };
+
+    let failed_tests =
+        serde_json::from_str::<HashSet<&str>>(&contents).expect("failed to deserialise tracker");
+
+    for test in failed_tests {
+        let test = test.split(" ").collect::<Vec<_>>();
+        println!("{:?}", test);
+    }
+
+    vec![]
+}

src/bootstrap/lib.rs

@@ -50,6 +50,7 @@ mod config;
 mod dist;
 mod doc;
 mod download;
+mod failed;
 mod flags;
 mod format;
 mod install;
@@ -217,6 +218,7 @@ pub struct Build {
     in_tree_llvm_info: channel::GitInfo,
     local_rebuild: bool,
     fail_fast: bool,
+    failed: bool,
     doc_tests: DocTests,
     verbosity: usize,
 
@@ -437,6 +439,7 @@ impl Build {
             initial_libdir,
             initial_sysroot: initial_sysroot.into(),
             local_rebuild: config.local_rebuild,
+            failed: config.cmd.failed(),
             fail_fast: config.cmd.fail_fast(),
             doc_tests: config.cmd.doc_tests(),
             verbosity: config.verbose,
@@ -673,11 +676,16 @@ impl Build {
         // Download rustfmt early so that it can be used in rust-analyzer configs.
         let _ = &builder::Builder::new(&self).initial_rustfmt();
 
-        // hardcoded subcommands
+        // hardcoded subcommands and flags
         match &self.config.cmd {
             Subcommand::Format { check } => {
                 return format::format(&builder::Builder::new(&self), *check, &self.config.paths);
             }
+            Subcommand::Test { failed, .. } => {
+                if *failed {
+                    return failed::failed(&builder::Builder::new(&self));
+                }
+            }
             Subcommand::Suggest { run } => {
                 return suggest::suggest(&builder::Builder::new(&self), *run);
             }

src/bootstrap/render_tests.rs

@@ -5,18 +5,19 @@
 //! about the executed tests. Doing so suppresses the human-readable output, and (compared to Cargo
 //! and rustc) libtest doesn't include the rendered human-readable output as a JSON field. We had
 //! to reimplement all the rendering logic in this module because of that.
-
-use crate::builder::Builder;
 use std::collections::HashSet;
 use std::fs::OpenOptions;
 use std::io::{BufRead, BufReader, Read, Write};
 use std::process::{ChildStdout, Command, Stdio};
 use std::time::Duration;
+
+use crate::builder::Builder;
+use crate::failed::TRACKER_FILE;
+
 use termcolor::{Color, ColorSpec, WriteColor};
 
 const TERSE_TESTS_PER_LINE: usize = 88;
 #[allow(unused)] // FIXME unused warning even though it is
-const TRACKER_FILE: &'static str = "./src/bootstrap/test.tracker";
 
 pub(crate) fn add_flags_and_try_run_tests(builder: &Builder<'_>, cmd: &mut Command) -> bool {
     if cmd.get_args().position(|arg| arg == "--").is_none() {

src/bootstrap/suggest.rs

@@ -1,8 +1,6 @@
 #![cfg_attr(feature = "build-metrics", allow(unused))]
 
-use std::str::FromStr;
-
-use std::path::PathBuf;
+use std::{path::PathBuf, str::FromStr};
 
 use clap::Parser;
 
@@ -60,6 +58,7 @@ pub fn suggest(builder: &Builder<'_>, run: bool) {
 
     if run {
         for sug in suggestions {
+            println!("paths: {:?}", &sug.2);
             let mut build: crate::Build = builder.build.clone();
             build.config.paths = sug.2;
             build.config.cmd = crate::flags::Flags::parse_from(["x.py", sug.0]).cmd;