bootstrap: disarm tests that requires git context

Signed-off-by: Fabian Grünbichler <git@fabian.gruenbichler.email>
Gbp-Pq: Topic build
Gbp-Pq: Name bootstrap-disarm-llvm-config-test-that-requires-git.patch

diff --git a/src/bootstrap/src/core/builder/tests.rs b/src/bootstrap/src/core/builder/tests.rs
index 9c7b66a4d373c311a03b68f29759e7c033bad962..b73aa5e8d25591755b3cfee3911eec9a79d00e9a 100644 (file)
--- a/src/bootstrap/src/core/builder/tests.rs
+++ b/src/bootstrap/src/core/builder/tests.rs
@@ -431,6 +431,9 @@ fn test_prebuilt_llvm_config_path_resolution() {
         .join(exe("llvm-config", builder.config.host_target));
     assert_eq!(expected, actual);
 
+    // Debian: if-unchanged fails for non-git sources
+    return;
+
     let config = configure(
         r#"
             [llvm]

diff --git a/src/bootstrap/src/core/config/tests.rs b/src/bootstrap/src/core/config/tests.rs
index 277ede8d77456a4aa9c899feaeb6d5210f9261cf..bbcb0d72738fe01ea5b7a8a92df9e07c3ba2d2ef 100644 (file)
--- a/src/bootstrap/src/core/config/tests.rs
+++ b/src/bootstrap/src/core/config/tests.rs
@@ -37,6 +37,8 @@ fn download_ci_llvm() {
     let config = TestCtx::new().config("check").create_config();
     assert!(!config.llvm_from_ci);
 
+    // Debian: if-unchanged doesn't work in non-git context
+    return;
     // this doesn't make sense, as we are overriding it later.
     let if_unchanged_config = TestCtx::new()
         .config("check")
@@ -422,6 +424,7 @@ fn check_rustc_if_unchanged_paths() {
         .collect();
 
     for p in normalised_allowed_paths {
+        if p == "triagebot.toml" { continue };
         assert!(config.src.join(p).exists(), "{p} doesn't exist.");
     }
 }
@@ -490,6 +493,8 @@ fn test_exclude() {
 
 #[test]
 fn test_ci_flag() {
+    // Debian: if-unchanged doesn't work in non-git context
+    return;
     let config = TestCtx::new().config("check").arg("--ci").arg("false").create_config();
     assert!(!config.is_running_on_ci());
 

diff --git a/src/bootstrap/src/utils/helpers/tests.rs b/src/bootstrap/src/utils/helpers/tests.rs
index 676fe6cbd5fe59cb990404fd5609de64b459cad6..a463fe136fca3cea0f906ba384cab87e3c70ec35 100644 (file)
--- a/src/bootstrap/src/utils/helpers/tests.rs
+++ b/src/bootstrap/src/utils/helpers/tests.rs
@@ -101,6 +101,8 @@ fn test_set_file_times_sanity_check() {
 
 #[test]
 fn test_submodule_path_of() {
+    // Debian: doesn't work in non-git context
+    return;
     let config = TestCtx::new().config("build").create_config();
 
     let build = crate::Build::new(config.clone());