strip `-Wlinker-messages` wrappers from `rust-lld` rmake test #138052

lqd · 2025-03-05T10:57:26Z

The tests/run-make/rust-lld rmake test is failing locally on my M1, due to linker messages being in a different shape than the test expects: it asserts that the LLD version is the first linker message, which is seemingly not always the case on osx I guess.

thread 'main' panicked at /Users/lqd/rust/lqd-rust/tests/run-make/rust-lld/rmake.rs:24:5:
the LLD version string should be present in the output logs:
warning: linker stderr: rust-lld: directory not found for option -L/usr/local/lib
         LLD 20.1.0 (https://github.com/rust-lang/llvm-project.git 1c3bb96fdb6db7b8e8f24edb016099c223fdd27e)
         Library search paths:
             /Users/lqd/rust/lqd-rust/build/aarch64-apple-darwin/test/run-make/rust-lld/rmake_out
             /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib
         Framework search paths:
             /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks

This PR normalizes away the -Wlinker-messages wrappers around the linker output, to remove the requirement that the linker version is the first linker message / is prefixed with the warning wrapper in the regex.

(also another strange thing to explain the pre-existing regex: it seems the LLD version is sometimes output on stderr sometimes on stdout cool stuff)

We could do this for the other lld rmake tests, but they're only enabled on x64 linux so less likely to have random linker messages appearing without anyone noticing.

rustbot · 2025-03-05T10:57:31Z

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

lqd · 2025-03-05T10:58:12Z

@bors try

strip `-Wlinker-messages` wrappers from `rust-lld` rmake test The `tests/run-make/rust-lld` rmake test is failing locally on my M1, due to linker messages being in a different shape than the test expects: it asserts that the LLD version is the first linker message, which is seemingly not always the case on osx I guess. ```console thread 'main' panicked at /Users/lqd/rust/lqd-rust/tests/run-make/rust-lld/rmake.rs:24:5: the LLD version string should be present in the output logs: warning: linker stderr: rust-lld: directory not found for option -L/usr/local/lib LLD 20.1.0 (https://github.com/rust-lang/llvm-project.git 1c3bb96fdb6db7b8e8f24edb016099c223fdd27e) Library search paths: /Users/lqd/rust/lqd-rust/build/aarch64-apple-darwin/test/run-make/rust-lld/rmake_out /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib Framework search paths: /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks ``` This PR normalizes away the `-Wlinker-messages` wrappers around the linker output, to remove the requirement that the linker version is the first linker message / is prefixed with the warning wrapper in the regex. (also another strange thing to explain the pre-existing regex: it seems the LLD version is sometimes output on stderr sometimes on stdout cool stuff) We could do this for the other lld rmake tests, but they're only enabled on x64 linux so less likely to have random linker messages appearing without anyone noticing. try-job: x86_64-apple-1 try-job: x86_64-apple-2 try-job: aarch64-apple r? ghost

bors · 2025-03-05T10:59:23Z

⌛ Trying commit 36efaf8 with merge 59a7e7b...

Kobzol · 2025-03-05T11:31:19Z

tests/run-make/rust-lld/rmake.rs

-        Regex::new(r"^warning: linker std(out|err): LLD [0-9]+\.[0-9]+\.[0-9]+").unwrap();
+    // Strip the `-Wlinker-messages` wrappers prefixing the linker output.
+    let stderr = Regex::new(r"warning: linker std(out|err):").unwrap().replace_all(&stderr, "");
+    let lld_version_re = Regex::new(r"^LLD [0-9]+\.[0-9]+\.[0-9]+").unwrap();


Maybe it would be enough to use a single regex Regex::new(r"^.*LLD [0-9]+\.[0-9]+\.[0-9]+").unwrap()

Hmm. It's specifically looking for a line version in the output, not a prefix, otherwise it could be searching the entire stderr. I did it this way because I found it likely the message wrapper stripping will be moved in run_make_support once it's solidified, esp if we encounter more searching in linker output in the future. So while I'm not particularly convinced, I'm also not too invested in any approach either.

I can't say I'm a huge fan of this regex (before or after) since it really does feel fragile (we're doing text processing on the human-readable output of lld but with the rustc -Wlinker-messages wrappers on top, which together can totally change between lld versions since there AFAIK reasonably has no stability guarantee on that specific shape). But it does seem like we would want to test -Wlinker-messages so...

bors · 2025-03-05T13:40:04Z

☀️ Try build successful - checks-actions
Build commit: 59a7e7b (59a7e7b2854a90f6e8bea55f9f316e773a969ddc)

lqd · 2025-03-05T15:20:39Z

The test passed on apple builders, and on linux in PR CI. Let's say r? @jieyouxu as the rmake expert.

jieyouxu · 2025-03-05T15:26:54Z

My reservation is mostly about the text maching on the linker output itself, which may prove to be somewhat fragile over various lld versions. But given that linker output is linker output, I don't think I have a better suggestion for how to write this test or to normalize away the version bits / frequently changing bits.

I kinda wish lld (or linkers in general, for that matter) supports --message-format=json or sth that are more tooling friendly.

jieyouxu · 2025-03-05T15:30:59Z

In that sense, I'm open to trying this normalization before we figure out some kind of better way to test this.

@bors r+ rollup=iffy (linker output)

bors · 2025-03-05T15:31:01Z

📌 Commit 36efaf8 has been approved by jieyouxu

It is now in the queue for this repository.

lqd · 2025-03-05T15:38:38Z

My reservation is mostly about the text maching on the linker output itself, which may prove to be somewhat fragile over various lld versions.

FWIW, while it still may change in the future, this output has been stable ever since we introduced lld support (and the regex comes from this PR) https://github.com/rust-lang/rust/pull/85961/files#diff-b76eea4887f2bc8c5f874466c486464f49db9fa097d35a0aa6752f3b08a1e967

strip `-Wlinker-messages` wrappers from `rust-lld` rmake test The `tests/run-make/rust-lld` rmake test is failing locally on my M1, due to linker messages being in a different shape than the test expects: it asserts that the LLD version is the first linker message, which is seemingly not always the case on osx I guess. ```console thread 'main' panicked at /Users/lqd/rust/lqd-rust/tests/run-make/rust-lld/rmake.rs:24:5: the LLD version string should be present in the output logs: warning: linker stderr: rust-lld: directory not found for option -L/usr/local/lib LLD 20.1.0 (https://github.com/rust-lang/llvm-project.git 1c3bb96fdb6db7b8e8f24edb016099c223fdd27e) Library search paths: /Users/lqd/rust/lqd-rust/build/aarch64-apple-darwin/test/run-make/rust-lld/rmake_out /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib Framework search paths: /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks ``` This PR normalizes away the `-Wlinker-messages` wrappers around the linker output, to remove the requirement that the linker version is the first linker message / is prefixed with the warning wrapper in the regex. (also another strange thing to explain the pre-existing regex: it seems the LLD version is sometimes output on stderr sometimes on stdout cool stuff) We could do this for the other lld rmake tests, but they're only enabled on x64 linux so less likely to have random linker messages appearing without anyone noticing.

Rollup of 29 pull requests Successful merges: - rust-lang#135733 (Implement `&pin const self` and `&pin mut self` sugars) - rust-lang#137107 (Override default `Write` methods for cursor-like types) - rust-lang#137303 (Remove `MaybeForgetReturn` suggestion) - rust-lang#137327 (Undeprecate env::home_dir) - rust-lang#137358 (Match Ergonomics 2024: add context and examples to the unstable book) - rust-lang#137534 ([rustdoc] hide item that is not marked as doc(inline) and whose src is doc(hidden)) - rust-lang#137565 (Try to point of macro expansion from resolver and method errors if it involves macro var) - rust-lang#137612 (Update bootstrap to edition 2024) - rust-lang#137637 (Check dyn flavor before registering upcast goal on wide pointer cast in MIR typeck) - rust-lang#137643 (Add DWARF test case for non-C-like `repr128` enums) - rust-lang#137685 (self-contained linker: conservatively default to `-znostart-stop-gc` on x64 linux) - rust-lang#137744 (Re-add `Clone`-derive on `Thir`) - rust-lang#137758 (fix usage of ty decl macro fragments in attributes) - rust-lang#137764 (Ensure that negative auto impls are always applicable) - rust-lang#137772 (Fix char count in `Display` for `ByteStr`) - rust-lang#137798 (ci: use ubuntu 24 on arm large runner) - rust-lang#137802 (miri native-call support: all previously exposed provenance is accessible to the callee) - rust-lang#137805 (adjust Layout debug printing to match the internal field name) - rust-lang#137808 (Do not require that unsafe fields lack drop glue) - rust-lang#137820 (Clarify why InhabitedPredicate::instantiate_opt exists) - rust-lang#137825 (Provide more context on resolve error caused from incorrect RTN) - rust-lang#137827 (Add timestamp to unstable feature usage metrics) - rust-lang#137832 (Fix crash in BufReader::peek()) - rust-lang#137910 (Improve error message for `AsyncFn` trait failure for RPIT) - rust-lang#137920 (interpret/provenance_map: consistently use range_is_empty) - rust-lang#138038 (Update `compiler-builtins` to 0.1.151) - rust-lang#138046 (trim channel value in `get_closest_merge_commit`) - rust-lang#138052 (strip `-Wlinker-messages` wrappers from `rust-lld` rmake test) - rust-lang#138053 (Increase the max. custom try jobs requested to `20`) r? `@ghost` `@rustbot` modify labels: rollup

strip `-Wlinker-messages` wrappers from `rust-lld` rmake test The `tests/run-make/rust-lld` rmake test is failing locally on my M1, due to linker messages being in a different shape than the test expects: it asserts that the LLD version is the first linker message, which is seemingly not always the case on osx I guess. ```console thread 'main' panicked at /Users/lqd/rust/lqd-rust/tests/run-make/rust-lld/rmake.rs:24:5: the LLD version string should be present in the output logs: warning: linker stderr: rust-lld: directory not found for option -L/usr/local/lib LLD 20.1.0 (https://github.com/rust-lang/llvm-project.git 1c3bb96fdb6db7b8e8f24edb016099c223fdd27e) Library search paths: /Users/lqd/rust/lqd-rust/build/aarch64-apple-darwin/test/run-make/rust-lld/rmake_out /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib Framework search paths: /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks ``` This PR normalizes away the `-Wlinker-messages` wrappers around the linker output, to remove the requirement that the linker version is the first linker message / is prefixed with the warning wrapper in the regex. (also another strange thing to explain the pre-existing regex: it seems the LLD version is sometimes output on stderr sometimes on stdout cool stuff) We could do this for the other lld rmake tests, but they're only enabled on x64 linux so less likely to have random linker messages appearing without anyone noticing.

Rollup of 16 pull requests Successful merges: - rust-lang#122790 (Apply dllimport in ThinLTO) - rust-lang#136127 (Allow `*const W<dyn A> -> *const dyn A` ptr cast) - rust-lang#136968 (Turn order dependent trait objects future incompat warning into a hard error) - rust-lang#137147 (Add exclude to config.toml) - rust-lang#137319 (Stabilize `const_vec_string_slice`) - rust-lang#137885 (tidy: add triagebot checks) - rust-lang#138040 (compiler: Use `size_of` from the prelude instead of imported) - rust-lang#138052 (strip `-Wlinker-messages` wrappers from `rust-lld` rmake test) - rust-lang#138084 (Use workspace lints for crates in `compiler/`) - rust-lang#138158 (Move more layouting logic to `rustc_abi`) - rust-lang#138160 (depend more on attr_data_structures and move find_attr! there) - rust-lang#138192 (crashes: couple more tests) - rust-lang#138216 (bootstrap: Fix stack printing when a step cycle is detected) - rust-lang#138232 (Reduce verbosity of GCC build log) - rust-lang#138233 (Windows: Don't link std (and run-make) against advapi32, except on win7) - rust-lang#138242 (Revert "Don't test new error messages with the stage 0 compiler") r? `@ghost` `@rustbot` modify labels: rollup

normalize away -Wlinker-messages wrappers from rust-lld rmake test

36efaf8

rustbot added A-run-make Area: port run-make Makefiles to rmake.rs S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Mar 5, 2025

Kobzol reviewed Mar 5, 2025

View reviewed changes

rustbot assigned jieyouxu Mar 5, 2025

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 Mar 5, 2025

jieyouxu mentioned this pull request Mar 5, 2025

Rollup of 29 pull requests #138071

Closed

jieyouxu mentioned this pull request Mar 5, 2025

Rollup of 15 pull requests #138072

Closed

Noratrieb mentioned this pull request Mar 6, 2025

Rollup of 42 pull requests #138086

Closed

jieyouxu mentioned this pull request Mar 9, 2025

Rollup of 16 pull requests #138255

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

strip `-Wlinker-messages` wrappers from `rust-lld` rmake test #138052

strip `-Wlinker-messages` wrappers from `rust-lld` rmake test #138052

lqd commented Mar 5, 2025 •

edited

Loading

rustbot commented Mar 5, 2025

lqd commented Mar 5, 2025

bors commented Mar 5, 2025

Kobzol Mar 5, 2025

lqd Mar 5, 2025

jieyouxu Mar 5, 2025 •

edited

Loading

bors commented Mar 5, 2025

lqd commented Mar 5, 2025

jieyouxu commented Mar 5, 2025 •

edited

Loading

jieyouxu commented Mar 5, 2025

bors commented Mar 5, 2025

lqd commented Mar 5, 2025

strip -Wlinker-messages wrappers from rust-lld rmake test #138052

Are you sure you want to change the base?

strip -Wlinker-messages wrappers from rust-lld rmake test #138052

Conversation

lqd commented Mar 5, 2025 • edited Loading

rustbot commented Mar 5, 2025

lqd commented Mar 5, 2025

bors commented Mar 5, 2025

Kobzol Mar 5, 2025

Choose a reason for hiding this comment

lqd Mar 5, 2025

Choose a reason for hiding this comment

jieyouxu Mar 5, 2025 • edited Loading

Choose a reason for hiding this comment

bors commented Mar 5, 2025

lqd commented Mar 5, 2025

jieyouxu commented Mar 5, 2025 • edited Loading

jieyouxu commented Mar 5, 2025

bors commented Mar 5, 2025

lqd commented Mar 5, 2025

strip `-Wlinker-messages` wrappers from `rust-lld` rmake test #138052

strip `-Wlinker-messages` wrappers from `rust-lld` rmake test #138052

lqd commented Mar 5, 2025 •

edited

Loading

jieyouxu Mar 5, 2025 •

edited

Loading

jieyouxu commented Mar 5, 2025 •

edited

Loading