Skip to content

Migrate run-make/issue-11908 to new rmake.rs format#125031

Merged
bors merged 1 commit into
rust-lang:masterfrom
Oneirical:dynamic-libs
May 15, 2024
Merged

Migrate run-make/issue-11908 to new rmake.rs format#125031
bors merged 1 commit into
rust-lang:masterfrom
Oneirical:dynamic-libs

Conversation

@Oneirical

@Oneirical Oneirical commented May 11, 2024

Copy link
Copy Markdown
Contributor

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

Set as draft, because I have a few concerns:

  • I am not sure if target().contains("darwin") is a good way of checking that the target is on OSX.
  • I find it strange that the dylib part of the test adapts to different target platforms, but not the rlib part. Is rlib named the same on all platforms?

@rustbot

rustbot commented May 11, 2024

Copy link
Copy Markdown
Collaborator

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-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 May 11, 2024
@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

Comment thread src/tools/run-make-support/src/lib.rs Outdated
Comment thread src/tools/run-make-support/src/rustc.rs Outdated
Comment thread src/tools/run-make-support/src/rustc.rs Outdated
Comment thread tests/run-make/issue-11908/rmake.rs Outdated
Comment on lines +6 to +8
// Note that this relies on `liburl` to be in the path somewhere else.
// Our aux-built libraries will collide with liburl (they have
// the same version listed)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

wtf? This seems rather fragile?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Is this comment even accurate anymore?

@Oneirical Oneirical May 14, 2024

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Tentatively, it seems like the test author, in this commit, implemented the directory moving commands to fix the collision, but didn't remove the comment. I have removed the comment, but let me know if you think it should be kept in some way, since we are not 100% sure.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Unless this fails because of liburl, the comment seems outdated

Comment thread tests/run-make/issue-11908/rmake.rs Outdated
Comment thread tests/run-make/issue-11908/rmake.rs Outdated
Comment thread tests/run-make/issue-11908/rmake.rs Outdated
Comment thread tests/run-make/issue-11908/rmake.rs Outdated
Comment thread tests/run-make/issue-11908/rmake.rs Outdated
Comment thread tests/run-make/issue-11908/rmake.rs Outdated
Comment thread tests/run-make/issue-11908/rmake.rs Outdated
Comment thread tests/run-make/issue-11908/rmake.rs
Comment thread src/tools/run-make-support/src/rustc.rs Outdated
@Oneirical Oneirical marked this pull request as ready for review May 14, 2024 02:48
@rustbot

rustbot commented May 14, 2024

Copy link
Copy Markdown
Collaborator

The run-make-support library was changed

cc @jieyouxu

Some changes occurred in run-make tests.

cc @jieyouxu

Comment thread src/tools/run-make-support/src/rustc.rs Outdated
@bors

bors commented May 14, 2024

Copy link
Copy Markdown
Collaborator

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

@Oneirical Oneirical force-pushed the dynamic-libs branch 2 times, most recently from 9f64368 to 1236ff3 Compare May 14, 2024 20:52
@jieyouxu

Copy link
Copy Markdown
Member

Thanks, r=me after CI is green

@bors delegate+

@bors

bors commented May 14, 2024

Copy link
Copy Markdown
Collaborator

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

@rust-log-analyzer

This comment has been minimized.

@jieyouxu

Copy link
Copy Markdown
Member

Yeah, -Clto seems better because that flag can take no value (default) or thin/fat

@Oneirical

Copy link
Copy Markdown
Contributor Author

@bors r=@jieyouxu

@bors

bors commented May 15, 2024

Copy link
Copy Markdown
Collaborator

📌 Commit 81f7e54 has been approved by jieyouxu

It is now in the queue for this repository.

@bors bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 15, 2024
@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label May 15, 2024
@bors

bors commented May 15, 2024

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 81f7e54 with merge 9e7aff7...

@bors

bors commented May 15, 2024

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: jieyouxu
Pushing 9e7aff7 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 15, 2024
@bors bors merged commit 9e7aff7 into rust-lang:master May 15, 2024
@rustbot rustbot added this to the 1.80.0 milestone May 15, 2024
@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (9e7aff7): 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 -0.4%)

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.5% [2.5%, 2.5%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-1.9% [-2.7%, -1.2%] 2
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -0.4% [-2.7%, 2.5%] 3

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: 679.642s -> 679.01s (-0.09%)
Artifact size: 315.96 MiB -> 315.99 MiB (0.01%)

@Oneirical Oneirical deleted the dynamic-libs branch May 15, 2024 13:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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

No open projects
Status: Done

Development

Successfully merging this pull request may close these issues.

7 participants