stabilize ci_rustc_if_unchanged_logic test

Signed-off-by: onur-ozkan <[email protected]>

Author: onur-ozkan

src/bootstrap/src/core/builder/tests.rs

@@ -6,6 +6,7 @@ use super::*;
 use crate::Flags;
 use crate::core::build_steps::doc::DocumentationFormat;
 use crate::core::config::Config;
+use crate::core::download::is_download_ci_available;
 
 fn configure(cmd: &str, host: &[&str], target: &[&str]) -> Config {
     configure_with_args(&[cmd.to_owned()], host, target)
@@ -225,7 +226,9 @@ fn ci_rustc_if_unchanged_logic() {
         |&_| Ok(Default::default()),
     );
 
-    if config.rust_info.is_from_tarball() {
+    if !is_download_ci_available(&config.build.triple, config.llvm_assertions)
+        || config.rust_info.is_from_tarball()
+    {
         return;
     }
 
@@ -257,7 +260,11 @@ fn ci_rustc_if_unchanged_logic() {
         .unwrap()
         .success();
 
-    assert!(has_changes == config.download_rustc_commit.is_none());
+    // Make sure "if-unchanged" logic doesn't try to use CI rustc while there are changes
+    // in compiler and/or library.
+    if config.download_rustc_commit.is_some() {
+        assert!(!has_changes);
+    }
 }
 
 mod defaults {