diff options
Diffstat (limited to 'debian/patches/d-disable-download-tests.patch')
| -rw-r--r-- | debian/patches/d-disable-download-tests.patch | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/debian/patches/d-disable-download-tests.patch b/debian/patches/d-disable-download-tests.patch index 1e9f272f1..48458cca2 100644 --- a/debian/patches/d-disable-download-tests.patch +++ b/debian/patches/d-disable-download-tests.patch @@ -1,18 +1,18 @@ -Index: rust/src/bootstrap/config/tests.rs +Index: rust/src/bootstrap/src/tests/config.rs =================================================================== ---- rust.orig/src/bootstrap/config/tests.rs -+++ rust/src/bootstrap/config/tests.rs -@@ -13,6 +13,9 @@ fn parse(config: &str) -> Config { +--- rust.orig/src/bootstrap/src/tests/config.rs ++++ rust/src/bootstrap/src/tests/config.rs +@@ -18,6 +18,9 @@ fn parse(config: &str) -> Config { #[test] fn download_ci_llvm() { + // Debian: this will attempt to download LLVM + return; + - if crate::llvm::is_ci_llvm_modified(&parse("")) { + if crate::core::build_steps::llvm::is_ci_llvm_modified(&parse("")) { eprintln!("Detected LLVM as non-available: running in CI and modified LLVM in this change"); return; -@@ -41,7 +44,11 @@ fn download_ci_llvm() { +@@ -46,6 +49,9 @@ fn download_ci_llvm() { // - https://github.com/rust-lang/rust/pull/109162#issuecomment-1496782487 #[test] fn detect_src_and_out() { @@ -20,7 +20,5 @@ Index: rust/src/bootstrap/config/tests.rs + return; + fn test(cfg: Config, build_dir: Option<&str>) { -+ // This will bring absolute form of `src/bootstrap` path let current_dir = std::env::current_dir().unwrap(); - |