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

Migrate interdependent-c-libraries, compiler-rt-works-on-mingw and incr-foreign-head-span run-make tests to rmake #127989

Merged
merged 3 commits into from
Jul 26, 2024
Merged

Migrate interdependent-c-libraries, compiler-rt-works-on-mingw and incr-foreign-head-span run-make tests to rmake #127989

merged 3 commits into from
Jul 26, 2024

Conversation

Oneirical
Copy link
Contributor

@Oneirical Oneirical commented Jul 19, 2024 •
edited by jieyouxu
Loading

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

try-job: aarch64-apple
try-job: armhf-gnu
try-job: test-various
try-job: x86_64-mingw
try-job: x86_64-msvc
try-job: x86_64-gnu-llvm-18

@rustbot
Copy link
Collaborator

rustbot commented Jul 19, 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 19, 2024
@rustbot
Copy link
Collaborator

rustbot commented Jul 19, 2024

Some changes occurred in src/tools/compiletest

cc @jieyouxu

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

The run-make-support library was changed

cc @jieyouxu

@Urgau
Copy link
Member

Urgau commented Jul 19, 2024

@bors try

@bors
Copy link
Contributor

bors commented Jul 19, 2024

⌛ Trying commit b6b975d with merge a1f38cb...

bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 19, 2024
@bors
Auto merge of rust-lang#127989 - Oneirical:testricted-area, r=<try>
a1f38cb 
Migrate `interdependent-c-libraries`, `compiler-rt-works-on-mingw` and `incr-foreign-head-span` `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-mingw
try-job: test-various
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Jul 19, 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 19, 2024
@jieyouxu jieyouxu mentioned this pull request Jul 20, 2024
Open
@bors
Copy link
Contributor

bors commented Jul 20, 2024

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

@Oneirical Oneirical force-pushed the testricted-area branch 2 times, most recently from 669f6cd to ba78a9e Compare July 22, 2024 14:09
@Oneirical
Copy link
Contributor Author

@rustbot review
Please run bors try, ignore restored in interdependent-c-libraries.

@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 22, 2024
@jieyouxu
Copy link
Member

@bors try

@jieyouxu
Copy link
Member

@bors delegate+ (for try jobs)

@bors
Copy link
Contributor

bors commented Jul 22, 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

@bors
Copy link
Contributor

bors commented Jul 22, 2024

⌛ Trying commit ba78a9e with merge 29179f4...

bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 22, 2024
@bors
Auto merge of rust-lang#127989 - Oneirical:testricted-area, r=<try>
29179f4 
Migrate `interdependent-c-libraries`, `compiler-rt-works-on-mingw` and `incr-foreign-head-span` `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-mingw
@bors
Copy link
Contributor

bors commented Jul 22, 2024

☀️ Try build successful - checks-actions
Build commit: 29179f4 (29179f451c2a88521b890f20e1ca206619ef49dd)

jieyouxu
jieyouxu approved these changes Jul 22, 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, the changes look reasonable, just some minor nits.

tests/run-make/compiler-rt-works-on-mingw/rmake.rs Outdated Show resolved Hide resolved
src/tools/run-make-support/src/external_deps/cc.rs Show resolved Hide resolved
src/tools/run-make-support/src/external_deps/cc.rs Show resolved Hide resolved
tests/run-make/compiler-rt-works-on-mingw/rmake.rs Show resolved Hide resolved
@jieyouxu
Copy link
Member

@rustbot author

@rustbot rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 22, 2024
@rustbot rustbot added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jul 22, 2024
@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 22, 2024
@jieyouxu
Copy link
Member

@bors try

bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 22, 2024
@bors
Auto merge of rust-lang#127989 - Oneirical:testricted-area, r=<try>
6ab1b97 
Migrate `interdependent-c-libraries`, `compiler-rt-works-on-mingw` and `incr-foreign-head-span` `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).

try-job: aarch64-apple
try-job: armhf-gnu
try-job: test-various
try-job: x86_64-mingw
try-job: x86_64-msvc
try-job: x86_64-gnu-llvm-18
@bors
Copy link
Contributor

bors commented Jul 22, 2024

⌛ Trying commit 3085334 with merge 6ab1b97...

@bors
Copy link
Contributor

bors commented Jul 22, 2024

☀️ Try build successful - checks-actions
Build commit: 6ab1b97 (6ab1b972313b2135e0622b3cd9f4a1d36fb4d1d5)

jieyouxu
jieyouxu approved these changes Jul 25, 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!

@jieyouxu
Copy link
Member

This needs a rebase for the tidy list, r=me after that.
@bors delegate+

@bors
Copy link
Contributor

bors commented Jul 25, 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 rollup=iffy (cxx, incremental, native libs)

@jieyouxu
Copy link
Member

@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 25, 2024
@Oneirical
Copy link
Contributor Author

@bors r=@jieyouxu

@bors
Copy link
Contributor

bors commented Jul 25, 2024

📌 Commit e175b83 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 Jul 25, 2024
@tgross35 tgross35 mentioned this pull request Jul 26, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 26, 2024
@bors
Auto merge of rust-lang#128222 - tgross35:rollup-fk7qdo3, r=tgross35
83d6768 
Rollup of 7 pull requests

Successful merges:

 - rust-lang#126575 (Make it crystal clear what lint `type_alias_bounds` actually signifies)
 - rust-lang#127017 (Extend rules of dead code analysis for impls for adts to impls for types refer to adts)
 - rust-lang#127523 (Migrate `dump-ice-to-disk` and `panic-abort-eh_frame` `run-make` tests to rmake)
 - rust-lang#127557 (Add a label to point to the lacking macro name definition)
 - rust-lang#127989 (Migrate `interdependent-c-libraries`, `compiler-rt-works-on-mingw` and `incr-foreign-head-span` `run-make` tests to rmake)
 - rust-lang#128099 (migrate tests/run-make/extern-flag-disambiguates to rmake)
 - rust-lang#128170 (Make Clone::clone a lang item)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 4290de8 into rust-lang:master Jul 26, 2024
6 checks passed
@rustbot rustbot added this to the 1.82.0 milestone Jul 26, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jul 26, 2024
@rust-timer
Unrolled build for rust-lang#127989
a0b15fa 
Rollup merge of rust-lang#127989 - Oneirical:testricted-area, r=jieyouxu

Migrate `interdependent-c-libraries`, `compiler-rt-works-on-mingw` and `incr-foreign-head-span` `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).

try-job: aarch64-apple
try-job: armhf-gnu
try-job: test-various
try-job: x86_64-mingw
try-job: x86_64-msvc
try-job: x86_64-gnu-llvm-18
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.82.0
Development

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