Skip to content

Conversation

Zalathar
Copy link
Contributor

Instead of using a dizzying assortment of different macros to declare these test suite steps, we can mostly just use one test! macro with a few optional named arguments.

I'm pretty sure that this doesn't change any behaviour, but please do double-check each of the individual declarations.

@Zalathar Zalathar added A-testsuite Area: The testsuite used to check the correctness of rustc A-compiletest Area: The compiletest test runner labels Dec 29, 2024
@rustbot
Copy link
Collaborator

rustbot commented Dec 29, 2024

r? @Kobzol

rustbot has assigned @Kobzol.
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 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 Dec 29, 2024
@Zalathar
Copy link
Contributor Author

In the future I would like to further reduce the use of macros for things like this, but this is a good intermediate step.

@jieyouxu jieyouxu self-assigned this Dec 29, 2024
Copy link
Member

@jieyouxu jieyouxu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, this LGTM

@jieyouxu
Copy link
Member

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Dec 29, 2024

📌 Commit 1e37bbe has been approved by jieyouxu

It is now in the queue for this repository.

@bors 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 Dec 29, 2024
Zalathar added a commit to Zalathar/rust that referenced this pull request Dec 29, 2024
…jieyouxu

bootstrap: Consolidate the macros for declaring compiletest test suites

Instead of using a dizzying assortment of different macros to declare these test suite steps, we can mostly just use one `test!` macro with a few optional named arguments.

I'm pretty sure that this doesn't change any behaviour, but please do double-check each of the individual declarations.
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 29, 2024
Rollup of 5 pull requests

Successful merges:

 - rust-lang#134799 (nits: Cleanups in `librustdoc::clean`)
 - rust-lang#134851 (docs: inline `alloc::ffi::c_str` types to `alloc::ffi`)
 - rust-lang#134869 (Bump compiler cc)
 - rust-lang#134876 (bootstrap: Consolidate the macros for declaring compiletest test suites)
 - rust-lang#134883 (bootstrap: Fix `./x check bootstrap` by moving `shared_helpers::tests`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit a43730b into rust-lang:master Dec 29, 2024
6 checks passed
@rustbot rustbot added this to the 1.85.0 milestone Dec 29, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Dec 29, 2024
Rollup merge of rust-lang#134876 - Zalathar:bootstrap-test-macros, r=jieyouxu

bootstrap: Consolidate the macros for declaring compiletest test suites

Instead of using a dizzying assortment of different macros to declare these test suite steps, we can mostly just use one `test!` macro with a few optional named arguments.

I'm pretty sure that this doesn't change any behaviour, but please do double-check each of the individual declarations.
@Zalathar Zalathar deleted the bootstrap-test-macros branch December 29, 2024 21:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-compiletest Area: The compiletest test runner A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants