Skip to content

Migrate run-make/doctests-keep-binaries to new rmake.rs format #124658

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 2 commits into from
May 4, 2024
Merged

Migrate run-make/doctests-keep-binaries to new rmake.rs format #124658

merged 2 commits into from
May 4, 2024

Conversation

GuillaumeGomez
Copy link
Member

@GuillaumeGomez GuillaumeGomez commented May 3, 2024 •
edited
Loading

Part of #121876.

r? @jieyouxu

@rustbot
Copy link
Collaborator

rustbot commented May 3, 2024

Some changes occurred in run-make tests.

cc @jieyouxu

The run-make-support library was changed

cc @jieyouxu

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 3, 2024
GuillaumeGomez
GuillaumeGomez commented May 3, 2024
View reviewed changes
src/tools/run-make-support/src/rustdoc.rs Outdated
@@ -62,6 +62,12 @@ impl Rustdoc {
self
}

/// Set the path where the command will be run.
pub fn current_dir<P: AsRef<Path>>(&mut self, path: P) -> &mut Self {
Copy link
Member Author

Choose a reason for hiding this comment

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

Should I add this method in Rustc too?

Copy link
Member

Choose a reason for hiding this comment

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

That makes sense, or even in the impl_helper_methods macro to generate that for all command wrappers.

@rust-log-analyzer

This comment has been minimized.

Sign in to view
jieyouxu
jieyouxu reviewed May 3, 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.

Looks good, just some nitpicks.

src/tools/run-make-support/src/rustdoc.rs Outdated
@@ -62,6 +62,12 @@ impl Rustdoc {
self
}

/// Set the path where the command will be run.
pub fn current_dir<P: AsRef<Path>>(&mut self, path: P) -> &mut Self {
Copy link
Member

Choose a reason for hiding this comment

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

That makes sense, or even in the impl_helper_methods macro to generate that for all command wrappers.

@GuillaumeGomez GuillaumeGomez force-pushed the migrate-to-run-make branch from 7a627a1 to 34df542 Compare May 3, 2024 15:04
@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels May 3, 2024
@GuillaumeGomez
Copy link
Member Author

Moved the implementation of current_dir into the impl_common_helpers macro.

jieyouxu
jieyouxu approved these changes May 3, 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! I like the setup_test_env helper :3

Feel free to r=me after CI is green.

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@GuillaumeGomez GuillaumeGomez force-pushed the migrate-to-run-make branch from 34df542 to 07fe4e6 Compare May 3, 2024 15:12
@GuillaumeGomez
Copy link
Member Author

@bors r=jieyouxu

@bors
Copy link
Collaborator

bors commented May 3, 2024

📌 Commit 07fe4e6 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 3, 2024
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request May 3, 2024
@matthiaskrgr
Rollup merge of rust-lang#124658 - GuillaumeGomez:migrate-to-run-make…
cc9f8d9 
…, r=jieyouxu

Migrate `run-make/doctests-keep-binaries` to new rmake.rs format

r? `@jieyouxu`
@matthiaskrgr matthiaskrgr mentioned this pull request May 3, 2024
Closed
@matthiaskrgr
Copy link
Member

@bors r-
may need reformatting #124673 (comment)

@bors 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 May 3, 2024
@GuillaumeGomez GuillaumeGomez force-pushed the migrate-to-run-make branch from 07fe4e6 to 5ea65c8 Compare May 3, 2024 19:28
@GuillaumeGomez
Copy link
Member Author

Now we can put it into the rollup:

@bors r=jieyouxu rollup

@bors
Copy link
Collaborator

bors commented May 3, 2024

📌 Commit 5ea65c8 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 3, 2024
compiler-errors added a commit to compiler-errors/rust that referenced this pull request May 4, 2024
@compiler-errors
Rollup merge of rust-lang#124658 - GuillaumeGomez:migrate-to-run-make…
ec4b2f3 
…, r=jieyouxu

Migrate `run-make/doctests-keep-binaries` to new rmake.rs format

r? `@jieyouxu`
@compiler-errors compiler-errors mentioned this pull request May 4, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request May 4, 2024
@bors
Auto merge of rust-lang#124688 - compiler-errors:rollup-qhi9pyn, r=co…
b7fb425 
…mpiler-errors

Rollup of 8 pull requests

Successful merges:

 - rust-lang#124293 (Let miri and const eval execute intrinsics' fallback bodies)
 - rust-lang#124418 (Use a proof tree visitor to refine the `Obligation` for error reporting in new solver)
 - rust-lang#124480 (Change `SIGPIPE` ui from `#[unix_sigpipe = "..."]` to `-Zon-broken-pipe=...`)
 - rust-lang#124648 (Trim crate graph)
 - rust-lang#124656 (release notes 1.78: add link to interior-mut breaking change)
 - rust-lang#124658 (Migrate `run-make/doctests-keep-binaries` to new rmake.rs format)
 - rust-lang#124681 (zkvm: fix run_tests)
 - rust-lang#124687 (Make `Bounds.clauses` private)

r? `@ghost`
`@rustbot` modify labels: rollup
compiler-errors added a commit to compiler-errors/rust that referenced this pull request May 4, 2024
@compiler-errors
Rollup merge of rust-lang#124658 - GuillaumeGomez:migrate-to-run-make…
72c9580 
…, r=jieyouxu

Migrate `run-make/doctests-keep-binaries` to new rmake.rs format

r? ``@jieyouxu``
This was referenced May 4, 2024
Closed
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request May 4, 2024
@bors
Auto merge of rust-lang#124694 - compiler-errors:rollup-pfou5uu, r=co…
9fa862f 
…mpiler-errors

Rollup of 8 pull requests

Successful merges:

 - rust-lang#124418 (Use a proof tree visitor to refine the `Obligation` for error reporting in new solver)
 - rust-lang#124480 (Change `SIGPIPE` ui from `#[unix_sigpipe = "..."]` to `-Zon-broken-pipe=...`)
 - rust-lang#124648 (Trim crate graph)
 - rust-lang#124656 (release notes 1.78: add link to interior-mut breaking change)
 - rust-lang#124658 (Migrate `run-make/doctests-keep-binaries` to new rmake.rs format)
 - rust-lang#124678 (Stabilize `split_at_checked`)
 - rust-lang#124681 (zkvm: fix run_tests)
 - rust-lang#124687 (Make `Bounds.clauses` private)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit b2ca667 into rust-lang:master May 4, 2024
@rustbot rustbot added this to the 1.80.0 milestone May 4, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request May 4, 2024
@rust-timer
Unrolled build for rust-lang#124658
5b64b14 
Rollup merge of rust-lang#124658 - GuillaumeGomez:migrate-to-run-make, r=jieyouxu

Migrate `run-make/doctests-keep-binaries` to new rmake.rs format

r? ```@jieyouxu```
@GuillaumeGomez GuillaumeGomez deleted the migrate-to-run-make branch May 4, 2024 10:50
@GuillaumeGomez GuillaumeGomez mentioned this pull request May 4, 2024
Closed
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

@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
Oxidizing run-make tests
Status: Done
Milestone
1.80.0
Development

Successfully merging this pull request may close these issues.
6 participants
@GuillaumeGomez @rustbot @rust-log-analyzer @bors @matthiaskrgr @jieyouxu