Rollup merge of #134331 - RalfJung:bootstrap-error-index, r=onur-ozkan

jieyouxu · web-flow · commit b5602cff4499 · 2024-12-16T01:52:23.000+08:00
bootstrap: make ./x test error-index work

This makes it more likely that someone who sees an error index CI failure will be able to figure out how to reproduce that locally. Note that bootstrap already prints "Testing stage2 error-index", which is misleading since the test is actually called error_index_generator.
diff --git a/src/bootstrap/src/core/build_steps/test.rs b/src/bootstrap/src/core/build_steps/test.rs
@@ -2442,7 +2442,9 @@ impl Step for ErrorIndex {
     const ONLY_HOSTS: bool = true;
 
     fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
-        run.path("src/tools/error_index_generator")
+        // Also add `error-index` here since that is what appears in the error message
+        // when this fails.
+        run.path("src/tools/error_index_generator").alias("error-index")
     }
 
     fn make_run(run: RunConfig<'_>) {

Original file line number	Diff line number	Diff line change
`@@ -2442,7 +2442,9 @@ impl Step for ErrorIndex {`
`2442`	`2442`	`const ONLY_HOSTS: bool = true;`
`2443`	`2443`
`2444`	`2444`	`fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {`
`2445`		`- run.path("src/tools/error_index_generator")`
	`2445`	+ // Also add `error-index` here since that is what appears in the error message
	`2446`	`+ // when this fails.`
	`2447`	`+ run.path("src/tools/error_index_generator").alias("error-index")`
`2446`	`2448`	`}`
`2447`	`2449`
`2448`	`2450`	`fn make_run(run: RunConfig<'_>) {`