Skip to content

Commit b08625c

Browse files
committed
tmp: parse RUST_CONFIGURE_ARGS for build assertions on linux ci
1 parent 6b49c26 commit b08625c

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

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

+7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
use anyhow::Context;
22
use camino::{Utf8Path, Utf8PathBuf};
33
use clap::Parser;
4+
use environment::TestConfig;
45
use log::LevelFilter;
56
use utils::io;
67

@@ -148,6 +149,11 @@ fn create_environment(args: Args) -> anyhow::Result<(Environment, Vec<String>)>
148149

149150
let is_aarch64 = target_triple.starts_with("aarch64");
150151

152+
// Parse the optional build components that impact the test environment.
153+
let rust_configure_args = std::env::var("RUST_CONFIGURE_ARGS")
154+
.expect("RUST_CONFIGURE_ARGS environment variable missing");
155+
let test_config = TestConfig::from_configure_args(&rust_configure_args);
156+
151157
let checkout_dir = Utf8PathBuf::from("/checkout");
152158
let env = EnvironmentBuilder::default()
153159
.host_tuple(target_triple)
@@ -160,6 +166,7 @@ fn create_environment(args: Args) -> anyhow::Result<(Environment, Vec<String>)>
160166
// FIXME: Enable bolt for aarch64 once it's fixed upstream. Broken as of December 2024.
161167
.use_bolt(!is_aarch64)
162168
.skipped_tests(vec![])
169+
.test_config(test_config)
163170
.build()?;
164171

165172
(env, shared.build_args)

0 commit comments

Comments
 (0)