extend test coverage for std build

Signed-off-by: onur-ozkan <[email protected]>

Author: onur-ozkan

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

@@ -111,6 +111,12 @@ impl Std {
         }
         deps
     }
+
+    #[cfg(feature = "bootstrap-self-test")]
+    pub fn crates(mut self, crates: Vec<String>) -> Self {
+        self.crates = crates;
+        self
+    }
 }
 
 impl Step for Std {

src/bootstrap/src/core/builder/tests.rs

@@ -42,7 +42,8 @@ fn first<A, B>(v: Vec<(A, B)>) -> Vec<A> {
     v.into_iter().map(|(a, _)| a).collect::<Vec<_>>()
 }
 
-fn run_build(paths: &[PathBuf], config: Config) -> Cache {
+fn run_build(paths: &[PathBuf], mut config: Config) -> Cache {
+    config.paths.extend(paths.to_vec());
     let kind = config.cmd.kind();
     let build = Build::new(config);
     let builder = Builder::new(&build);
@@ -58,18 +59,32 @@ fn check_cli<const N: usize>(paths: [&str; N]) {
 }
 
 macro_rules! std {
-    ($host:ident => $target:ident, stage = $stage:literal) => {
-        compile::Std::new(
-            Compiler {
-                host: TargetSelection::from_user(concat!(
-                    stringify!($host),
-                    "-",
-                    stringify!($host)
-                )),
-                stage: $stage,
-            },
-            TargetSelection::from_user(concat!(stringify!($target), "-", stringify!($target))),
-        )
+    ($host:ident => $target:ident, stage = $stage:literal $(,force_recompile = $force_recompile:literal)?) => {
+        if false $(|| $force_recompile)? {
+            compile::Std::force_recompile(
+                Compiler {
+                    host: TargetSelection::from_user(concat!(
+                                  stringify!($host),
+                                  "-",
+                                  stringify!($host)
+                          )),
+                          stage: $stage,
+                },
+                TargetSelection::from_user(concat!(stringify!($target), "-", stringify!($target))),
+            )
+        } else {
+            compile::Std::new(
+                Compiler {
+                    host: TargetSelection::from_user(concat!(
+                                  stringify!($host),
+                                  "-",
+                                  stringify!($host)
+                          )),
+                          stage: $stage,
+                },
+                TargetSelection::from_user(concat!(stringify!($target), "-", stringify!($target))),
+            )
+        }
     };
 }
 
@@ -203,7 +218,25 @@ fn alias_and_path_for_library() {
         run_build(&["library".into(), "core".into()], configure("build", &["A-A"], &["A-A"]));
     assert_eq!(
         first(cache.all::<compile::Std>()),
-        &[std!(A => A, stage = 0), std!(A => A, stage = 1)]
+        &[std!(A => A, stage = 0), std!(A => A, stage = 1, force_recompile = true)]
+    );
+
+    let mut cache =
+        run_build(&["library".into(), "core".into()], configure("doc", &["A-A"], &["A-A"]));
+    assert_eq!(first(cache.all::<doc::Std>()), &[doc_std!(A => A, stage = 0)]);
+}
+
+#[test]
+fn std_with_crates_and_force_recompile() {
+    let mut cache =
+        run_build(&["std".into(), "alloc".into()], configure("build", &["A-A"], &["A-A"]));
+    assert_eq!(
+        first(cache.all::<compile::Std>()),
+        &[
+            std!(A => A, stage = 0),
+            std!(A => A, stage = 1, force_recompile = true)
+                .crates(vec!["alloc".into(), "std".into()])
+        ]
     );
 
     let mut cache =