Skip to content

compiletest: Make ./x test --test-args ... work again#146601

Merged
bors merged 1 commit intorust-lang:masterfrom
Enselic:fix-test-args
Sep 16, 2025
Merged

compiletest: Make ./x test --test-args ... work again#146601
bors merged 1 commit intorust-lang:masterfrom
Enselic:fix-test-args

Conversation

@Enselic
Copy link
Member

@Enselic Enselic commented Sep 15, 2025

It accidentally broke with #146501. The intention of that PR was to keep existing behavior if --exact is not used, but it had a bug. This PR fixes that bug.

@Enselic
compiletest: Make ./x test --test-args ... work again
bf73aac 
It accidentally broke with a48c8e3. The intention of that commit was
to keep existing behavior if `--exact` is not used, but it had a bug.
This commit fixes that bug.
@rustbot
Copy link
Collaborator

rustbot commented Sep 15, 2025

Some changes occurred in src/tools/compiletest

cc @jieyouxu

@rustbot rustbot added A-compiletest Area: The compiletest test runner A-testsuite Area: The testsuite used to check the correctness of rustc 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 Sep 15, 2025
@rustbot
Copy link
Collaborator

rustbot commented Sep 15, 2025

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

@Enselic Enselic mentioned this pull request Sep 15, 2025
Merged
@Enselic
Copy link
Member Author

Enselic commented Sep 15, 2025 •
edited
Loading

r? @Mark-Simulacrum

See #146501 (comment). (My bad!)

@rustbot rustbot assigned Mark-Simulacrum and unassigned Kobzol Sep 15, 2025
@Mark-Simulacrum
Copy link
Member

Mark-Simulacrum commented Sep 15, 2025

@bors r+

Might be a good idea to try to figure out some unit tests for this code?

@bors
Copy link
Collaborator

bors commented Sep 15, 2025

📌 Commit bf73aac has been approved by Mark-Simulacrum

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 Sep 15, 2025
@Enselic
Copy link
Member Author

Enselic commented Sep 15, 2025 •
edited
Loading

Might be a good idea to try to figure out some unit tests for this code?

One good CI test would be to make sure that

./x test tests/ui --test-args tests/ui/mir/lint/call-overlap.rs

runs one test. (That would have caught this bug.)

@Enselic Enselic mentioned this pull request Sep 15, 2025
Merged
@Zalathar Zalathar mentioned this pull request Sep 16, 2025
Merged
bors added a commit that referenced this pull request Sep 16, 2025
@bors
Auto merge of #146614 - Zalathar:rollup-hcxvdi1, r=Zalathar
ffdf3aa 
Rollup of 9 pull requests

Successful merges:

 - #145095 (Migrate `UnsizedConstParamTy`  to unstable impl of `ConstParamTy_`)
 - #145960 (Split `FnCtxt::report_args_error` into subfunctions)
 - #146402 (interpret: fix overlapping aggregate initialization)
 - #146466 (llvm-wrapper: other cleanup)
 - #146574 (compiletest: Enable new-output-capture by default)
 - #146599 (replace some `#[const_trait]` with `const trait`)
 - #146601 (compiletest: Make `./x test --test-args ...` work again)
 - #146608 (improve internal bootstrap docs)
 - #146609 (bootstrap: lower verbosity of cargo to one less than bootstrap's)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit that referenced this pull request Sep 16, 2025
@bors
Auto merge of #146614 - Zalathar:rollup-hcxvdi1, r=Zalathar
8a1b399 
Rollup of 9 pull requests

Successful merges:

 - #145095 (Migrate `UnsizedConstParamTy`  to unstable impl of `ConstParamTy_`)
 - #145960 (Split `FnCtxt::report_args_error` into subfunctions)
 - #146402 (interpret: fix overlapping aggregate initialization)
 - #146466 (llvm-wrapper: other cleanup)
 - #146574 (compiletest: Enable new-output-capture by default)
 - #146599 (replace some `#[const_trait]` with `const trait`)
 - #146601 (compiletest: Make `./x test --test-args ...` work again)
 - #146608 (improve internal bootstrap docs)
 - #146609 (bootstrap: lower verbosity of cargo to one less than bootstrap's)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 7cad097 into rust-lang:master Sep 16, 2025
10 checks passed
@rustbot rustbot added this to the 1.92.0 milestone Sep 16, 2025
rust-timer added a commit that referenced this pull request Sep 16, 2025
@rust-timer
Unrolled build for #146601
6d0c584 
Rollup merge of #146601 - Enselic:fix-test-args, r=Mark-Simulacrum

compiletest: Make `./x test --test-args ...` work again

It accidentally broke with  #146501. The intention of that PR was to keep existing behavior if `--exact` is not used, but it had a bug. This PR fixes that bug.
@tshepang tshepang mentioned this pull request Sep 16, 2025
Closed
github-actions bot pushed a commit to rust-lang/miri that referenced this pull request Sep 17, 2025
@bors
Auto merge of #146614 - Zalathar:rollup-hcxvdi1, r=Zalathar
0124715 
Rollup of 9 pull requests

Successful merges:

 - rust-lang/rust#145095 (Migrate `UnsizedConstParamTy`  to unstable impl of `ConstParamTy_`)
 - rust-lang/rust#145960 (Split `FnCtxt::report_args_error` into subfunctions)
 - rust-lang/rust#146402 (interpret: fix overlapping aggregate initialization)
 - rust-lang/rust#146466 (llvm-wrapper: other cleanup)
 - rust-lang/rust#146574 (compiletest: Enable new-output-capture by default)
 - rust-lang/rust#146599 (replace some `#[const_trait]` with `const trait`)
 - rust-lang/rust#146601 (compiletest: Make `./x test --test-args ...` work again)
 - rust-lang/rust#146608 (improve internal bootstrap docs)
 - rust-lang/rust#146609 (bootstrap: lower verbosity of cargo to one less than bootstrap's)

r? `@ghost`
`@rustbot` modify labels: rollup
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Sep 21, 2025
@matthiaskrgr
Rollup merge of rust-lang#146606 - Enselic:test-test-args, r=Mark-Sim…
cf6388a 
…ulacrum

ci: x86_64-gnu-tools: Add `--test-args` regression test

See rust-lang#146601 (comment)

r? `@Mark-Simulacrum`
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Sep 21, 2025
@matthiaskrgr
Rollup merge of rust-lang#146606 - Enselic:test-test-args, r=Mark-Sim…
af315d3 
…ulacrum

ci: x86_64-gnu-tools: Add `--test-args` regression test

See rust-lang#146601 (comment)

r? ``@Mark-Simulacrum``
rust-timer added a commit that referenced this pull request Sep 21, 2025
@rust-timer
Unrolled build for #146606
c7c1c6f 
Rollup merge of #146606 - Enselic:test-test-args, r=Mark-Simulacrum

ci: x86_64-gnu-tools: Add `--test-args` regression test

See #146601 (comment)

r? ``@Mark-Simulacrum``
Muscraft pushed a commit to Muscraft/rust that referenced this pull request Sep 24, 2025
@matthiaskrgr @Muscraft
Rollup merge of rust-lang#146606 - Enselic:test-test-args, r=Mark-Sim…
d92a448 
…ulacrum

ci: x86_64-gnu-tools: Add `--test-args` regression test

See rust-lang#146601 (comment)

r? ``@Mark-Simulacrum``
github-actions bot pushed a commit to model-checking/verify-rust-std that referenced this pull request Oct 9, 2025
@bors
Auto merge of rust-lang#146614 - Zalathar:rollup-hcxvdi1, r=Zalathar
95a7944 
Rollup of 9 pull requests

Successful merges:

 - rust-lang#145095 (Migrate `UnsizedConstParamTy`  to unstable impl of `ConstParamTy_`)
 - rust-lang#145960 (Split `FnCtxt::report_args_error` into subfunctions)
 - rust-lang#146402 (interpret: fix overlapping aggregate initialization)
 - rust-lang#146466 (llvm-wrapper: other cleanup)
 - rust-lang#146574 (compiletest: Enable new-output-capture by default)
 - rust-lang#146599 (replace some `#[const_trait]` with `const trait`)
 - rust-lang#146601 (compiletest: Make `./x test --test-args ...` work again)
 - rust-lang#146608 (improve internal bootstrap docs)
 - rust-lang#146609 (bootstrap: lower verbosity of cargo to one less than bootstrap's)

r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@Mark-Simulacrum Mark-Simulacrum

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

Milestone

1.92.0

Development

Successfully merging this pull request may close these issues.

5 participants

@Enselic @rustbot @Mark-Simulacrum @bors @Kobzol