Skip to content

compiletest: Unify cmd2procres with run_command_to_procres#125753

Merged
bors merged 1 commit intorust-lang:masterfrom
Zalathar:procres
May 30, 2024
Merged

compiletest: Unify cmd2procres with run_command_to_procres#125753
bors merged 1 commit intorust-lang:masterfrom
Zalathar:procres

Conversation

@Zalathar
Copy link
Member

@Zalathar Zalathar commented May 30, 2024

Historical context: I originally added run_command_to_procres in #112300 and #114843, because I didn't like the overly-specific failure message in cmd2procres, but at the time I didn't feel confident enough to change the existing code, so I just added my own similar code.

Now I'm going back to remove this redundancy by eliminating cmd2procress, and adjusting all callers to use a slightly-tweaked run_command_to_procres instead.

@rustbot
Copy link
Collaborator

rustbot commented May 30, 2024

r? @wesleywiser

rustbot has assigned @wesleywiser.
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 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 May 30, 2024
@rustbot
Copy link
Collaborator

rustbot commented May 30, 2024

Some changes occurred in src/tools/compiletest

cc @jieyouxu

@jieyouxu jieyouxu self-assigned this May 30, 2024
jieyouxu
jieyouxu approved these changes May 30, 2024
View reviewed changes
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, nice cleanup!

@jieyouxu
Copy link
Member

jieyouxu commented May 30, 2024

r? jieyouxu @bors delegate+

@bors
Copy link
Collaborator

bors commented May 30, 2024

✌️ @Zalathar, you can now approve this pull request!

If @jieyouxu told you to "r=me" after making some further change, please make that change, then do @bors r=@jieyouxu

@jieyouxu
Copy link
Member

jieyouxu commented May 30, 2024

r=me after CI is green

@Zalathar
Copy link
Member Author

Zalathar commented May 30, 2024

CI is green.

@bors r=jieyouxu

@bors
Copy link
Collaborator

bors commented May 30, 2024

📌 Commit 3104365 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 May 30, 2024
fmease added a commit to fmease/rust that referenced this pull request May 30, 2024
@fmease
Rollup merge of rust-lang#125753 - Zalathar:procres, r=jieyouxu
cf66e64 
compiletest: Unify `cmd2procres` with `run_command_to_procres`

Historical context: I originally added `run_command_to_procres` in rust-lang#112300 and rust-lang#114843, because I didn't like the overly-specific failure message in `cmd2procres`, but at the time I didn't feel confident enough to change the existing code, so I just added my own similar code.

Now I'm going back to remove this redundancy by eliminating `cmd2procress`, and adjusting all callers to use a slightly-tweaked `run_command_to_procres` instead.
@fmease fmease mentioned this pull request May 30, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request May 30, 2024
@bors
Auto merge of rust-lang#125755 - fmease:rollup-aybyh6c, r=fmease
343a230 
Rollup of 6 pull requests

Successful merges:

 - rust-lang#124636 (Make `std::env::{set_var, remove_var}` unsafe in edition 2024)
 - rust-lang#125342 (Document platform-specifics for `Read` and `Write` of `File`)
 - rust-lang#125671 (Do not equate `Const`'s ty in `super_combine_const`)
 - rust-lang#125711 (Make `body_owned_by` return the `Body` instead of just the `BodyId`)
 - rust-lang#125745 (Bump the stage0 compiler to beta.7 (2024-05-26))
 - rust-lang#125753 (compiletest: Unify `cmd2procres` with `run_command_to_procres`)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request May 30, 2024
@bors
Auto merge of rust-lang#125755 - fmease:rollup-aybyh6c, r=fmease
d887ce2 
Rollup of 6 pull requests

Successful merges:

 - rust-lang#124636 (Make `std::env::{set_var, remove_var}` unsafe in edition 2024)
 - rust-lang#125342 (Document platform-specifics for `Read` and `Write` of `File`)
 - rust-lang#125671 (Do not equate `Const`'s ty in `super_combine_const`)
 - rust-lang#125711 (Make `body_owned_by` return the `Body` instead of just the `BodyId`)
 - rust-lang#125745 (Bump the stage0 compiler to beta.7 (2024-05-26))
 - rust-lang#125753 (compiletest: Unify `cmd2procres` with `run_command_to_procres`)

r? `@ghost`
`@rustbot` modify labels: rollup
@matthiaskrgr matthiaskrgr mentioned this pull request May 30, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request May 30, 2024
@bors
Auto merge of rust-lang#125761 - matthiaskrgr:rollup-7u082og, r=matth…
f3ff2f1 
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#125342 (Document platform-specifics for `Read` and `Write` of `File`)
 - rust-lang#125711 (Make `body_owned_by` return the `Body` instead of just the `BodyId`)
 - rust-lang#125739 (drop_in_place: weaken the claim of equivalence with drop(ptr.read()))
 - rust-lang#125745 (Bump the stage0 compiler to beta.7 (2024-05-26))
 - rust-lang#125746 (Fix copy-paste error in `Duration::from_weeks` panic message.)
 - rust-lang#125753 (compiletest: Unify `cmd2procres` with `run_command_to_procres`)
 - rust-lang#125754 (coverage: Rename MC/DC `conditions_num` to `num_conditions`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 5e83248 into rust-lang:master May 30, 2024
@rustbot rustbot added this to the 1.80.0 milestone May 30, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request May 30, 2024
@rust-timer
Unrolled build for rust-lang#125753
8992574 
Rollup merge of rust-lang#125753 - Zalathar:procres, r=jieyouxu

compiletest: Unify `cmd2procres` with `run_command_to_procres`

Historical context: I originally added `run_command_to_procres` in rust-lang#112300 and rust-lang#114843, because I didn't like the overly-specific failure message in `cmd2procres`, but at the time I didn't feel confident enough to change the existing code, so I just added my own similar code.

Now I'm going back to remove this redundancy by eliminating `cmd2procress`, and adjusting all callers to use a slightly-tweaked `run_command_to_procres` instead.
@Zalathar Zalathar deleted the procres branch May 30, 2024 14:00
flip1995 pushed a commit to flip1995/rust that referenced this pull request Jun 13, 2024
@bors
Auto merge of rust-lang#125761 - matthiaskrgr:rollup-7u082og, r=matth…
b7a6c2d 
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#125342 (Document platform-specifics for `Read` and `Write` of `File`)
 - rust-lang#125711 (Make `body_owned_by` return the `Body` instead of just the `BodyId`)
 - rust-lang#125739 (drop_in_place: weaken the claim of equivalence with drop(ptr.read()))
 - rust-lang#125745 (Bump the stage0 compiler to beta.7 (2024-05-26))
 - rust-lang#125746 (Fix copy-paste error in `Duration::from_weeks` panic message.)
 - rust-lang#125753 (compiletest: Unify `cmd2procres` with `run_command_to_procres`)
 - rust-lang#125754 (coverage: Rename MC/DC `conditions_num` to `num_conditions`)

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

@jieyouxu jieyouxu jieyouxu approved these changes

Assignees

@wesleywiser wesleywiser

@jieyouxu jieyouxu

Labels

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

No open projects
compiletest maintenance and improvements
Status: Done

Milestone

1.80.0

Development

Successfully merging this pull request may close these issues.

5 participants

@Zalathar @rustbot @jieyouxu @bors @wesleywiser