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 pointer-auth-link-with-c, c-dynamic-rlib and c-dynamic-dylib run-make tests to rmake #127872

Merged
merged 3 commits into from
Jul 25, 2024
Merged

Migrate pointer-auth-link-with-c, c-dynamic-rlib and c-dynamic-dylib run-make tests to rmake #127872

merged 3 commits into from
Jul 25, 2024

Conversation

Oneirical
Copy link
Contributor

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

Please try:

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

@rustbot
Copy link
Collaborator

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

rustbot commented Jul 17, 2024

The run-make-support library was changed

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

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Oneirical Oneirical force-pushed the antestral-traditions branch from 2983350 to 0fa1214 Compare July 17, 2024 20:24
@tgross35
Copy link
Contributor

@bors try

bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 17, 2024
@bors
Auto merge of rust-lang#127872 - Oneirical:antestral-traditions, r=<try>
0fdfa4c 
Migrate `pointer-auth-link-with-c`, `c-dynamic-rlib` and `c-dynamic-dylib` `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
try-job: aarch64-apple
@bors
Copy link
Contributor

bors commented Jul 17, 2024

⌛ Trying commit 0fa1214 with merge 0fdfa4c...

tgross35
tgross35 reviewed Jul 17, 2024
View reviewed changes
src/tools/run-make-support/src/external_deps/c_build.rs
} else {
cc().arg("-v").arg("-c").out_exe(&obj_file).input(src).run();
};
let obj_file = if is_msvc() { format!("{lib_name}.obj") } else { format!("{lib_name}.o") };
Copy link
Contributor

Choose a reason for hiding this comment

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

Obviously not a job for here, but maybe run-make should switch from a &str-based API to Path-based so these turn into e.g. path_buf.set_extension(...) and path.extension().unwrap(), rather than manipulating the strings directly. And then just take impl AsRef<OsStr> everywhere so &str still works.

Copy link
Member

Choose a reason for hiding this comment

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

Yeah, feel free to leave a FIXME here for me.

@Kobzol Kobzol mentioned this pull request Jul 17, 2024
Open
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Jul 17, 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 17, 2024
@jieyouxu
Copy link
Member

Need to take a look at this.
@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 18, 2024
@jieyouxu
Copy link
Member

@rustbot author (pls flip when ready)

@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
@Oneirical Oneirical force-pushed the antestral-traditions branch from 0fa1214 to 96d6694 Compare July 18, 2024 13:25
@Oneirical
Copy link
Contributor Author

Oneirical commented Jul 18, 2024 •
edited
Loading

@bors try (no permissions, please do it)
@rustbot review

@bors
Copy link
Contributor

bors commented Jul 18, 2024

@Oneirical: 🔑 Insufficient privileges: not in try users

@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
@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 22, 2024
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

@jieyouxu
Copy link
Member

@bors r+ rollup=iffy (c native libs and linkage tests)

@bors
Copy link
Contributor

bors commented Jul 22, 2024

📌 Commit 2e3470e 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 22, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 23, 2024
@bors
Auto merge of rust-lang#127872 - Oneirical:antestral-traditions, r=ji…
d8c4e27 
…eyouxu

Migrate `pointer-auth-link-with-c`, `c-dynamic-rlib` and `c-dynamic-dylib` `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
try-job: aarch64-apple
@bors
Copy link
Contributor

bors commented Jul 23, 2024

⌛ Testing commit 2e3470e with merge d8c4e27...

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Jul 23, 2024

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 23, 2024
@jieyouxu
Copy link
Member

Doc typo: DLL_PERFIX

@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 23, 2024
@Oneirical Oneirical force-pushed the antestral-traditions branch from 2e3470e to 710e7b0 Compare July 23, 2024 14:31
@Oneirical
Copy link
Contributor Author

Doc typo: DLL_PERFIX

Hehe, I blame the copypaste! It's good that it was in a doc link, that way CI caught it.

@rustbot review, please re-approve

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

Thanks! @bors r+

@bors
Copy link
Contributor

bors commented Jul 23, 2024

📌 Commit 710e7b0 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 23, 2024
@matthiaskrgr matthiaskrgr mentioned this pull request Jul 25, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 25, 2024
@bors
Auto merge of rust-lang#128169 - matthiaskrgr:rollup-ylsoq30, r=matth…
004e155 
…iaskrgr

Rollup of 5 pull requests

Successful merges:

 - rust-lang#127054 (Reorder trait bound modifiers *after* `for<...>` binder in trait bounds)
 - rust-lang#127528 (Replace ASCII control chars with Unicode Control Pictures)
 - rust-lang#127872 (Migrate `pointer-auth-link-with-c`, `c-dynamic-rlib` and `c-dynamic-dylib` `run-make` tests to rmake)
 - rust-lang#128111 (Do not use question as label)
 - rust-lang#128160 (Don't ICE when auto trait has assoc ty in old solver)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 04e4569 into rust-lang:master Jul 25, 2024
6 checks passed
@rustbot rustbot added this to the 1.82.0 milestone Jul 25, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jul 25, 2024
@rust-timer
Unrolled build for rust-lang#127872
f64425d 
Rollup merge of rust-lang#127872 - Oneirical:antestral-traditions, r=jieyouxu

Migrate `pointer-auth-link-with-c`, `c-dynamic-rlib` and `c-dynamic-dylib` `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
try-job: aarch64-apple
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tgross35 tgross35 tgross35 left review comments

@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 @rust-log-analyzer @tgross35 @bors @jieyouxu