]> git.lizzy.rs Git - rust.git/commitdiff
Rollup merge of #84781 - jyn514:check-bootstrap, r=Mark-Simulacrum
authorYuki Okushi <jtitor@2k36.org>
Fri, 7 May 2021 06:20:22 +0000 (15:20 +0900)
committerGitHub <noreply@github.com>
Fri, 7 May 2021 06:20:22 +0000 (15:20 +0900)
Don't check bootstrap artifacts by default

Bootstrap has to build successfully or this won't run, so all it checks
are the tests, which are uncommon to change.

Fixes https://github.com/rust-lang/rust/issues/76624.

src/bootstrap/check.rs

index 9b76c8b9a2d2643bf6f3bbf13197ecd63fc2d62c..8561a2a39b8ea727b412ac923a80be361a75575c 100644 (file)
@@ -280,7 +280,7 @@ fn run(self, builder: &Builder<'_>) {
 }
 
 macro_rules! tool_check_step {
-    ($name:ident, $path:literal, $($alias:literal, )* $source_type:path) => {
+    ($name:ident, $path:literal, $($alias:literal, )* $source_type:path $(, $default:literal )?) => {
         #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
         pub struct $name {
             pub target: TargetSelection,
@@ -289,7 +289,7 @@ pub struct $name {
         impl Step for $name {
             type Output = ();
             const ONLY_HOSTS: bool = true;
-            const DEFAULT: bool = true;
+            const DEFAULT: bool = true $( && $default )?;
 
             fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
                 run.paths(&[ $path, $($alias),* ])
@@ -368,7 +368,7 @@ fn stamp(
 // rejected.
 tool_check_step!(Clippy, "src/tools/clippy", SourceType::InTree);
 
-tool_check_step!(Bootstrap, "src/bootstrap", SourceType::InTree);
+tool_check_step!(Bootstrap, "src/bootstrap", SourceType::InTree, false);
 
 /// Cargo's output path for the standard library in a given stage, compiled
 /// by a particular compiler for the specified target.