1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
|
From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
Date: Thu, 14 Jul 2022 13:17:39 +0200
Subject: set tools to those built in Debian
Forwarded: not-needed
===================================================================
---
src/bootstrap/src/core/builder/tests.rs | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/bootstrap/src/core/builder/tests.rs b/src/bootstrap/src/core/builder/tests.rs
index 21694cf..6f5ff53 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 {
|
