Migrate `share-generics-dylib`, `raw-dylib-import-name-type`, `raw-dylib-link-ordinal` and `raw-dylib-stdcall-ordinal` `run-make` tests to rmake #128112

Oneirical · 2024-07-23T20:01:00Z

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

Please try:

// try-job: i686-msvc // already successful
try-job: aarch64-apple
try-job: armhf-gnu
try-job: test-various
try-job: x86_64-msvc
try-job: x86_64-gnu-llvm-18

rustbot · 2024-07-23T20:01:08Z

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-23T20:01:10Z

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-24T07:04:59Z

@bors try

…=<try> Migrate `share-generics-dylib`, `raw-dylib-import-name-type`, `raw-dylib-link-ordinal` and `raw-dylib-stdcall-ordinal` `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: test-various

bors · 2024-07-24T07:06:11Z

⌛ Trying commit 1358c84 with merge 2e29667...

bors · 2024-07-24T09:06:28Z

☀️ Try build successful - checks-actions
Build commit: 2e29667 (2e296678da9123b9b6177e2f1866f02724f51c2a)

jieyouxu

Thanks for the PR. I have a concern about how tests/run-make/raw-dylib-stdcall-ordinal/rmake.rs is not failing the try job.

tests/run-make/raw-dylib-import-name-type/rmake.rs

tests/run-make/raw-dylib-link-ordinal/Makefile

tests/run-make/raw-dylib-link-ordinal/rmake.rs

jieyouxu · 2024-07-24T11:45:05Z

tests/run-make/raw-dylib-stdcall-ordinal/rmake.rs

+            .run();
+    };
+    let out = run("driver").stdout_utf8();
+    diff().expected_file("output.txt").actual_text("actual", out).normalize(r#"\r"#, "").run();


Problem/Question: this output.txt is a bit suspicious to me, are we sure this isn't supposed to be expected_output.txt?

The other test tests/run-make/raw-dylib-link-ordinal does in fact have a output.txt, but in this test directory there's only expected_output.txt.

Or rather, how did this not fail the try job? Am I missing something here?

x86_64-mingw and x86_64-msvc: raw-dylib-stdcall-ordinal ... ignored, only executed when the architecture is x86

????????????????

Okay, I replaced it with the seemingly more sensible only-x86_64.

Problem: actually, sorry I didn't quite register this: if the original test was //@ only-x86, then this is not more sensible than //@ only-x86_64, because according to compiletest only-* directive matching precedence, the matcher that takes precedence for our case here is target architecture precise match, so in this sense x86 is the 32-bit x86 architecture while x86_64 is the 64-bit x86_64 architecture.

tests/run-make/share-generics-dylib/rmake.rs

Oneirical · 2024-07-24T14:36:56Z

Please run tryjob again.

@rustbot ready

jieyouxu · 2024-07-24T17:27:07Z

@bors try

bors · 2024-07-24T17:28:19Z

⌛ Trying commit ac43dba with merge bea5ad5...

…=<try> Migrate `share-generics-dylib`, `raw-dylib-import-name-type`, `raw-dylib-link-ordinal` and `raw-dylib-stdcall-ordinal` `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: armhf-gnu try-job: test-various

bors · 2024-07-24T18:28:11Z

💔 Test failed - checks-actions

tests/ui/rfcs/rfc-2627-raw-dylib/import-name-type-unknown-value.rs

tests/run-make/raw-dylib-stdcall-ordinal/rmake.rs

Oneirical · 2024-07-26T15:16:02Z

Please run try again, on Windows 32 bit this time - ignores are back to 32 bit mode.
@rustbot ready

jieyouxu · 2024-07-27T16:14:44Z

@bors try

jieyouxu · 2024-07-27T16:15:02Z

Please r=me if the additional try jobs come back green.
@bors delegate+

bors · 2024-07-27T16:15:05Z

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

…=<try> Migrate `share-generics-dylib`, `raw-dylib-import-name-type`, `raw-dylib-link-ordinal` and `raw-dylib-stdcall-ordinal` `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: i686-msvc // already successful try-job: aarch64-apple try-job: armhf-gnu try-job: test-various try-job: x86_64-msvc try-job: x86_64-gnu-llvm-18

bors · 2024-07-27T16:15:54Z

⌛ Trying commit fdb2e90 with merge 6223861...

bors · 2024-07-27T18:26:45Z

☀️ Try build successful - checks-actions
Build commit: 6223861 (6223861f7646254723854b5fb929079fbffcadf0)

jieyouxu · 2024-07-27T19:15:30Z

@bors r+ rollup=iffy

bors · 2024-07-27T19:15:32Z

📌 Commit fdb2e90 has been approved by jieyouxu

It is now in the queue for this repository.

bors · 2024-07-28T07:29:38Z

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

jieyouxu · 2024-07-28T07:34:26Z

r=me with a rebase

Oneirical · 2024-07-29T14:59:04Z

@bors r=@jieyouxu

bors · 2024-07-29T14:59:06Z

📌 Commit 23cccb3 has been approved by jieyouxu

It is now in the queue for this repository.

bors · 2024-07-29T16:59:46Z

⌛ Testing commit 23cccb3 with merge 66e5852...

bors · 2024-07-29T19:21:57Z

☀️ Test successful - checks-actions
Approved by: jieyouxu
Pushing 66e5852 to master...

rust-timer · 2024-07-29T21:03:15Z

Finished benchmarking commit (66e5852): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results (secondary -5.9%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-5.9%	[-5.9%, -5.9%]	1
All ❌✅ (primary)	-	-	0

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 770.467s -> 770.008s (-0.06%)
Artifact size: 331.84 MiB -> 331.82 MiB (-0.01%)

rustbot assigned jieyouxu Jul 23, 2024

Kobzol mentioned this pull request Jul 24, 2024

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

Open

jieyouxu requested changes Jul 24, 2024

View reviewed changes

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

Oneirical force-pushed the testidigitation-cantrip branch from 1358c84 to 6efba49 Compare July 24, 2024 14:11

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

jieyouxu requested changes Jul 24, 2024

View reviewed changes

tests/ui/rfcs/rfc-2627-raw-dylib/import-name-type-unknown-value.rs Outdated Show resolved Hide resolved

tests/run-make/raw-dylib-stdcall-ordinal/rmake.rs Outdated Show resolved Hide resolved

Oneirical force-pushed the testidigitation-cantrip branch 2 times, most recently from bee9bda to 070567a Compare July 26, 2024 15:14

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

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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 28, 2024

Oneirical added 4 commits July 29, 2024 10:58

rewrite share-generics-dylib to rmake

0c8f194

rewrite raw-dylib-import-name-type to rmake

8c09a7f

rewrite raw-dylib-link-ordinal to rmake

9ffe161

rewrite raw-dylib-stdcall-ordinal to rmake

23cccb3

Oneirical force-pushed the testidigitation-cantrip branch from fdb2e90 to 23cccb3 Compare July 29, 2024 14:58

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

bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 29, 2024

bors merged commit 66e5852 into rust-lang:master Jul 29, 2024
7 checks passed

rustbot added this to the 1.82.0 milestone Jul 29, 2024

bors mentioned this pull request Jul 29, 2024

Migrate raw-dylib-alt-calling-convention, raw-dylib-c and redundant-libs run-make tests to rmake #128107

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Migrate `share-generics-dylib`, `raw-dylib-import-name-type`, `raw-dylib-link-ordinal` and `raw-dylib-stdcall-ordinal` `run-make` tests to rmake #128112

Migrate `share-generics-dylib`, `raw-dylib-import-name-type`, `raw-dylib-link-ordinal` and `raw-dylib-stdcall-ordinal` `run-make` tests to rmake #128112

Oneirical commented Jul 23, 2024 •

edited by jieyouxu

Loading

rustbot commented Jul 23, 2024

rustbot commented Jul 23, 2024

Kobzol commented Jul 24, 2024

bors commented Jul 24, 2024

bors commented Jul 24, 2024

jieyouxu left a comment

jieyouxu Jul 24, 2024 •

edited

Loading

Oneirical Jul 24, 2024

Oneirical Jul 24, 2024

jieyouxu Jul 24, 2024 •

edited

Loading

Oneirical commented Jul 24, 2024

jieyouxu commented Jul 24, 2024

bors commented Jul 24, 2024

This comment has been minimized.

bors commented Jul 24, 2024

Oneirical commented Jul 26, 2024 •

edited

Loading

jieyouxu commented Jul 27, 2024

jieyouxu commented Jul 27, 2024

bors commented Jul 27, 2024

bors commented Jul 27, 2024

bors commented Jul 27, 2024

jieyouxu commented Jul 27, 2024

bors commented Jul 27, 2024

bors commented Jul 28, 2024

jieyouxu commented Jul 28, 2024

Oneirical commented Jul 29, 2024

bors commented Jul 29, 2024

bors commented Jul 29, 2024

bors commented Jul 29, 2024

rust-timer commented Jul 29, 2024

Migrate share-generics-dylib, raw-dylib-import-name-type, raw-dylib-link-ordinal and raw-dylib-stdcall-ordinal run-make tests to rmake #128112

Migrate share-generics-dylib, raw-dylib-import-name-type, raw-dylib-link-ordinal and raw-dylib-stdcall-ordinal run-make tests to rmake #128112

Conversation

Oneirical commented Jul 23, 2024 • edited by jieyouxu Loading

rustbot commented Jul 23, 2024

rustbot commented Jul 23, 2024

Kobzol commented Jul 24, 2024

bors commented Jul 24, 2024

bors commented Jul 24, 2024

jieyouxu left a comment

Choose a reason for hiding this comment

jieyouxu Jul 24, 2024 • edited Loading

Choose a reason for hiding this comment

Oneirical Jul 24, 2024

Choose a reason for hiding this comment

Oneirical Jul 24, 2024

Choose a reason for hiding this comment

jieyouxu Jul 24, 2024 • edited Loading

Choose a reason for hiding this comment

Oneirical commented Jul 24, 2024

jieyouxu commented Jul 24, 2024

bors commented Jul 24, 2024

This comment has been minimized.

bors commented Jul 24, 2024

Oneirical commented Jul 26, 2024 • edited Loading

jieyouxu commented Jul 27, 2024

jieyouxu commented Jul 27, 2024

bors commented Jul 27, 2024

bors commented Jul 27, 2024

bors commented Jul 27, 2024

jieyouxu commented Jul 27, 2024

bors commented Jul 27, 2024

bors commented Jul 28, 2024

jieyouxu commented Jul 28, 2024

Oneirical commented Jul 29, 2024

bors commented Jul 29, 2024

bors commented Jul 29, 2024

bors commented Jul 29, 2024

rust-timer commented Jul 29, 2024

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Migrate `share-generics-dylib`, `raw-dylib-import-name-type`, `raw-dylib-link-ordinal` and `raw-dylib-stdcall-ordinal` `run-make` tests to rmake #128112

Migrate `share-generics-dylib`, `raw-dylib-import-name-type`, `raw-dylib-link-ordinal` and `raw-dylib-stdcall-ordinal` `run-make` tests to rmake #128112

Oneirical commented Jul 23, 2024 •

edited by jieyouxu

Loading

jieyouxu Jul 24, 2024 •

edited

Loading

jieyouxu Jul 24, 2024 •

edited

Loading

Oneirical commented Jul 26, 2024 •

edited

Loading