restructure try_run_tests

Author: Shourya742

src/bootstrap/src/utils/exec.rs

@@ -211,6 +211,15 @@ impl<'a> BootstrapCommand {
         exec_ctx.as_ref().start(self, OutputMode::Capture, OutputMode::Print)
     }
 
+    /// Spawn the command in background, while capturing and returns a handle to stream the output.
+    #[track_caller]
+    pub fn stream_capture(
+        &'a mut self,
+        exec_ctx: impl AsRef<ExecutionContext>,
+    ) -> Option<StreamingCommand> {
+        exec_ctx.as_ref().stream(self, OutputMode::Capture, OutputMode::Capture)
+    }
+
     /// Spawn the command in background, while capturing and returning stdout, and printing stderr.
     #[track_caller]
     pub fn stream_capture_stdout(
@@ -222,7 +231,7 @@ impl<'a> BootstrapCommand {
 
     /// Mark the command as being executed, disarming the drop bomb.
     /// If this method is not called before the command is dropped, its drop will panic.
-    fn mark_as_executed(&mut self) {
+    pub fn mark_as_executed(&mut self) {
         self.drop_bomb.defuse();
     }
 
@@ -624,18 +633,12 @@ impl ExecutionContext {
         exit!(1);
     }
 
-<<<<<<< HEAD
-    pub fn stream<'a>(
-=======
     /// Spawns the command with configured stdout and stderr handling.
     ///
-    /// Returns `None` if in dry-run mode and the command is not allowed to run.
-    ///
-    /// Panics if the command fails to spawn.
+    /// Returns None if in dry-run mode or Panics if the command fails to spawn.
     pub fn stream(
->>>>>>> c2e83361cec (add comment to exec)
         &self,
-        command: &'a mut BootstrapCommand,
+        command: &mut BootstrapCommand,
         stdout: OutputMode,
         stderr: OutputMode,
     ) -> Option<StreamingCommand> {
@@ -654,7 +657,7 @@ impl ExecutionContext {
 
         let stdout = child.stdout.take();
         let stderr = child.stderr.take();
-        Some(StreamingCommand { child, stdout, stderr })
+        return Some(StreamingCommand { child, stdout, stderr });
     }
 }
 

src/bootstrap/src/utils/render_tests.rs

@@ -34,16 +34,17 @@ pub(crate) fn try_run_tests(
     cmd: &mut BootstrapCommand,
     stream: bool,
 ) -> bool {
-    if !run_tests(builder, cmd, stream) {
-        if builder.fail_fast {
-            crate::exit!(1);
-        } else {
-            builder.config.exec_ctx().add_to_delay_failure(format!("{cmd:?}"));
-            false
-        }
-    } else {
-        true
+    if run_tests(builder, cmd, stream) {
+        return true;
     }
+
+    if builder.fail_fast {
+        crate::exit!(1);
+    }
+
+    builder.config.exec_ctx().add_to_delay_failure(format!("{cmd:?}"));
+
+    false
 }
 
 fn run_tests(builder: &Builder<'_>, cmd: &mut BootstrapCommand, stream: bool) -> bool {