Rollup merge of #76796 - jyn514:wrong-stage, r=shepmaster

Give a better error message when x.py uses the wrong stage for CI r? @shepmaster
rust-lang · Sep 19, 2020 · 404cce0 · 404cce0
2 parents 4831523 + be37265
commit 404cce0
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
@@ -617,7 +617,13 @@ impl Config {
                 | Subcommand::Build { .. }
                 | Subcommand::Bench { .. }
                 | Subcommand::Dist { .. }
-                | Subcommand::Install { .. } => assert_eq!(config.stage, 2),
+                | Subcommand::Install { .. } => {
+                    assert_eq!(
+                        config.stage, 2,
+                        "x.py should be run with `--stage 2` on CI, but was run with `--stage {}`",
+                        config.stage,
+                    );
+                }
                 Subcommand::Clean { .. }
                 | Subcommand::Check { .. }
                 | Subcommand::Clippy { .. }