override build profile for bootstrap tests

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

Author: onur-ozkan

src/bootstrap/src/core/build_steps/test.rs

@@ -86,6 +86,7 @@ impl Step for CrateBootstrap {
             SourceType::InTree,
             &[],
         );
+
         let crate_name = path.rsplit_once('/').unwrap().1;
         run_cargo_test(cargo, &[], &[], crate_name, crate_name, bootstrap_host, builder);
     }
@@ -3099,6 +3100,8 @@ impl Step for Bootstrap {
             &[],
         );
 
+        cargo.release_build(false);
+
         cargo
             .rustflag("-Cdebuginfo=2")
             .env("CARGO_TARGET_DIR", builder.out.join("bootstrap"))
@@ -3561,9 +3564,11 @@ impl Step for CodegenGCC {
             .arg("gcc")
             .arg("--out-dir")
             .arg(builder.stage_out(compiler, Mode::ToolRustc).join("cg_gcc"))
-            .arg("--release")
             .arg("--mini-tests")
             .arg("--std-tests");
+
+        cargo.release_build(true);
+
         cargo.args(builder.config.test_args());
 
         cargo.into_cmd().run(builder);

src/bootstrap/src/core/builder/cargo.rs

@@ -1,6 +1,7 @@
 use std::env;
 use std::ffi::{OsStr, OsString};
 use std::path::{Path, PathBuf};
+use std::process::Command;
 
 use super::{Builder, Kind};
 use crate::core::build_steps::tool::SourceType;
@@ -94,6 +95,7 @@ pub struct Cargo {
     rustdocflags: Rustflags,
     hostflags: HostFlags,
     allow_features: String,
+    release_build: bool,
 }
 
 impl Cargo {
@@ -121,6 +123,10 @@ impl Cargo {
         cargo
     }
 
+    pub fn release_build(&mut self, release_build: bool) {
+        self.release_build = release_build;
+    }
+
     pub fn compiler(&self) -> Compiler {
         self.compiler
     }
@@ -335,6 +341,33 @@ impl Cargo {
 
 impl From<Cargo> for BootstrapCommand {
     fn from(mut cargo: Cargo) -> BootstrapCommand {
+        if cargo.release_build {
+            let mut args: Vec<String> = cargo
+                .command
+                .as_command_mut()
+                .get_args()
+                .map(|arg| arg.to_str().unwrap().to_owned())
+                .collect();
+
+            if !args.contains(&"--release".to_owned()) {
+                args.insert(1, "--release".into());
+            }
+
+            let mut new_command = Command::new(cargo.command.as_command_mut().get_program());
+            new_command.args(args);
+
+            if let Some(p) = cargo.command.as_command_mut().get_current_dir() {
+                new_command.current_dir(p);
+            }
+
+            for (key, value) in cargo.command.get_envs() {
+                let Some(value) = value else { continue };
+                new_command.env(key, value);
+            }
+
+            cargo.command.replace_inner_command(new_command);
+        }
+
         let rustflags = &cargo.rustflags.0;
         if !rustflags.is_empty() {
             cargo.command.env("RUSTFLAGS", rustflags);
@@ -353,6 +386,7 @@ impl From<Cargo> for BootstrapCommand {
         if !cargo.allow_features.is_empty() {
             cargo.command.env("RUSTC_ALLOW_FEATURES", cargo.allow_features);
         }
+
         cargo.command
     }
 }
@@ -422,13 +456,6 @@ impl Builder<'_> {
             assert_eq!(target, compiler.host);
         }
 
-        if self.config.rust_optimize.is_release() &&
-        // cargo bench/install do not accept `--release` and miri doesn't want it
-        !matches!(cmd_kind, Kind::Bench | Kind::Install | Kind::Miri | Kind::MiriSetup | Kind::MiriTest)
-        {
-            cargo.arg("--release");
-        }
-
         // Remove make-related flags to ensure Cargo can correctly set things up
         cargo.env_remove("MAKEFLAGS");
         cargo.env_remove("MFLAGS");
@@ -1214,6 +1241,10 @@ impl Builder<'_> {
             rustflags.arg("-Zmir_strip_debuginfo=locals-in-tiny-functions");
         }
 
+        let release_build = self.config.rust_optimize.is_release() &&
+            // cargo bench/install do not accept `--release` and miri doesn't want it
+            !matches!(cmd_kind, Kind::Bench | Kind::Install | Kind::Miri | Kind::MiriSetup | Kind::MiriTest);
+
         Cargo {
             command: cargo,
             compiler,
@@ -1222,6 +1253,7 @@ impl Builder<'_> {
             rustdocflags,
             hostflags,
             allow_features,
+            release_build,
         }
     }
 }

src/bootstrap/src/utils/exec.rs

@@ -185,6 +185,11 @@ impl BootstrapCommand {
             self.env("TERM", "xterm").args(["--color", "always"]);
         }
     }
+
+    /// Replaces the wrapped `Command` instance inside
+    pub fn replace_inner_command(&mut self, new_command: Command) {
+        self.command = new_command;
+    }
 }
 
 impl Debug for BootstrapCommand {