Skip to content

Commit

Permalink
Rollup merge of rust-lang#83444 - Mark-Simulacrum:bootstrap-beta, r=p…
Browse files Browse the repository at this point in the history
…ietroalbini

Fix bootstrap tests on beta

Forward-porting a fix from the beta branch, which led to test failure on beta.

r? `@pietroalbini`
  • Loading branch information
Dylan-DPC authored Mar 25, 2021
2 parents 632ec71 + e36573b commit 53c35e2
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions src/bootstrap/builder/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -585,8 +585,11 @@ mod dist {
rustfix_coverage: false,
pass: None,
};
// Make sure rustfmt binary not being found isn't an error.
config.channel = "beta".to_string();
let build = Build::new(config);
let mut builder = Builder::new(&build);

builder.run_step_descriptions(&Builder::get_step_descriptions(Kind::Test), &[]);
let a = TargetSelection::from_user("A");

Expand Down

0 comments on commit 53c35e2

Please sign in to comment.