Skip to content

Commit 74b3734

Browse files
committed
Fix most bootstrap tests
Uses --stage 2 for all the existing tests
1 parent 01c6256 commit 74b3734

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

src/bootstrap/builder.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ impl StepDescription {
232232
}
233233

234234
if !attempted_run {
235-
panic!("Error: no rules matched {}.", path.display());
235+
panic!("error: no rules matched {}", path.display());
236236
}
237237
}
238238
}

src/bootstrap/builder/tests.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ use pretty_assertions::assert_eq;
66

77
fn configure(host: &[&str], target: &[&str]) -> Config {
88
let mut config = Config::default_opts();
9+
config.stage = Some(2);
910
// don't save toolstates
1011
config.save_toolstates = None;
1112
config.skip_only_host_steps = false;
@@ -421,7 +422,7 @@ fn test_exclude() {
421422
}
422423

423424
#[test]
424-
fn doc_default() {
425+
fn doc_ci() {
425426
let mut config = configure(&[], &[]);
426427
config.compiler_docs = true;
427428
config.cmd = Subcommand::Doc { paths: Vec::new(), open: false };

0 commit comments

Comments
 (0)