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 share-generics-dylib, raw-dylib-import-name-type, raw-dylib-link-ordinal and raw-dylib-stdcall-ordinal run-make tests to rmake #128112

Merged
merged 4 commits into from
Jul 29, 2024
Merged

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

merged 4 commits into from
Jul 29, 2024

Conversation

Oneirical
Copy link
Contributor

@Oneirical Oneirical commented Jul 23, 2024 •
edited by jieyouxu
Loading

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
Copy link
Collaborator

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

rustbot commented Jul 23, 2024

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 Kobzol mentioned this pull request Jul 24, 2024
Open
@Kobzol
Copy link
Contributor

Kobzol commented Jul 24, 2024

@bors try

bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 24, 2024
@bors
Auto merge of rust-lang#128112 - Oneirical:testidigitation-cantrip, r…
2e29667 
…=<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
Copy link
Contributor

bors commented Jul 24, 2024

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

@bors
Copy link
Contributor

bors commented Jul 24, 2024

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

jieyouxu
jieyouxu requested changes Jul 24, 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 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 Outdated Show resolved Hide resolved
tests/run-make/raw-dylib-link-ordinal/Makefile Show resolved Hide resolved
tests/run-make/raw-dylib-link-ordinal/rmake.rs Outdated Show resolved Hide resolved
tests/run-make/raw-dylib-stdcall-ordinal/rmake.rs Outdated
.run();
};
let out = run("driver").stdout_utf8();
diff().expected_file("output.txt").actual_text("actual", out).normalize(r#"\r"#, "").run();
Copy link
Member

@jieyouxu jieyouxu Jul 24, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

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?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

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

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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

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

Copy link
Member

@jieyouxu jieyouxu Jul 24, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

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 Outdated Show resolved Hide resolved
@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 24, 2024
@Oneirical Oneirical force-pushed the testidigitation-cantrip branch from 1358c84 to 6efba49 Compare July 24, 2024 14:11
@Oneirical
Copy link
Contributor Author

Please run tryjob again.

@rustbot ready

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

@bors try

@bors
Copy link
Contributor

bors commented Jul 24, 2024

⌛ Trying commit ac43dba with merge bea5ad5...

bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 24, 2024
@bors
Auto merge of rust-lang#128112 - Oneirical:testidigitation-cantrip, r…
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
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Jul 24, 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 24, 2024
@Oneirical Oneirical force-pushed the testidigitation-cantrip branch 2 times, most recently from bee9bda to 070567a Compare July 26, 2024 15:14
@Oneirical
Copy link
Contributor Author

Oneirical commented Jul 26, 2024 •
edited
Loading

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

@jieyouxu
Copy link
Member

@bors try

@jieyouxu
Copy link
Member

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

@bors
Copy link
Contributor

bors commented Jul 27, 2024

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

bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 27, 2024
@bors
Auto merge of rust-lang#128112 - Oneirical:testidigitation-cantrip, r…
6223861 
…=<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
Copy link
Contributor

bors commented Jul 27, 2024

⌛ Trying commit fdb2e90 with merge 6223861...

@bors
Copy link
Contributor

bors commented Jul 27, 2024

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

@jieyouxu
Copy link
Member

@bors r+ rollup=iffy

@bors
Copy link
Contributor

bors commented Jul 27, 2024

📌 Commit fdb2e90 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 27, 2024
@bors
Copy link
Contributor

bors commented Jul 28, 2024

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

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

r=me with a rebase

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

@bors r=@jieyouxu

@bors
Copy link
Contributor

bors commented Jul 29, 2024

📌 Commit 23cccb3 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 29, 2024
@bors
Copy link
Contributor

bors commented Jul 29, 2024

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

@bors
Copy link
Contributor

bors commented Jul 29, 2024

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 29, 2024
@bors bors merged commit 66e5852 into rust-lang:master Jul 29, 2024
7 checks passed
@rustbot rustbot added this to the 1.82.0 milestone Jul 29, 2024
@bors bors mentioned this pull request Jul 29, 2024
Merged
@rust-timer
Copy link
Collaborator

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%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@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 merged-by-bors This PR was explicitly merged by bors. 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.
7 participants
@Oneirical @rustbot @Kobzol @bors @jieyouxu @rust-log-analyzer @rust-timer