Skip to content
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

Rewrite and rename issue-22131 and issue-26006 run-make tests to rmake #127621

Merged
merged 2 commits into from
Jul 19, 2024
Merged

Rewrite and rename issue-22131 and issue-26006 run-make tests to rmake #127621

merged 2 commits into from
Jul 19, 2024

Conversation

Oneirical
Copy link
Contributor

@Oneirical Oneirical commented Jul 11, 2024 •
edited
Loading

Part of #121876 and the associated Google Summer of Code project.

Please try:

try-job: x86_64-msvc
try-job: i686-mingw

@rustbot
Copy link
Collaborator

rustbot commented Jul 11, 2024

r? @jieyouxu

rustbot has assigned @jieyouxu.
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-run-make Area: port run-make Makefiles to rmake.rs 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 Jul 11, 2024
@rustbot
Copy link
Collaborator

rustbot commented Jul 11, 2024

This PR modifies tests/run-make/. If this PR is trying to port a Makefile
run-make test to use rmake.rs, please update the
run-make port tracking issue
so we can track our progress. You can either modify the tracking issue
directly, or you can comment on the tracking issue and link this PR.

cc @jieyouxu

@jieyouxu jieyouxu mentioned this pull request Jul 11, 2024
Open
@jieyouxu
Copy link
Member

@bors delegate+ (for try jobs only)

@bors
Copy link
Contributor

bors commented Jul 11, 2024

✌️ @Oneirical, 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

@bors try

@bors
Copy link
Contributor

bors commented Jul 11, 2024

⌛ Trying commit e97266a with merge add56b1...

bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 11, 2024
@bors
Auto merge of rust-lang#127621 - Oneirical:hypnotest-show, r=<try>
add56b1 
Rewrite and rename `issue-22131` and `issue-26006` `run-make` tests to rmake

Part of rust-lang#121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html).

Please try:

try-job: x86_64-msvc
try-job: test-various
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Jul 11, 2024

💔 Test failed - checks-actions

@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-review Status: Awaiting review from the assignee but also interested parties. labels Jul 11, 2024
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Oneirical
Copy link
Contributor Author

TIL -L cwd() is not baked into rustdoc like it is for rustc in run_make_support.

@Oneirical
Copy link
Contributor Author

@bors try

bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 12, 2024
@bors
Auto merge of rust-lang#127621 - Oneirical:hypnotest-show, r=<try>
3cc3da9 
Rewrite and rename `issue-22131` and `issue-26006` `run-make` tests to rmake

Part of rust-lang#121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html).

Please try:

try-job: x86_64-msvc
try-job: test-various
@bors
Copy link
Contributor

bors commented Jul 12, 2024

⌛ Trying commit 43e1a3e with merge 3cc3da9...

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Jul 12, 2024

💔 Test failed - checks-actions

@Oneirical
Copy link
Contributor Author

Ignore restored, reason added. @rustbot review

@rustbot 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 Jul 12, 2024
jieyouxu
jieyouxu approved these changes Jul 14, 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, changes look good, just some minor nits.

tests/run-make/invalid-symlink-search-path/rmake.rs Outdated Show resolved Hide resolved
tests/run-make/rustdoc-cfgspec-parsing/rmake.rs Outdated Show resolved Hide resolved
@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 17, 2024
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@jieyouxu
Copy link
Member

Tiny import path adjustment.
@rustbot author

@rustbot rustbot 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-review Status: Awaiting review from the assignee but also interested parties. labels Jul 18, 2024
@bors
Copy link
Contributor

bors commented Jul 18, 2024

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

@Oneirical
Copy link
Contributor Author

@rustbot ready
Rebased and fix applied.

@rustbot 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 Jul 18, 2024
@jieyouxu
Copy link
Member

Thanks. r=me after CI is green.
@bors delegate+

@bors
Copy link
Contributor

bors commented Jul 18, 2024

✌️ @Oneirical, 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

@Oneirical
Copy link
Contributor Author

@bors r=@jieyouxu

@bors
Copy link
Contributor

bors commented Jul 18, 2024

📌 Commit fc4404c 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 Jul 18, 2024
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Jul 18, 2024
@GuillaumeGomez
Rollup merge of rust-lang#127621 - Oneirical:hypnotest-show, r=jieyouxu
e761e9b 
Rewrite and rename `issue-22131` and `issue-26006` `run-make` tests to rmake

Part of rust-lang#121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html).

Please try:

try-job: x86_64-msvc
try-job: i686-mingw
@GuillaumeGomez GuillaumeGomez mentioned this pull request Jul 18, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 19, 2024
@bors
Auto merge of rust-lang#127941 - GuillaumeGomez:rollup-s5eqz72, r=Gui…
0cb871d 
…llaumeGomez

Rollup of 5 pull requests

Successful merges:

 - rust-lang#121533 (Handle .init_array link_section specially on wasm)
 - rust-lang#123196 (Add Process support for UEFI)
 - rust-lang#127621 (Rewrite and rename `issue-22131` and `issue-26006` `run-make` tests to rmake)
 - rust-lang#127928 (Migrate `lto-smoke-c` and `link-path-order` `run-make` tests to rmake)
 - rust-lang#127935 (Change `binary_asm_labels` to only fire on x86 and x86_64)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 19, 2024
@bors
Auto merge of rust-lang#127941 - GuillaumeGomez:rollup-s5eqz72, r=Gui…
011c2fc 
…llaumeGomez

Rollup of 5 pull requests

Successful merges:

 - rust-lang#121533 (Handle .init_array link_section specially on wasm)
 - rust-lang#123196 (Add Process support for UEFI)
 - rust-lang#127621 (Rewrite and rename `issue-22131` and `issue-26006` `run-make` tests to rmake)
 - rust-lang#127928 (Migrate `lto-smoke-c` and `link-path-order` `run-make` tests to rmake)
 - rust-lang#127935 (Change `binary_asm_labels` to only fire on x86 and x86_64)

r? `@ghost`
`@rustbot` modify labels: rollup
@matthiaskrgr matthiaskrgr mentioned this pull request Jul 19, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 19, 2024
@bors
Auto merge of rust-lang#127957 - matthiaskrgr:rollup-1u5ivck, r=matth…
3811f40 
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#127350 (Parser: Suggest Placing the Return Type After Function Parameters)
 - rust-lang#127621 (Rewrite and rename `issue-22131` and `issue-26006` `run-make` tests to rmake)
 - rust-lang#127662 (When finding item gated behind a `cfg` flag, point at it)
 - rust-lang#127903 (`force_collect` improvements)
 - rust-lang#127932 (rustdoc: fix `current` class on sidebar modnav)
 - rust-lang#127943 (Don't allow unsafe statics outside of extern blocks)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 7161e2d into rust-lang:master Jul 19, 2024
6 checks passed
@rustbot rustbot added this to the 1.81.0 milestone Jul 19, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jul 19, 2024
@rust-timer
Unrolled build for rust-lang#127621
6695a79 
Rollup merge of rust-lang#127621 - Oneirical:hypnotest-show, r=jieyouxu

Rewrite and rename `issue-22131` and `issue-26006` `run-make` tests to rmake

Part of rust-lang#121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html).

Please try:

try-job: x86_64-msvc
try-job: i686-mingw
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-run-make Area: port run-make Makefiles to rmake.rs 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
Oxidizing run-make tests
Status: Done
Milestone
1.81.0
Development

Successfully merging this pull request may close these issues.
5 participants
@Oneirical @rustbot @jieyouxu @bors @rust-log-analyzer