Merge branch 'debian/experimental' into proxmox/bookworm

[rustc.git] / debian / patches / d-bootstrap-no-assume-tools.patch

From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
Date: Thu, 14 Jul 2022 13:17:39 +0200
Subject: d-bootstrap-no-assume-tools

===================================================================
---
 src/bootstrap/builder/tests.rs | 4 ++++
 1 file changed, 4 insertions(+)

Index: rust/src/bootstrap/builder/tests.rs
===================================================================
--- rust.orig/src/bootstrap/builder/tests.rs
+++ rust/src/bootstrap/builder/tests.rs
@@ -380,9 +380,13 @@ mod dist {
     #[test]
     fn dist_only_cross_host() {
         let b = TargetSelection::from_user("B");
+        let mut tools = std::collections::HashSet::new();
+        tools.insert("clippy".to_string());
+        tools.insert("rustfmt".to_string());
         let mut config = configure(&["A", "B"], &["A", "B"]);
         config.docs = false;
         config.extended = true;
+        config.tools = Some(tools);
         config.hosts = vec![b];
         let mut cache = run_build(&[], config);