From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
Date: Thu, 14 Jul 2022 11:17:39 +0000 (+0200)
Subject: set tools to those built in Debian
X-Git-Tag: archive/raspbian/1.85.0+dfsg2-3+rpi1^2~23
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=db812ce3b865fcb5703da8316c58fd786f62a135;p=rustc.git

set tools to those built in Debian

Forwarded: not-needed
===================================================================

Gbp-Pq: Topic build
Gbp-Pq: Name d-bootstrap-no-assume-tools.patch
---

diff --git a/src/bootstrap/src/core/builder/tests.rs b/src/bootstrap/src/core/builder/tests.rs
index 21694cf46f..6f5ff530bd 100644
--- a/src/bootstrap/src/core/builder/tests.rs
+++ b/src/bootstrap/src/core/builder/tests.rs
@@ -438,9 +438,13 @@ mod dist {
         let b = TargetSelection::from_user(TEST_TRIPLE_2);
         let mut config =
             configure(&[TEST_TRIPLE_1, TEST_TRIPLE_2], &[TEST_TRIPLE_1, TEST_TRIPLE_2]);
+        let mut tools = std::collections::HashSet::new();
+        tools.insert("clippy".to_string());
+        tools.insert("rustfmt".to_string());
         config.docs = false;
         config.extended = true;
         config.hosts = vec![b];
+        config.tools = Some(tools);
         let mut cache = run_build(&[], config);
 
         assert_eq!(first(cache.all::<dist::Rustc>()), &[dist::Rustc {