From 74b373426a79af2b21b8d266a881753e338cfd2e Mon Sep 17 00:00:00 2001
From: Joshua Nelson <jyn514@gmail.com>
Date: Mon, 13 Jul 2020 19:55:33 -0400
Subject: [PATCH] Fix most bootstrap tests

Uses --stage 2 for all the existing tests
---
 src/bootstrap/builder.rs       | 2 +-
 src/bootstrap/builder/tests.rs | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
index 5c25cfea9f26..f2f0906ff4ed 100644
--- a/src/bootstrap/builder.rs
+++ b/src/bootstrap/builder.rs
@@ -232,7 +232,7 @@ impl StepDescription {
                 }
 
                 if !attempted_run {
-                    panic!("Error: no rules matched {}.", path.display());
+                    panic!("error: no rules matched {}", path.display());
                 }
             }
         }
diff --git a/src/bootstrap/builder/tests.rs b/src/bootstrap/builder/tests.rs
index 6684ca82c277..240553d8baf9 100644
--- a/src/bootstrap/builder/tests.rs
+++ b/src/bootstrap/builder/tests.rs
@@ -6,6 +6,7 @@ use pretty_assertions::assert_eq;
 
 fn configure(host: &[&str], target: &[&str]) -> Config {
     let mut config = Config::default_opts();
+    config.stage = Some(2);
     // don't save toolstates
     config.save_toolstates = None;
     config.skip_only_host_steps = false;
@@ -421,7 +422,7 @@ fn test_exclude() {
 }
 
 #[test]
-fn doc_default() {
+fn doc_ci() {
     let mut config = configure(&[], &[]);
     config.compiler_docs = true;
     config.cmd = Subcommand::Doc { paths: Vec::new(), open: false };