nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-05-14 02:49:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #131659 - onur-ozkan:llvm-test, r=albertlarsan68

Browse Source 
enable `download_ci_llvm` test

This was ignored because it caused merge failures on [LLVM update PR](https://github.com/rust-lang/rust/pull/131448). The issue was not checking `is_ci_llvm_available` in the test which is crucial for enabling CI LLVM:

2aa26d8a72/src/bootstrap/src/core/config/config.rs (L2835-L2844)
This commit is contained in:
Matthias Krüger 2024-10-13 18:27:22 +02:00 committed by GitHub
commit 0e00a70e52
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/bootstrap/src/core/config/tests.rs
View File

@ -10,6 +10,7 @@ use serde::Deserialize;
use super::flags::Flags;
use super::{ChangeIdWrapper, Config};
use crate::core::build_steps::clippy::get_clippy_rules_in_order;
use crate::core::build_steps::llvm;
use crate::core::config::{LldMode, Target, TargetSelection, TomlConfig};
pub(crate) fn parse(config: &str) -> Config {
@ -19,13 +20,22 @@ pub(crate) fn parse(config: &str) -> Config {
)
}
// FIXME: Resume this test after establishing a stabilized change tracking logic.
#[ignore]
#[test]
fn download_ci_llvm() {
assert!(parse("").llvm_from_ci);
assert!(parse("llvm.download-ci-llvm = true").llvm_from_ci);
assert!(!parse("llvm.download-ci-llvm = false").llvm_from_ci);
let config = parse("");
let is_available = llvm::is_ci_llvm_available(&config, config.llvm_assertions);
if is_available {
assert!(config.llvm_from_ci);
}
let config = parse("llvm.download-ci-llvm = true");
let is_available = llvm::is_ci_llvm_available(&config, config.llvm_assertions);
if is_available {
assert!(config.llvm_from_ci);
}
let config = parse("llvm.download-ci-llvm = false");
assert!(!config.llvm_from_ci);
let if_unchanged_config = parse("llvm.download-ci-llvm = \"if-unchanged\"");
if if_unchanged_config.llvm_from_ci {