Add config builder for bootstrap tests #142629

Kobzol · 2025-06-17T14:19:56Z

I started writing a bunch of snapshot tests for build/check steps, and quickly realized that the current interface for defining them won't be enough, so I created a simple builder, which can scale to pretty much any kind of configuration in the future.

rustbot · 2025-06-17T14:20:02Z

r? @Mark-Simulacrum

rustbot has assigned @Mark-Simulacrum.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

rustbot · 2025-06-17T14:20:05Z

This PR modifies src/bootstrap/src/core/config.

If appropriate, please update CONFIG_CHANGE_HISTORY in src/bootstrap/src/utils/change_tracker.rs.

jieyouxu

Thanks, broadly looks good, I have a question

src/bootstrap/src/core/builder/tests.rs

jieyouxu · 2025-06-18T11:23:03Z

@bors r+ rollup

bors · 2025-06-18T11:23:06Z

📌 Commit 86c8d23 has been approved by jieyouxu

It is now in the queue for this repository.

Kobzol · 2025-06-18T15:11:07Z

Blocked on #142624 and #142627.

@rustbot label: +S-blocked

jieyouxu · 2025-06-18T15:25:32Z

@bors r-

bors · 2025-06-18T22:20:56Z

☔ The latest upstream changes (presumably #142685) made this pull request unmergeable. Please resolve the merge conflicts.

Shourya742

tack

Kobzol · 2025-06-19T04:56:55Z

@rustbot label: -S-blocked

@bors r=jieyouxu,Shourya742

Rebased.

bors · 2025-06-19T04:56:58Z

📌 Commit 718e475 has been approved by jieyouxu,Shourya742

It is now in the queue for this repository.

Rollup of 6 pull requests Successful merges: - #141990 (Implement send_signal for unix child processes) - #142331 (Add `trim_prefix` and `trim_suffix` methods for both `slice` and `str` types.) - #142502 (rustdoc_json: improve handling of generic args) - #142629 (Add config builder for bootstrap tests) - #142687 (Reduce uses of `hir_crate`.) - #142714 (add comment to `src/bootstrap/build.rs`) r? `@ghost` `@rustbot` modify labels: rollup

Kobzol · 2025-06-19T19:27:06Z

@bors2 try jobs=aarch64-apple

rust-bors · 2025-06-19T19:27:10Z

⌛ Trying commit 718e475 with merge 6413a07…

To cancel the try build, run the command @bors2 try cancel.

Add config builder for bootstrap tests I started writing a bunch of snapshot tests for build/check steps, and quickly realized that the current interface for defining them won't be enough, so I created a simple builder, which can scale to pretty much any kind of configuration in the future. try-job: aarch64-apple

rust-bors · 2025-06-19T20:31:47Z

💔 Test failed

CI ❌

Kobzol · 2025-06-19T20:41:22Z

@bors r-

Kobzol · 2025-06-20T06:19:16Z

@bors2 try jobs=aarch64-apple

I tried to make the test config be as simple as possible, but apparently we'll need to do some hacks to it for now.

rust-bors · 2025-06-20T06:19:19Z

⌛ Trying commit d475e10 with merge 9eb8927…

To cancel the try build, run the command @bors2 try cancel.

Add config builder for bootstrap tests I started writing a bunch of snapshot tests for build/check steps, and quickly realized that the current interface for defining them won't be enough, so I created a simple builder, which can scale to pretty much any kind of configuration in the future. try-job: aarch64-apple

rust-bors · 2025-06-20T07:42:12Z

☀️ Try build successful (CI)
Build commit: 9eb8927 (9eb8927e0162dc7c223bf5f46646d2a116885f6e, parent: 5b74275f89b6041bf2e9dc2abcf332e206d4cfca)

Kobzol · 2025-06-20T08:14:01Z

@rustbot ready

jieyouxu · 2025-06-20T08:19:27Z

Unfortunate, but yeah. Thanks
@bors r+ rollup

bors · 2025-06-20T08:19:29Z

📌 Commit d475e10 has been approved by jieyouxu

It is now in the queue for this repository.

…jieyouxu Add config builder for bootstrap tests I started writing a bunch of snapshot tests for build/check steps, and quickly realized that the current interface for defining them won't be enough, so I created a simple builder, which can scale to pretty much any kind of configuration in the future.

Rollup of 11 pull requests Successful merges: - #142478 (install docs for each target in different directory) - #142629 (Add config builder for bootstrap tests) - #142715 (correct template for `#[align]` attribute) - #142720 (De-dup common code from `ExternalCrate` methods) - #142736 (add issue template for rustdoc) - #142743 (rustc-dev-guide subtree update) - #142744 (Add a mailmap entry for y21) - #142758 (Make sure to rebuild rustdoc if `src/rustdoc-json-types` is changed) - #142764 (Convert `ilog(10)` to `ilog10()`) - #142767 (Some symbol and PathRoot cleanups) - #142769 (remove equivalent new method on context) r? `@ghost` `@rustbot` modify labels: rollup

Rollup of 10 pull requests Successful merges: - #142629 (Add config builder for bootstrap tests) - #142715 (correct template for `#[align]` attribute) - #142720 (De-dup common code from `ExternalCrate` methods) - #142736 (add issue template for rustdoc) - #142743 (rustc-dev-guide subtree update) - #142744 (Add a mailmap entry for y21) - #142758 (Make sure to rebuild rustdoc if `src/rustdoc-json-types` is changed) - #142764 (Convert `ilog(10)` to `ilog10()`) - #142767 (Some symbol and PathRoot cleanups) - #142769 (remove equivalent new method on context) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of #142629 - Kobzol:bootstrap-tests-builder, r=jieyouxu Add config builder for bootstrap tests I started writing a bunch of snapshot tests for build/check steps, and quickly realized that the current interface for defining them won't be enough, so I created a simple builder, which can scale to pretty much any kind of configuration in the future.

Rollup of 10 pull requests Successful merges: - rust-lang/rust#142629 (Add config builder for bootstrap tests) - rust-lang/rust#142715 (correct template for `#[align]` attribute) - rust-lang/rust#142720 (De-dup common code from `ExternalCrate` methods) - rust-lang/rust#142736 (add issue template for rustdoc) - rust-lang/rust#142743 (rustc-dev-guide subtree update) - rust-lang/rust#142744 (Add a mailmap entry for y21) - rust-lang/rust#142758 (Make sure to rebuild rustdoc if `src/rustdoc-json-types` is changed) - rust-lang/rust#142764 (Convert `ilog(10)` to `ilog10()`) - rust-lang/rust#142767 (Some symbol and PathRoot cleanups) - rust-lang/rust#142769 (remove equivalent new method on context) r? `@ghost` `@rustbot` modify labels: rollup

rustbot assigned Mark-Simulacrum Jun 17, 2025

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Jun 17, 2025

jieyouxu approved these changes Jun 18, 2025

View reviewed changes

src/bootstrap/src/core/builder/tests.rs Show resolved Hide resolved

jieyouxu assigned jieyouxu and unassigned Mark-Simulacrum Jun 18, 2025

jieyouxu approved these changes Jun 18, 2025

View reviewed changes

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 18, 2025

Kobzol mentioned this pull request Jun 18, 2025

Rollup of 12 pull requests #142679

Closed

rustbot added the S-blocked Status: Blocked on something else such as an RFC or other implementation work. label Jun 18, 2025

Add get_host_target function

8c28161

Shourya742 approved these changes Jun 19, 2025

View reviewed changes

Kobzol added 2 commits June 19, 2025 06:56

Normalize host target in snapshot tests

21d21d5

Clarify arrow in snapshot tests

718e475

Kobzol force-pushed the bootstrap-tests-builder branch from 86c8d23 to 718e475 Compare June 19, 2025 04:56

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 19, 2025

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 19, 2025

Add temporary directory for executing snapshot tests

d475e10

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 20, 2025

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 20, 2025

Kobzol mentioned this pull request Jun 20, 2025

Rollup of 11 pull requests #142781

Closed

Kobzol mentioned this pull request Jun 20, 2025

Rollup of 10 pull requests #142795

Merged

bors merged commit 7f9c3a3 into rust-lang:master Jun 20, 2025
10 checks passed

rustbot added this to the 1.89.0 milestone Jun 20, 2025

Kobzol deleted the bootstrap-tests-builder branch June 21, 2025 06:40

Add config builder for bootstrap tests #142629

Add config builder for bootstrap tests #142629

Uh oh!

Conversation

Kobzol commented Jun 17, 2025

Uh oh!

rustbot commented Jun 17, 2025

Uh oh!

rustbot commented Jun 17, 2025

Uh oh!

jieyouxu left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

jieyouxu commented Jun 18, 2025

Uh oh!

bors commented Jun 18, 2025

Uh oh!

Kobzol commented Jun 18, 2025

Uh oh!

jieyouxu commented Jun 18, 2025

Uh oh!

bors commented Jun 18, 2025

Uh oh!

Shourya742 left a comment

Choose a reason for hiding this comment

Uh oh!

Kobzol commented Jun 19, 2025

Uh oh!

bors commented Jun 19, 2025

Uh oh!

Kobzol commented Jun 19, 2025

Uh oh!

rust-bors bot commented Jun 19, 2025

Uh oh!

rust-bors bot commented Jun 19, 2025

Uh oh!

Kobzol commented Jun 19, 2025

Uh oh!

Kobzol commented Jun 20, 2025

Uh oh!

rust-bors bot commented Jun 20, 2025

Uh oh!

rust-bors bot commented Jun 20, 2025

Uh oh!

Kobzol commented Jun 20, 2025

Uh oh!

jieyouxu commented Jun 20, 2025

Uh oh!

bors commented Jun 20, 2025

Uh oh!

Uh oh!

Uh oh!