Bump boostrap cc to 1.2.17 and cmake to 0.1.54 by madsmtm · Pull Request #138784 · rust-lang/rust (original) (raw)

Rollup merge of rust-lang#139015 - Kobzol:llvm-ci-test-fixes, r=onur-ozkan

Remove unneeded LLVM CI test assertions

The download_ci_llvm bootstrap test was checking implementation details of the LLVM CI download check, which isn't very useful. It was essentially testing "if function_that_checks_if_llvm_ci_is_available returns true, we enable CI LLVM", but the usage of the function was an implementation detail. After rust-lang#138704, the inner implementation has changed, so the test now breaks if LLVM is updated.

I don't think that it's very useful to test implementation details like this, without taking the outside git state into account. Ideally, we should mock the git state for the test, otherwise the test will randomly break when executed in environments which the test does not control (e.g. on CI when a LLVM change happens).

I only kept the part of the test that checks that LLVM CI isn't used when we specify download-ci-llvm = false, as that should hold under all conditions, CI/local, and all git states.

I also kept the if-unchanged assertion, but only on CI, and as a temporary measure. After rust-lang#138591, we should have a proper way of mocking the git state to make the test robust, and make it test what we actually want.

Fixes [this](rust-lang#138784 (comment)).

r? @ghost