Migrate `raw-dylib-alt-calling-convention`, `raw-dylib-c` and `redundant-libs` `run-make` tests to rmake by Oneirical · Pull Request #128107 · rust-lang/rust

Oneirical · 2024-07-23T17:31:20Z

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

Please try:

// try-job: x86_64-msvc
// try-job: x86_64-mingw
// try-job: i686-msvc
try-job: x86_64-gnu-llvm-17
try-job: aarch64-apple

rustbot · 2024-07-23T17:31:28Z

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 · 2024-07-23T17:31:30Z

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

Kobzol · 2024-07-23T17:42:32Z

@bors try

bors · 2024-07-23T17:43:43Z

⌛ Trying commit 2c740a2 with merge ef5357b...

Migrate `raw-dylib-alt-calling-convention`, `raw-dylib-c` and `redundant-libs` `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: x86_64-mingw

bors · 2024-07-23T19:28:51Z

💔 Test failed - checks-actions

bors · 2024-07-25T07:39:16Z

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

jieyouxu · 2024-07-26T02:12:15Z

tests/run-make/redundant-libs/rmake.rs

+//@ ignore-cross-compile
+// Reason: the compiled binary is executed
+
+//FIXME(Oneirical): msvc


Suggestion: try checking .dll.lib for import library on msvc.

-let lib_path = dynamic_lib_name(lib_name); +let lib_path = if is_msvc() { format!("{lib_name}.dll.lib") } else { dynamic_lib_name(lib_name) };

in run_make_support's c_build

Okay, that was misguided, I'm trying to do the check in the test itself now.

Oneirical · 2024-07-26T15:32:10Z

Please try again. @rustbot ready

Note to self: if this works, add this comment:

    // On msvc, dynamic libraries are compiled by rustc to:
    // bar.dll     // dylib
    // bar.dll.lib // import library for the dylib
    // bar.dll.exp // export library for the dylib
    // msvc's underlying link.exe requires the import library for the dynamic library as input.
    // That is why the library is bar.dll.lib, not bar.dll.

Kobzol · 2024-07-26T15:32:57Z

@bors try

bors · 2024-07-26T15:34:07Z

⌛ Trying commit 5d72321 with merge 9020a44...

Migrate `raw-dylib-alt-calling-convention`, `raw-dylib-c` and `redundant-libs` `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: x86_64-mingw

bors · 2024-07-26T17:22:54Z

💔 Test failed - checks-actions

Oneirical · 2024-08-05T14:12:56Z

Normalization added, please re-approve.
@rustbot review

jieyouxu · 2024-08-06T09:15:48Z

@bors try

Migrate `raw-dylib-alt-calling-convention`, `raw-dylib-c` and `redundant-libs` `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: x86_64-mingw try-job: i686-msvc

bors · 2024-08-06T09:17:32Z

⌛ Trying commit 011727f with merge 656a643...

jieyouxu · 2024-08-06T09:22:08Z

Note to self: needs second batch of try jobs for linux and apple

bors · 2024-08-06T11:17:35Z

☀️ Try build successful - checks-actions
Build commit: 656a643 (656a643e49bde0bb3553459dd9b420ad9add788f)

jieyouxu · 2024-08-06T11:50:36Z

@bors try

Migrate `raw-dylib-alt-calling-convention`, `raw-dylib-c` and `redundant-libs` `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: x86_64-mingw // try-job: i686-msvc try-job: x86_64-gnu-llvm-17 try-job: aarch64-apple

bors · 2024-08-06T11:51:48Z

⌛ Trying commit 011727f with merge 91c0888...

bors · 2024-08-06T14:09:51Z

☀️ Try build successful - checks-actions
Build commit: 91c0888 (91c088870341579fe5751ac47b28b738e5ff4a1d)

jieyouxu · 2024-08-06T14:18:57Z

@bors r+ rollup=iffy (c libs)

bors · 2024-08-06T14:19:00Z

📌 Commit 011727f has been approved by jieyouxu

It is now in the queue for this repository.

…ouxu Migrate `raw-dylib-alt-calling-convention`, `raw-dylib-c` and `redundant-libs` `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: x86_64-mingw // try-job: i686-msvc try-job: x86_64-gnu-llvm-17 try-job: aarch64-apple

Migrate `raw-dylib-alt-calling-convention`, `raw-dylib-c` and `redundant-libs` `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: x86_64-mingw // try-job: i686-msvc try-job: x86_64-gnu-llvm-17 try-job: aarch64-apple

bors · 2024-08-07T03:14:30Z

⌛ Testing commit 011727f with merge e25c3f0...

tgross35 · 2024-08-07T03:18:48Z

@bors retry

This is in a rollup but bors snapped it up faster than me

Rollup of 7 pull requests Successful merges: - rust-lang#128107 (Migrate `raw-dylib-alt-calling-convention`, `raw-dylib-c` and `redundant-libs` `run-make` tests to rmake) - rust-lang#128362 (add test for symbol visibility of `#[naked]` functions) - rust-lang#128417 (Add `f16` and `f128` math functions) - rust-lang#128638 (run-make: enable msvc for `link-dedup`) - rust-lang#128647 (Enable msvc for link-args-order) - rust-lang#128649 (run-make: Enable msvc for `no-duplicate-libs` and `zero-extend-abi-param-passing`) - rust-lang#128766 (Trivial grammar fix in const keyword docs) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#128107 - Oneirical:tomato-hartester, r=jieyouxu Migrate `raw-dylib-alt-calling-convention`, `raw-dylib-c` and `redundant-libs` `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: x86_64-mingw // try-job: i686-msvc try-job: x86_64-gnu-llvm-17 try-job: aarch64-apple

rustbot assigned jieyouxu Jul 23, 2024

Kobzol changed the title ~~Migrate raw-dylib-alt-calling-conventions, raw-dylib-c and redundant-libs run-make tests to rmake~~ Migrate raw-dylib-alt-calling-convention, raw-dylib-c and redundant-libs run-make tests to rmake Jul 23, 2024

Kobzol mentioned this pull request Jul 23, 2024

Tracking Issue for porting run-make tests to use Rust #121876

Closed

This comment has been minimized.

Sign in to view

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 23, 2024

jieyouxu reviewed Jul 26, 2024

View reviewed changes

Oneirical force-pushed the tomato-hartester branch 2 times, most recently from ea44345 to 5d72321 Compare July 26, 2024 15:29

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 26, 2024

This comment has been minimized.

Sign in to view

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 26, 2024

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

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

tgross35 mentioned this pull request Aug 7, 2024

Rollup of 6 pull requests #128765

Closed

tgross35 mentioned this pull request Aug 7, 2024

Rollup of 9 pull requests #128767

Closed

tgross35 mentioned this pull request Aug 7, 2024

Rollup of 7 pull requests #128768

Merged

bors merged commit 0aaffdb into rust-lang:master Aug 7, 2024

rustbot added this to the 1.82.0 milestone Aug 7, 2024

Uh oh!

Conversation

Oneirical commented Jul 23, 2024 • edited by jieyouxu Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Jul 23, 2024

Uh oh!

rustbot commented Jul 23, 2024

Uh oh!

Kobzol commented Jul 23, 2024

Uh oh!

bors commented Jul 23, 2024

Uh oh!

This comment has been minimized.

bors commented Jul 23, 2024

Uh oh!

bors commented Jul 25, 2024

Uh oh!

jieyouxu Jul 26, 2024

Choose a reason for hiding this comment

Uh oh!

Oneirical Jul 26, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Oneirical Jul 26, 2024

Choose a reason for hiding this comment

Uh oh!

Oneirical commented Jul 26, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Kobzol commented Jul 26, 2024

Uh oh!

bors commented Jul 26, 2024

Uh oh!

This comment has been minimized.

bors commented Jul 26, 2024

Uh oh!

Oneirical commented Aug 5, 2024

Uh oh!

jieyouxu commented Aug 6, 2024

Uh oh!

bors commented Aug 6, 2024

Uh oh!

jieyouxu commented Aug 6, 2024

Uh oh!

bors commented Aug 6, 2024

Uh oh!

jieyouxu commented Aug 6, 2024

Uh oh!

bors commented Aug 6, 2024

Uh oh!

bors commented Aug 6, 2024

Uh oh!

jieyouxu commented Aug 6, 2024

Uh oh!

bors commented Aug 6, 2024

Uh oh!

bors commented Aug 7, 2024

Uh oh!

tgross35 commented Aug 7, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Oneirical commented Jul 23, 2024 •

edited by jieyouxu

Loading

Oneirical Jul 26, 2024 •

edited

Loading

Oneirical commented Jul 26, 2024 •

edited

Loading