Skip to content

fix(opt-dist): respect existing config.toml #125473

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 26, 2024
Merged

fix(opt-dist): respect existing config.toml #125473

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 14 additions & 17 deletions src/tools/opt-dist/src/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,26 +59,17 @@ pub fn run_tests(env: &Environment) -> anyhow::Result<()> {
.join(format!("llvm-config{}", executable_extension()));
assert!(llvm_config.is_file());

let config_content = format!(
r#"profile = "user"
change-id = 115898
let rustc = format!("build.rustc={}", rustc_path.to_string().replace('\\', "/"));
let cargo = format!("build.cargo={}", cargo_path.to_string().replace('\\', "/"));
let llvm_config =
format!("target.{host_triple}.llvm-config={}", llvm_config.to_string().replace('\\', "/"));

[build]
rustc = "{rustc}"
cargo = "{cargo}"

[target.{host_triple}]
llvm-config = "{llvm_config}"
"#,
rustc = rustc_path.to_string().replace('\\', "/"),
cargo = cargo_path.to_string().replace('\\', "/"),
llvm_config = llvm_config.to_string().replace('\\', "/")
);
log::info!("Using following `config.toml` for running tests:\n{config_content}");
log::info!("Set the following configurations for running tests:");
log::info!("\t{rustc}");
log::info!("\t{cargo}");
log::info!("\t{llvm_config}");

// Simulate a stage 0 compiler with the extracted optimized dist artifacts.
std::fs::write("config.toml", config_content)?;

let x_py = env.checkout_path().join("x.py");
let mut args = vec![
env.python_binary(),
Expand All @@ -97,6 +88,12 @@ llvm-config = "{llvm_config}"
"tests/run-pass-valgrind",
"tests/ui",
"tests/crashes",
"--set",
&rustc,
"--set",
&cargo,
"--set",
&llvm_config,
];
for test_path in env.skipped_tests() {
args.extend(["--skip", test_path]);
Expand Down