parse configure args for debug assertions and use them in the test env

this way opt-dist respects debug-assertions on alt builds, so that bootstrap runs
the correct set of tests in stage0 post optimization tests.

Author: lqd

src/tools/opt-dist/src/main.rs

@@ -1,6 +1,7 @@
 use anyhow::Context;
 use camino::{Utf8Path, Utf8PathBuf};
 use clap::Parser;
+use environment::TestConfig;
 use log::LevelFilter;
 use utils::io;
 
@@ -158,6 +159,11 @@ fn create_environment(args: Args) -> anyhow::Result<(Environment, Vec<String>)>
 
             let is_aarch64 = target_triple.starts_with("aarch64");
 
+            // Parse the optional build components that impact the test environment.
+            let rust_configure_args = std::env::var("RUST_CONFIGURE_ARGS")
+                .expect("RUST_CONFIGURE_ARGS environment variable missing");
+            let test_config = TestConfig::from_configure_args(&rust_configure_args);
+
             let checkout_dir = Utf8PathBuf::from("/checkout");
             let env = EnvironmentBuilder::default()
                 .host_tuple(target_triple)
@@ -172,6 +178,7 @@ fn create_environment(args: Args) -> anyhow::Result<(Environment, Vec<String>)>
                 .skipped_tests(vec![])
                 .run_tests(true)
                 .fast_try_build(is_fast_try_build)
+                .test_config(test_config)
                 .build()?;
 
             (env, shared.build_args)
@@ -180,6 +187,11 @@ fn create_environment(args: Args) -> anyhow::Result<(Environment, Vec<String>)>
             let target_triple =
                 std::env::var("PGO_HOST").expect("PGO_HOST environment variable missing");
 
+            // Parse the optional build components that impact the test environment.
+            let rust_configure_args = std::env::var("RUST_CONFIGURE_ARGS")
+                .expect("RUST_CONFIGURE_ARGS environment variable missing");
+            let test_config = TestConfig::from_configure_args(&rust_configure_args);
+
             let checkout_dir: Utf8PathBuf = std::env::current_dir()?.try_into()?;
             let env = EnvironmentBuilder::default()
                 .host_tuple(target_triple)
@@ -193,6 +205,7 @@ fn create_environment(args: Args) -> anyhow::Result<(Environment, Vec<String>)>
                 .skipped_tests(vec![])
                 .run_tests(true)
                 .fast_try_build(is_fast_try_build)
+                .test_config(test_config)
                 .build()?;
 
             (env, shared.build_args)

src/tools/opt-dist/src/tests.rs

@@ -72,6 +72,7 @@ change-id = 115898
 [rust]
 channel = "{channel}"
 verbose-tests = true
+debug-assertions = {debug_assertions}
 
 [build]
 rustc = "{rustc}"
@@ -83,7 +84,8 @@ llvm-config = "{llvm_config}"
 "#,
         rustc = rustc_path.to_string().replace('\\', "/"),
         cargo = cargo_path.to_string().replace('\\', "/"),
-        llvm_config = llvm_config.to_string().replace('\\', "/")
+        llvm_config = llvm_config.to_string().replace('\\', "/"),
+        debug_assertions = env.test_config().enable_debug_assertions,
     );
     log::info!("Using following `bootstrap.toml` for running tests:\n{config_content}");