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 8 very similar FFI run-make tests to rmake #127491

Merged
merged 8 commits into from
Jul 18, 2024
Merged

Migrate 8 very similar FFI run-make tests to rmake #127491

merged 8 commits into from
Jul 18, 2024

Conversation

Oneirical
Copy link
Contributor

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

There are some more of these, but while the code is almost always the same, I want to keep the number reasonable so my doc comments can be inspected for potential inaccuracies. Tell me if 8 is too much, I can cut this down.

For the tracking issue:

  • issue-25581
  • extern-fn-with-extern-types
  • extern-fn-struct-passing-abi
  • longjmp-across-rust
  • static-extern-type
  • extern-fn-explicit-align
  • extern-fn-with-packed-struct
  • extern-fn-mangle

@rustbot
Copy link
Collaborator

rustbot commented Jul 8, 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 the A-run-make Area: port run-make Makefiles to rmake.rs label Jul 8, 2024
@rustbot
Copy link
Collaborator

rustbot commented Jul 8, 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

@rustbot rustbot added 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 8, 2024
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Oneirical
Copy link
Contributor Author

error adding symbols: archive has no index; run ranlib to add one

Yikes. According to some quick research, this has something to do with the AR command... I've seen a suggestion to use llvm-ar here. Maybe this could be pertinent the same way we're replacing nm with llvm-readobj.

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

build_native_static_lib IIRC was present in another PR. Should we mark this PR as blocked on the other PR being merged?
@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 12, 2024
@jieyouxu
Copy link
Member

error adding symbols: archive has no index; run ranlib to add one

Yikes. According to some quick research, this has something to do with the AR command... I've seen a suggestion to use llvm-ar here. Maybe this could be pertinent the same way we're replacing nm with llvm-readobj.

I don't mind switching back from ar crate to llvm-ar, seeing as we would reasonably expect llvm-ar to be present in the environment for consistency across multiple environments. I think it's worth a try.

@Oneirical Oneirical mentioned this pull request Jul 12, 2024
Merged
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Oneirical
Copy link
Contributor Author

Oneirical commented Jul 12, 2024 •
edited

Very splendid, llvm-ar looks like it works. Maybe there are some try-jobs you may be interested in running.
Edit: one is currently running on #126208, which has the same logic as this PR, so it may be worthwhile to check its result.
@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
Copy link
Member

@rustbot blocked (on #126208 due to shared build_native_static_lib and llvm_ar changes)

@rustbot rustbot added S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 14, 2024
@Oneirical
Copy link
Contributor Author

@rustbot blocked (#127760)

@bors
Copy link
Contributor

bors commented Jul 17, 2024

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

@Oneirical
Copy link
Contributor Author

@rustbot review

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. labels Jul 17, 2024
@jieyouxu
Copy link
Member

@bors r+ rollup=iffy (c builds)

@bors
Copy link
Contributor

bors commented Jul 18, 2024

📌 Commit c68d25b 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
@tgross35 tgross35 mentioned this pull request Jul 18, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 18, 2024
@bors
Auto merge of rust-lang#127906 - tgross35:rollup-41bhgce, r=tgross35
b01a977 
Rollup of 7 pull requests

Successful merges:

 - rust-lang#127491 (Migrate 8 very similar FFI `run-make` tests to rmake)
 - rust-lang#127687 (Const-to-pattern-to-MIR cleanup)
 - rust-lang#127822 (Migrate `issue-85401-static-mir`, `missing-crate-dependency` and `unstable-flag-required` `run-make` tests to rmake)
 - rust-lang#127842 (Remove `TrailingToken`.)
 - rust-lang#127864 (cleanup: remove support for 3DNow! cpu features)
 - rust-lang#127899 (Mark myself as on leave)
 - rust-lang#127901 (Add missing GHA group for building `llvm-bitcode-linker`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 78fe5f7 into rust-lang:master Jul 18, 2024
6 checks passed
@rustbot rustbot added this to the 1.81.0 milestone Jul 18, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jul 18, 2024
@rust-timer
Unrolled build for rust-lang#127491
5672b4a 
Rollup merge of rust-lang#127491 - Oneirical:bulletproof-test, r=jieyouxu

Migrate 8 very similar FFI `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).

There are some more of these, but while the code is almost always the same, I want to keep the number reasonable so my doc comments can be inspected for potential inaccuracies. Tell me if 8 is too much, I can cut this down.

For the tracking issue:

- issue-25581
- extern-fn-with-extern-types
- extern-fn-struct-passing-abi
- longjmp-across-rust
- static-extern-type
- extern-fn-explicit-align
- extern-fn-with-packed-struct
- extern-fn-mangle
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jieyouxu jieyouxu jieyouxu left review comments

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.

None yet
5 participants
@Oneirical @rustbot @rust-log-analyzer @jieyouxu @bors