Skip to content

Commit a054fd8

Browse files
authored
Rollup merge of #83444 - Mark-Simulacrum:bootstrap-beta, r=pietroalbini
Fix bootstrap tests on beta Forward-porting a fix from the beta branch, which led to test failure on beta. r? ``@pietroalbini``
2 parents 02b27cd + e36573b commit a054fd8

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

src/bootstrap/builder/tests.rs

+3
Original file line numberDiff line numberDiff line change
@@ -585,8 +585,11 @@ mod dist {
585585
rustfix_coverage: false,
586586
pass: None,
587587
};
588+
// Make sure rustfmt binary not being found isn't an error.
589+
config.channel = "beta".to_string();
588590
let build = Build::new(config);
589591
let mut builder = Builder::new(&build);
592+
590593
builder.run_step_descriptions(&Builder::get_step_descriptions(Kind::Test), &[]);
591594
let a = TargetSelection::from_user("A");
592595

0 commit comments

Comments
 (0)