# This is a combination of 2 commits.

# This is the 1st commit message:

remove tests after they pass

# This is the commit message #2:

fixes for CI

Author: darklyspaced

src/bootstrap/failed.rs

@@ -7,19 +7,32 @@ use std::{
 
 use crate::builder::Builder;
 
+use clap::Parser;
+
 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();
+pub fn failed(builder: &Builder<'_>) {
+    let mut build: crate::Build = builder.build.clone();
+    let failed_tests = get_failed_tests();
+
+    if failed_tests.is_empty() {
+        println!("No tests failed on the previous iteration!");
+        return;
+    }
+
+    build.config.paths = failed_tests;
+    build.config.cmd = crate::flags::Flags::parse_from(["x.py", "test", "--force-rerun"]).cmd;
+
+    build.build();
 }
 
 /// 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");
+            eprintln!("Please run `x.py test` atleast once before running this command.");
             panic!();
         });
 
@@ -32,10 +45,15 @@ fn get_failed_tests() -> Vec<PathBuf> {
     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![]
+    failed_tests
+        .iter()
+        .map(|test| {
+            test.split(" ")
+                .filter(|x| {
+                    let mut chars = x.chars();
+                    !matches!(chars.nth(0).unwrap(), '[' if matches!(chars.last().unwrap(), ']'))
+                })
+                .collect::<PathBuf>()
+        })
+        .collect::<Vec<_>>()
 }

src/bootstrap/lib.rs

@@ -218,7 +218,6 @@ pub struct Build {
     in_tree_llvm_info: channel::GitInfo,
     local_rebuild: bool,
     fail_fast: bool,
-    failed: bool,
     doc_tests: DocTests,
     verbosity: usize,
 
@@ -439,7 +438,6 @@ 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,

src/bootstrap/render_tests.rs

@@ -17,7 +17,6 @@ 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
 
 pub(crate) fn add_flags_and_try_run_tests(builder: &Builder<'_>, cmd: &mut Command) -> bool {
     if cmd.get_args().position(|arg| arg == "--").is_none() {
@@ -283,6 +282,7 @@ impl<'a> Renderer<'a> {
             }
             Message::Test(TestMessage::Ok(outcome)) => {
                 self.render_test_outcome(Outcome::Ok, &outcome);
+                self.remove_failure(&outcome.name);
             }
             Message::Test(TestMessage::Ignored(outcome)) => {
                 self.render_test_outcome(
@@ -307,7 +307,7 @@ impl<'a> Renderer<'a> {
         let mut contents = String::new();
         {
             let mut file =
-                OpenOptions::new().create(true).read(true).write(true).open(TRACKER_FILE).unwrap();
+                OpenOptions::new().read(true).write(true).create(true).open(TRACKER_FILE).unwrap();
             file.read_to_string(&mut contents).unwrap();
         }
 
@@ -317,14 +317,20 @@ impl<'a> Renderer<'a> {
     }
 
     /// Add a test that failed to the list
-    #[inline]
     fn track_failure(&mut self, name: &str) {
         self.tracker.insert(String::from(name));
     }
 
+    /// Remove a test that no longer fails from the list
+    fn remove_failure(&mut self, name: &str) {
+        if self.tracker.contains(name) {
+            self.tracker.remove(name);
+        }
+    }
+
     /// Store the state of the tracker into file for retrieval on next run
     fn end_tracking(&mut self) {
-        let mut file = OpenOptions::new().write(true).open(TRACKER_FILE).unwrap();
+        let mut file = OpenOptions::new().write(true).truncate(true).open(TRACKER_FILE).unwrap();
         file.write_all(serde_json::to_string(&self.tracker).unwrap().as_bytes())
             .expect("failed to write to tracking file");
     }

src/bootstrap/suggest.rs

@@ -58,7 +58,6 @@ 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;

src/etc/completions/x.py.sh

@@ -1625,7 +1625,7 @@ _x.py() {
             return 0
             ;;
         x.py__test)
-            opts="-v -i -j -h --no-fail-fast --skip --test-args --rustc-args --no-doc --failed --doc --bless --force-rerun --only-modified --compare-mode --pass --run --rustfix-coverage --verbose --incremental --config --build-dir --build --host --target --exclude --include-default-paths --rustc-error-format --on-fail --dry-run --stage --keep-stage --keep-stage-std --src --jobs --warnings --error-format --json-output --color --llvm-skip-rebuild --rust-profile-generate --rust-profile-use --llvm-profile-use --llvm-profile-generate --reproducible-artifact --set --help [PATHS]... [ARGS]..."
+            opts="-v -i -j -h --no-fail-fast --skip --test-args --rustc-args --no-doc --failed --doc --bless --extra-checks --force-rerun --only-modified --compare-mode --pass --run --rustfix-coverage --verbose --incremental --config --build-dir --build --host --target --exclude --include-default-paths --rustc-error-format --on-fail --dry-run --stage --keep-stage --keep-stage-std --src --jobs --warnings --error-format --json-output --color --llvm-skip-rebuild --rust-profile-generate --rust-profile-use --llvm-profile-use --llvm-profile-generate --reproducible-artifact --set --help [PATHS]... [ARGS]..."
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 2 ]] ; then
                 COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
                 return 0