Skip to content

Migrate staticlib-dylib-linkagerun-make test to rmake - #128696

Merged
bors merged 1 commit into
rust-lang:masterfrom
Oneirical:second-linkage-rampage
Aug 8, 2024
Merged

Migrate staticlib-dylib-linkagerun-make test to rmake#128696
bors merged 1 commit into
rust-lang:masterfrom
Oneirical:second-linkage-rampage

Conversation

@Oneirical

@OneiricalOneirical commented Aug 5, 2024•
edited by jieyouxu
Loading

Copy link
Copy Markdown
Contributor

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

I'm quite sure this has the same issue as the one brought up in this discussion, so I elected to keep the ignore MSVC.

try-job: aarch64-apple
try-job: x86_64-gnu-llvm-17
try-job: armhf-gnu

@rustbot

rustbot commented Aug 5, 2024

Copy link
Copy Markdown
Collaborator

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

@rustbotrustbot 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 Aug 5, 2024
@rustbot

rustbot commented Aug 5, 2024

Copy link
Copy Markdown
Collaborator

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

@KobzolKobzol mentioned this pull request Aug 5, 2024
Closed
jieyouxu
jieyouxu approved these changes Aug 5, 2024
View reviewed changes

@jieyouxujieyouxu left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks, this seems reasonable, just a few nits.

Comment threadtests/run-make/staticlib-dylib-linkage/rmake.rs Outdated
Comment threadtests/run-make/staticlib-dylib-linkage/rmake.rs
@jieyouxu

jieyouxu commented Aug 5, 2024

Copy link
Copy Markdown
Member

@bors try

@jieyouxu

jieyouxu commented Aug 5, 2024

Copy link
Copy Markdown
Member

@rustbot author

@rustbotrustbot 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 Aug 5, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 5, 2024
@bors
Auto merge ofrust-lang#128696- Oneirical:second-linkage-rampage, r=…
0bebf25
…<try>
Migrate `staticlib-dylib-linkage` `run-make` test 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).
I'm quite sure this has the same issue as the one brought up in [this discussion](rust-lang#128407 (comment)), so I elected to keep the ignore MSVC.
try-job: aarch64-apple
try-job: x86_64-gnu-llvm-17
try-job: armhf-gnu
@bors

bors commented Aug 5, 2024

Copy link
Copy Markdown
Collaborator

⌛ Trying commit e3c1ad4 with merge 0bebf25...

@bors

bors commented Aug 6, 2024

Copy link
Copy Markdown
Collaborator

☀️ Try build successful - checks-actions
Build commit: 0bebf25 (0bebf25e823c1e13d85d9553a26145b387ec95b1)

@Oneirical
Oneiricalforce-pushed the second-linkage-rampage branch from e3c1ad4 to 608b322CompareAugust 6, 2024 14:59
@rustbot

rustbot commented Aug 6, 2024

Copy link
Copy Markdown
Collaborator

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

@Oneirical

Oneirical commented Aug 6, 2024

Copy link
Copy Markdown
ContributorAuthor

All review remarks applied. @rustbot review

@rustbotrustbot 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 Aug 6, 2024
@jieyouxu

jieyouxu commented Aug 6, 2024

Copy link
Copy Markdown
Member

Thanks, r=me after CI is green
@bors delegate+ rollup=iffy

@bors

bors commented Aug 6, 2024

Copy link
Copy Markdown
Collaborator

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

Oneirical commented Aug 6, 2024

Copy link
Copy Markdown
ContributorAuthor

@bors r=@jieyouxu

@bors

bors commented Aug 6, 2024

Copy link
Copy Markdown
Collaborator

📌 Commit 608b322 has been approved by jieyouxu

It is now in the queue for this repository.

@borsbors 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 Aug 6, 2024
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Aug 7, 2024
@matthiaskrgr
Rollup merge ofrust-lang#128696- Oneirical:second-linkage-rampage, …
acef3a1
…r=jieyouxu
Migrate `staticlib-dylib-linkage` `run-make` test 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).
I'm quite sure this has the same issue as the one brought up in [this discussion](rust-lang#128407 (comment)), so I elected to keep the ignore MSVC.
try-job: aarch64-apple
try-job: x86_64-gnu-llvm-17
try-job: armhf-gnu
@matthiaskrgrmatthiaskrgr mentioned this pull request Aug 7, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 7, 2024
@bors
Auto merge ofrust-lang#128785- matthiaskrgr:rollup-13chr4m, r=matth…
d6092d0
…iaskrgr
Rollup of 5 pull requests
Successful merges:
- rust-lang#128384 (Add tests to ensure MTE tags are preserved across FFI boundaries)
- rust-lang#128407 (Migrate `min-global-align` and `no-alloc-shim` `run-make` tests to rmake)
- rust-lang#128584 (Add a set of tests for LLVM 19)
- rust-lang#128636 (migrate `thumb-none-cortex-m` to rmake)
- rust-lang#128696 (Migrate `staticlib-dylib-linkage` `run-make` test to rmake)
Failed merges:
- rust-lang#128639 (migrate `thumb-none-qemu` to rmake)
r? `@ghost`
`@rustbot` modify labels: rollup
@matthiaskrgrmatthiaskrgr mentioned this pull request Aug 7, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 7, 2024
@bors
Auto merge ofrust-lang#128793- matthiaskrgr:rollup-ork16t0, r=matth…
86e7875
…iaskrgr
Rollup of 4 pull requests
Successful merges:
- rust-lang#128363 (Migrate `pdb-buildinfo-cl-cmd` and `pgo-indirect-call-promotion` `run-make` tests to rmake)
- rust-lang#128384 (Add tests to ensure MTE tags are preserved across FFI boundaries)
- rust-lang#128636 (migrate `thumb-none-cortex-m` to rmake)
- rust-lang#128696 (Migrate `staticlib-dylib-linkage` `run-make` test to rmake)
Failed merges:
- rust-lang#128407 (Migrate `min-global-align` and `no-alloc-shim` `run-make` tests to rmake)
- rust-lang#128639 (migrate `thumb-none-qemu` to rmake)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit 26787a8 into rust-lang:masterAug 8, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Aug 8, 2024
@rust-timer
Unrolled build forrust-lang#128696
c248778
Rollup merge of rust-lang#128696 - Oneirical:second-linkage-rampage, r=jieyouxu
Migrate `staticlib-dylib-linkage` `run-make` test 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).
I'm quite sure this has the same issue as the one brought up in [this discussion](rust-lang#128407 (comment)), so I elected to keep the ignore MSVC.
try-job: aarch64-apple
try-job: x86_64-gnu-llvm-17
try-job: armhf-gnu
@rustbotrustbot added this to the 1.82.0 milestone Aug 8, 2024
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jieyouxujieyouxujieyouxu approved these changes

Assignees

@jieyouxujieyouxu

Labels

A-run-makeArea: port run-make Makefiles to rmake.rsA-testsuiteArea: The testsuite used to check the correctness of rustcS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-bootstrapRelevant 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.82.0

Development

Successfully merging this pull request may close these issues.

4 participants

@Oneirical@rustbot@jieyouxu@bors