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

Oneirical · 2024-05-11T23:45:04Z

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 · 2024-05-11T23:45:11Z

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

src/tools/run-make-support/src/lib.rs

src/tools/run-make-support/src/rustc.rs

jieyouxu · 2024-05-13T09:53:42Z

tests/run-make/issue-11908/rmake.rs

+// 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)


wtf? This seems rather fragile?

Is this comment even accurate anymore?

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.

Unless this fails because of liburl, the comment seems outdated

tests/run-make/issue-11908/rmake.rs

src/tools/run-make-support/src/rustc.rs

rustbot · 2024-05-14T02:48:43Z

The run-make-support library was changed

cc @jieyouxu

Some changes occurred in run-make tests.

cc @jieyouxu

src/tools/run-make-support/src/rustc.rs

bors · 2024-05-14T17:40:31Z

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

jieyouxu · 2024-05-14T20:53:43Z

Thanks, r=me after CI is green

@bors delegate+

bors · 2024-05-14T20:53:46Z

✌️ @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 · 2024-05-14T22:18:38Z

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

Oneirical · 2024-05-15T00:04:32Z

@bors r=@jieyouxu

bors · 2024-05-15T00:04:34Z

📌 Commit 81f7e54 has been approved by jieyouxu

It is now in the queue for this repository.

bors · 2024-05-15T02:10:12Z

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

bors · 2024-05-15T04:14:51Z

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

rust-timer · 2024-05-15T05:30:38Z

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

Update Rust toolchain from nightly-2024-05-15 to nightly-2024-05-16 without any other source changes. This is an automatically generated pull request. If any of the CI checks fail, manual intervention is required. In such a case, review the changes at https://github.com/rust-lang/rust from rust-lang@8387315 up to rust-lang@1871252. The log for this commit range is: rust-lang@1871252fc8 Auto merge of rust-lang#125164 - fmease:rollup-s5vwzlg, r=fmease rust-lang@734a109998 Rollup merge of rust-lang#125159 - fmease:allow-unauth-labels-l-pg-z, r=jieyouxu rust-lang@601e5d199f Rollup merge of rust-lang#125154 - FractalFir:fnabi_doc, r=compiler-errors rust-lang@09156291e5 Rollup merge of rust-lang#125146 - Oneirical:panic-impl, r=jieyouxu rust-lang@80f991e09b Rollup merge of rust-lang#125142 - GuillaumeGomez:migrate-rustdoc-themes, r=jieyouxu rust-lang@c5b17ec9d2 Rollup merge of rust-lang#125003 - RalfJung:aligned_alloc, r=cuviper rust-lang@257d222e4b Improved the documentation of the FnAbi struct rust-lang@72a48fc68c Allow unauthenticated users to modify `L-*`, `PG-*` and `-Z*` labels rust-lang@b21b74b5e6 Auto merge of rust-lang#125134 - compiler-errors:negative-traits-are-not-notable, r=fmease rust-lang@a7484d2e49 fix tidy rust-lang@cae17ff42b rewrite panic-impl-transitive rust-lang@ade234d574 Auto merge of rust-lang#125144 - fmease:rollup-4uft293, r=fmease rust-lang@8d38f2fb11 Rollup merge of rust-lang#125137 - RalfJung:mir-sh, r=scottmcm rust-lang@2659ff3882 Rollup merge of rust-lang#125104 - Oneirical:test6, r=jieyouxu rust-lang@4f7d9d4ad8 Rollup merge of rust-lang#125038 - ivan-shrimp:checked_sub, r=joboet rust-lang@2804d4223b Rollup merge of rust-lang#125027 - Oneirical:c-test-with-remove, r=jieyouxu rust-lang@2e70bea168 Rollup merge of rust-lang#124975 - lu-zero:move_file, r=clubby789 rust-lang@3873a74f8a Rollup merge of rust-lang#124307 - reitermarkus:escape-debug-size-hint-inline, r=joboet rust-lang@3cb0030fe9 Auto merge of rust-lang#123413 - petrochenkov:delegmulti2, r=fmease rust-lang@c765480efe Migrate `run-make/rustdoc-themes` to new rmake rust-lang@c87ae947eb Add new `htmldocck` function to `run-make-support` rust-lang@a71c3ffce9 Auto merge of rust-lang#125032 - compiler-errors:crash-dump-dir, r=onur-ozkan rust-lang@0afd50e852 MIR operators: clarify Shl/Shr handling of negative offsets rust-lang@44fa5fd39a Auto merge of rust-lang#125136 - matthiaskrgr:rollup-ljm15m3, r=matthiaskrgr rust-lang@5f1a120ee5 Rollup merge of rust-lang#125135 - chenyukang:yukang-fix-116502, r=compiler-errors rust-lang@f7c2934420 Rollup merge of rust-lang#125132 - mejrs:diag, r=compiler-errors rust-lang@a8ff937b07 Rollup merge of rust-lang#125108 - Zalathar:info-bitmap-bytes, r=nnethercote rust-lang@03ff673dcc Rollup merge of rust-lang#124990 - fmease:expand-weak-aliases-within-cts, r=compiler-errors rust-lang@75895f59b0 Fix the dedup error because of spans from suggestion rust-lang@9e7aff7945 Auto merge of rust-lang#125031 - Oneirical:dynamic-libs, r=jieyouxu rust-lang@8994840f7e rustdoc: Negative impls are not notable rust-lang@91a3f04a3f fix the test rust-lang@0160bff4b1 Auto merge of rust-lang#125084 - Jules-Bertholet:fix-125058, r=Nadrieril rust-lang@c30b41012d delegation: Implement list delegation rust-lang@18d7411719 Add `on_unimplemented" typo suggestions rust-lang@81f7e54962 Port issue-11908 to rmake rust-lang@1f61cc3078 port no-cdylib-as-rdylib test rust-lang@b1e5e5161a remove cxx_flags rust-lang@1f5837ae25 rewrite c-link-to-rust-staticlib rust-lang@5cc020d3df avoid using aligned_alloc; posix_memalign is better-behaved rust-lang@c81be68fb4 coverage: Remove confusing comments from `CoverageKind` rust-lang@bfadc3a9b9 coverage: `CoverageIdsInfo::mcdc_bitmap_bytes` is never needed rust-lang@fe8f66e4bc `rustc_hir_typeck`: Account for `skipped_ref_pats` in `expr_use_visitor` rust-lang@4db00fe229 Use an helper to move the files rust-lang@7fde7308bf reverse condition in `uN::checked_sub` rust-lang@848f3c2c6e Make crashes dump mir to build dir rust-lang@35a5be2833 Also expand weak alias tys inside consts inside `expand_weak_alias_tys` rust-lang@4edf12d33e Improve escape methods. rust-lang@16981ba406 Avoid panicking branch in `EscapeIterInner`. rust-lang@e3fc97be2b Inline `EscapeDebug::size_hint`. Co-authored-by: celinval <[email protected]> Co-authored-by: Zyad Hassan <[email protected]>

rustbot assigned jieyouxu May 11, 2024

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

This comment has been minimized.

Sign in to view

Kobzol reviewed May 12, 2024

View reviewed changes

src/tools/run-make-support/src/lib.rs Outdated Show resolved Hide resolved

jieyouxu mentioned this pull request May 13, 2024

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

Open

jieyouxu reviewed May 13, 2024

View reviewed changes

src/tools/run-make-support/src/rustc.rs Outdated Show resolved Hide resolved

jieyouxu reviewed May 13, 2024

View reviewed changes

src/tools/run-make-support/src/rustc.rs Outdated Show resolved Hide resolved

jieyouxu reviewed May 13, 2024

View reviewed changes

tests/run-make/issue-11908/rmake.rs Outdated Show resolved Hide resolved

jieyouxu mentioned this pull request May 13, 2024

Migrate rustdoc target spec json path #125071

Merged

jieyouxu reviewed May 14, 2024

View reviewed changes

src/tools/run-make-support/src/rustc.rs Outdated Show resolved Hide resolved

Oneirical marked this pull request as ready for review May 14, 2024 02:48

jieyouxu reviewed May 14, 2024

View reviewed changes

src/tools/run-make-support/src/rustc.rs Outdated Show resolved Hide resolved

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

This comment has been minimized.

Sign in to view

Port issue-11908 to rmake

81f7e54

Oneirical force-pushed the dynamic-libs branch from 1ec53f7 to 81f7e54 Compare May 14, 2024 22:15

bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 15, 2024

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 added the merged-by-bors This PR was explicitly merged by bors. label May 15, 2024

bors merged commit 9e7aff7 into rust-lang:master May 15, 2024
7 checks passed

rustbot added this to the 1.80.0 milestone May 15, 2024

Oneirical deleted the dynamic-libs branch May 15, 2024 13:13

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

Oneirical commented May 11, 2024 •

edited

Loading

rustbot commented May 11, 2024

This comment has been minimized.

This comment has been minimized.

jieyouxu May 13, 2024

jieyouxu May 13, 2024

Oneirical May 14, 2024 •

edited

Loading

jieyouxu May 14, 2024

rustbot commented May 14, 2024

bors commented May 14, 2024

jieyouxu commented May 14, 2024

bors commented May 14, 2024

This comment has been minimized.

jieyouxu commented May 14, 2024

Oneirical commented May 15, 2024

bors commented May 15, 2024

bors commented May 15, 2024

bors commented May 15, 2024

rust-timer commented May 15, 2024

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

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

Conversation

Oneirical commented May 11, 2024 • edited Loading

rustbot commented May 11, 2024

This comment has been minimized.

This comment has been minimized.

jieyouxu May 13, 2024

Choose a reason for hiding this comment

jieyouxu May 13, 2024

Choose a reason for hiding this comment

Oneirical May 14, 2024 • edited Loading

Choose a reason for hiding this comment

jieyouxu May 14, 2024

Choose a reason for hiding this comment

rustbot commented May 14, 2024

bors commented May 14, 2024

jieyouxu commented May 14, 2024

bors commented May 14, 2024

This comment has been minimized.

jieyouxu commented May 14, 2024

Oneirical commented May 15, 2024

bors commented May 15, 2024

bors commented May 15, 2024

bors commented May 15, 2024

rust-timer commented May 15, 2024

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

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

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

Oneirical commented May 11, 2024 •

edited

Loading

Oneirical May 14, 2024 •

edited

Loading