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.

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

Migrate cdylib-dylib-linkage run-make test to rmake #128245

Merged
merged 1 commit into from
Aug 6, 2024

Conversation

Oneirical
Copy link
Contributor

@Oneirical Oneirical commented Jul 26, 2024

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

Those sysroot tests are always fun. I'm getting local errors that don't make a lot of sense about my own sysroot not existing, so I am trying this in CI to see what happens.

EDIT: I am getting the same error here. The strange thing is, when I try to navigate to /checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib on my personal computer, the directory does exist, but the error message is that the directory does not.

EDIT 2: The sysroot path just needed to be trimmed!

Please try:

// try-job: x86_64-msvc // passed previously
try-job: x86_64-mingw
try-job: x86_64-gnu-llvm-18
try-job: i686-msvc
try-job: aarch64-apple

@rustbot
Copy link
Collaborator

rustbot commented Jul 26, 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 26, 2024
@rust-log-analyzer

This comment has been minimized.

@jieyouxu
Copy link
Member

I'll take a look at this (eventually™), I'm looking at some other PRs that also need some holy water.

@jieyouxu
Copy link
Member

uh... does the sysroot path have a newline?

the directory in path "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2
/lib/rustlib/x86_64-unknown-linux-gnu/lib" could not be read: Os { code: 2, kind: NotFound, message: "No such file or directory" }

@Oneirical Oneirical force-pushed the total-linkage-ownage branch from d0ff2cd to 648ce51 Compare July 30, 2024 15:21
@Oneirical Oneirical marked this pull request as ready for review July 30, 2024 15:24
@rustbot
Copy link
Collaborator

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

@jieyouxu
Copy link
Member

@bors try

bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 30, 2024
Migrate `cdylib-dylib-linkage` `run-make` test 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).

~~Those sysroot tests are always fun. I'm getting local errors that don't make a lot of sense about my own sysroot not existing, so I am trying this in CI to see what happens.~~

~~EDIT: I am getting the same error here. The strange thing is, when I try to navigate to `/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib` on my personal computer, the directory does exist, but the error message is that the directory does not.~~

EDIT 2: The sysroot path just needed to be trimmed!

Please try:

try-job: x86_64-msvc
@bors
Copy link
Contributor

bors commented Jul 30, 2024

⌛ Trying commit 648ce51 with merge e44eb08...

@bors
Copy link
Contributor

bors commented Jul 30, 2024

☀️ Try build successful - checks-actions
Build commit: e44eb08 (e44eb08bad6851782de8d67ff7cf15f75fdce9a6)

@jieyouxu
Copy link
Member

@bors try

@bors
Copy link
Contributor

bors commented Jul 30, 2024

⌛ Trying commit 648ce51 with merge c34ae38...

bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 30, 2024
Migrate `cdylib-dylib-linkage` `run-make` test 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).

~~Those sysroot tests are always fun. I'm getting local errors that don't make a lot of sense about my own sysroot not existing, so I am trying this in CI to see what happens.~~

~~EDIT: I am getting the same error here. The strange thing is, when I try to navigate to `/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib` on my personal computer, the directory does exist, but the error message is that the directory does not.~~

EDIT 2: The sysroot path just needed to be trimmed!

Please try:

// try-job: x86_64-msvc // passed previously
try-job: x86_64-mingw
try-job: x86_64-gnu-llvm-18
try-job: i686-msvc
try-job: aarch64-apple
@rust-log-analyzer

This comment has been minimized.

@bors
Copy link
Contributor

bors commented Jul 31, 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 31, 2024
@Oneirical Oneirical force-pushed the total-linkage-ownage branch from 648ce51 to 3c6d739 Compare July 31, 2024 15:59
@Oneirical
Copy link
Contributor Author

The dynamic library std filter was incorrect - it was only looking for files that are "not an rlib, with std in the name somewhere", which could include rmeta files. This new implementation explicitly looks for dylibs with std in their filename.

Please try again. @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 31, 2024
@jieyouxu
Copy link
Member

@bors try

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, just a few suggestions

src/tools/run-make-support/src/path_helpers.rs Outdated Show resolved Hide resolved
tests/run-make/cdylib-dylib-linkage/rmake.rs Outdated Show resolved Hide resolved
@jieyouxu
Copy link
Member

jieyouxu commented Aug 1, 2024

@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 Aug 1, 2024
@Oneirical Oneirical force-pushed the total-linkage-ownage branch from 3c6d739 to 8f599f3 Compare August 1, 2024 15:33
@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-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 1, 2024
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, a few more nits then r=me.

src/tools/run-make-support/src/artifact_names.rs Outdated Show resolved Hide resolved
src/tools/run-make-support/src/artifact_names.rs Outdated Show resolved Hide resolved
@jieyouxu
Copy link
Member

jieyouxu commented Aug 3, 2024

@bors delegate+

@bors
Copy link
Contributor

bors commented Aug 3, 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

@jieyouxu
Copy link
Member

jieyouxu commented Aug 3, 2024

@bors rollup=iffy

@jieyouxu
Copy link
Member

jieyouxu commented Aug 3, 2024

@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 Aug 3, 2024
@bors
Copy link
Contributor

bors commented Aug 3, 2024

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

@Oneirical Oneirical force-pushed the total-linkage-ownage branch from 8f599f3 to 92f5216 Compare August 5, 2024 14:38
@Oneirical Oneirical force-pushed the total-linkage-ownage branch from 92f5216 to 20332da Compare August 5, 2024 14:40
@Oneirical
Copy link
Contributor Author

@bors r=@jieyouxu

@bors
Copy link
Contributor

bors commented Aug 5, 2024

📌 Commit 20332da 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 Aug 5, 2024
@bors
Copy link
Contributor

bors commented Aug 6, 2024

⌛ Testing commit 20332da with merge 60d1465...

@bors
Copy link
Contributor

bors commented Aug 6, 2024

☀️ Test successful - checks-actions
Approved by: jieyouxu
Pushing 60d1465 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 6, 2024
@bors bors merged commit 60d1465 into rust-lang:master Aug 6, 2024
7 checks passed
@rustbot rustbot added this to the 1.82.0 milestone Aug 6, 2024
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (60d1465): 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 (primary 2.8%)

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)
2.8% [2.8%, 2.8%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 2.8% [2.8%, 2.8%] 1

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: 760.454s -> 760.99s (0.07%)
Artifact size: 336.90 MiB -> 336.87 MiB (-0.01%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Status: Done
Development

Successfully merging this pull request may close these issues.

6 participants