rerun first, then do normal tests as passed through the cli

Author: jdonszelmann

src/bootstrap/src/core/build_steps/compile.rs

@@ -20,6 +20,7 @@ use serde_derive::Deserialize;
 use tracing::span;
 
 use crate::core::build_steps::gcc::{Gcc, GccOutput, GccTargetPair};
+use crate::core::build_steps::test::failed_tests::IsForRerunningTests;
 use crate::core::build_steps::tool::{RustcPrivateCompilers, SourceType, copy_lld_artifacts};
 use crate::core::build_steps::{dist, llvm};
 use crate::core::builder;
@@ -1027,7 +1028,7 @@ impl Step for Rustc {
     fn make_run(run: RunConfig<'_>) {
         // If only `compiler` was passed, do not run this step.
         // Instead the `Assemble` step will take care of compiling Rustc.
-        if run.builder.paths == vec![PathBuf::from("compiler")] {
+        if run.builder.paths(IsForRerunningTests::DontCare) == vec![PathBuf::from("compiler")] {
             return;
         }
 

src/bootstrap/src/core/build_steps/dist.rs

@@ -24,6 +24,7 @@ use crate::core::build_steps::compile::{
 };
 use crate::core::build_steps::doc::DocumentationFormat;
 use crate::core::build_steps::gcc::GccTargetPair;
+use crate::core::build_steps::test::failed_tests::IsForRerunningTests;
 use crate::core::build_steps::tool::{
     self, RustcPrivateCompilers, ToolTargetBuildMode, get_tool_target_compiler,
 };
@@ -2650,7 +2651,7 @@ impl Step for LlvmTools {
             // Prepare the image directory
             let src_bindir = builder.llvm_out(target).join("bin");
             let dst_bindir = format!("lib/rustlib/{}/bin", target.triple);
-            for tool in tools_to_install(&builder.paths) {
+            for tool in tools_to_install(builder.paths(IsForRerunningTests::DontCare)) {
                 let exe = src_bindir.join(exe(tool, target));
                 // When using `download-ci-llvm`, some of the tools may not exist, so skip trying to copy them.
                 if !exe.exists() && builder.config.llvm_from_ci {

src/bootstrap/src/core/build_steps/doc.rs

@@ -12,6 +12,7 @@ use std::path::{Path, PathBuf};
 use std::{env, fs, mem};
 
 use crate::core::build_steps::compile;
+use crate::core::build_steps::test::failed_tests::IsForRerunningTests;
 use crate::core::build_steps::tool::{
     self, RustcPrivateCompilers, SourceType, Tool, prepare_tool_cargo,
 };
@@ -436,7 +437,9 @@ impl Step for Standalone {
 
         // We open doc/index.html as the default if invoked as `x.py doc --open`
         // with no particular explicit doc requested (e.g. library/core).
-        if builder.paths.is_empty() || builder.was_invoked_explicitly::<Self>(Kind::Doc) {
+        if builder.paths(IsForRerunningTests::DontCare).is_empty()
+            || builder.was_invoked_explicitly::<Self>(Kind::Doc)
+        {
             let index = out.join("index.html");
             builder.open_in_browser(index);
         }
@@ -720,7 +723,11 @@ impl Step for Std {
 
         // Open if the format is HTML
         if let DocumentationFormat::Html = self.format {
-            if builder.paths.iter().any(|path| path.ends_with("library")) {
+            if builder
+                .paths(IsForRerunningTests::DontCare)
+                .iter()
+                .any(|path| path.ends_with("library"))
+            {
                 // For `x.py doc library --open`, open `std` by default.
                 let index = out.join("std").join("index.html");
                 builder.maybe_open_in_browser::<Self>(index);
@@ -991,7 +998,11 @@ impl Step for Rustc {
             }
         }
 
-        if builder.paths.iter().any(|path| path.ends_with("compiler")) {
+        if builder
+            .paths(IsForRerunningTests::DontCare)
+            .iter()
+            .any(|path| path.ends_with("compiler"))
+        {
             // For `x.py doc compiler --open`, open `rustc_middle` by default.
             let index = out.join("rustc_middle").join("index.html");
             builder.open_in_browser(index);