tests: Fix duplicated-path-in-error fail with musl #142301

Gelbpunkt · 2025-06-10T16:40:28Z

musl's dlopen returns a different error than glibc, which contains the name of the file. This would cause the test to fail, since the filename would appear twice in the output (once in the error from rustc, once in the error message from musl). Split the expected test outputs for the different libc implementations.

Fixes #128474

rustbot · 2025-06-10T16:40:33Z

r? @wesleywiser

rustbot has assigned @wesleywiser.
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

tests/ui/codegen/duplicated-path-in-error.rs

workingjubilee · 2025-06-10T18:15:25Z

tests/ui/codegen/duplicated-path-in-error.rs

@@ -1,5 +1,6 @@
 //@ only-linux
 //@ compile-flags: -Zcodegen-backend=/non-existing-one.so
+//@ normalize-stderr: "Error loading shared library .+:" -> "cannot open shared object file:"

 // This test ensures that the error of the "not found dylib" doesn't duplicate
 // the path of the dylib.


then on the ERROR down here we will prefix it. the current one will be //[gnu] and the new one will be //[musl], containing the messages we are expecting, so like this:

Suggested change

// the path of the dylib.

// the path of the dylib.

// other stuff I can't comment on because GitHub reviews aren't great

//[gnu]~? ERROR couldn't load codegen backend /non-existing-one.so

//[musl]~? ERROR idk, you're the one making the PR

Nice, thanks for the hints! I think I got it working as intended now ~~(edit: woops forgot one change, sec)~~

Still hasn't been resolved

Still hasn't been resolved

How exactly? It is resolved AFAICT

Ah right, my bad, prefix match 🤦

There is a case to be made to make the entire test only-linux && only-gnu since, while it is testing the error output with a nonexistent backend, the description is rather that it tests for the path not to be duplicated, which it is on musl...

The original test introduced in #121978 was an anti-regression test for glibc code path's duplicate path error message, so I'm fine with limiting it to gnu-only. But this is fine too.

Should I do that instead then or leave it as it is now?

Oh, hm. That original issue duplicated the path in the part that isn't the dlopen error, so I guess it should be fine to keep it as is

Yeah, the current version is fine.

rustbot · 2025-06-10T19:00:03Z

Some changes occurred in src/tools/compiletest

cc @jieyouxu

Gelbpunkt · 2025-06-28T19:07:59Z

Hi @workingjubilee @wesleywiser, would you mind taking another look at this PR? :)

fmease · 2025-07-11T12:33:27Z

@bors r=workingjubilee,fmease rollup

bors · 2025-07-11T12:33:31Z

📌 Commit 2988b2c has been approved by workingjubilee,fmease

It is now in the queue for this repository.

jieyouxu · 2025-07-11T12:36:13Z

Sorry, can you please leave a test comment re. why we're revisioning in the first place? It's not super obvious on a cursory glance. Also r=me after comment nit.
@bors r-

Gelbpunkt · 2025-07-11T12:57:11Z

@rustbot ready

jieyouxu · 2025-07-11T12:58:38Z

@bors r=workingjubilee,fmease,jieyouxu rollup

bors · 2025-07-11T12:58:43Z

📌 Commit 3ffd47d has been approved by workingjubilee,fmease,jieyouxu

It is now in the queue for this repository.

Gelbpunkt · 2025-07-11T17:54:13Z

@bors r- #143790 (comment)

That's a tricky one. The dlopen error comes from the -gnu host trying to compile for the -musl target. Do we have a way to limit the tests based on the flavor of the host, not the target?

workingjubilee · 2025-07-11T17:58:04Z

Huh, odd. I don't believe so.

Gelbpunkt · 2025-07-14T13:36:23Z

Would it be appropriate to use //@ force-host here or should I implement host target directives?

jieyouxu · 2025-07-14T13:38:04Z

If you want this test to be host only, it's //@ ignore-cross-compile.

Gelbpunkt · 2025-07-14T13:52:15Z

If you want this test to be host only, it's //@ ignore-cross-compile.

No, not host only, but just compile for the host triple. That way the only-gnu/only-musl directives match that of the host. Since this is supposed to test the compiler's error message, the target is irrelevant anyways.

I think both directives would make the tests pass, but only would skip it, while the other one would still run it.

jieyouxu · 2025-07-14T14:54:03Z

Since this is supposed to test the compiler's error message, the target is irrelevant anyways.

I'd probably just //@ ignore-cross-compile, if the target is irrelevant anyway. I'm open for some stronger/more specific //@ force-host-arch: xxx, but that seems overkill for this case.

bors · 2025-07-14T16:22:25Z

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

musl's dlopen returns a different error than glibc, which contains the name of the file. This would cause the test to fail, since the filename would appear twice in the output (once in the error from rustc, once in the error message from musl). Split the expected test outputs for the different libc implementations. Signed-off-by: Jens Reidel <[email protected]>

Gelbpunkt · 2025-07-14T16:40:28Z

Since this is supposed to test the compiler's error message, the target is irrelevant anyways.

I'd probably just //@ ignore-cross-compile, if the target is irrelevant anyway. I'm open for some stronger/more specific //@ force-host-arch: xxx, but that seems overkill for this case.

Okay, I did that for now then

Gelbpunkt · 2025-07-14T16:40:33Z

@rustbot ready

jieyouxu · 2025-07-14T16:41:34Z

@bors r=workingjubilee,fmease,jieyouxu

bors · 2025-07-14T16:41:37Z

📌 Commit ae1b1b4 has been approved by workingjubilee,fmease,jieyouxu

It is now in the queue for this repository.

…-musl, r=workingjubilee,fmease,jieyouxu tests: Fix duplicated-path-in-error fail with musl musl's dlopen returns a different error than glibc, which contains the name of the file. This would cause the test to fail, since the filename would appear twice in the output (once in the error from rustc, once in the error message from musl). Split the expected test outputs for the different libc implementations. Fixes rust-lang#128474

Rollup of 16 pull requests Successful merges: - #142301 (tests: Fix duplicated-path-in-error fail with musl) - #142936 (rustdoc-json: Structured attributes) - #143355 (wrapping shift: remove first bitmask and table) - #143630 (Drop `./x suggest`) - #143738 (Move several float tests to floats/mod.rs) - #143752 (Don't panic if WASI_SDK_PATH not set when detecting compiler) - #143820 (Fixed a core crate compilation failure when enabling the `optimize_for_size` feature on some targets) - #143837 (Adjust `run_make_support::symbols` helpers) - #143878 (Port `#[pointee]` to the new attribute parsing infrastructure) - #143907 (core: make `str::split_at_unchecked()` inline) - #143910 (Add experimental `backtrace-trace-only` std feature) - #143927 (Preserve constness in trait objects up to hir ty lowering) - #143935 (rustc_type_ir/walk: move docstring to `TypeWalker` itself) - #143938 (Update books) - #143941 (update `cfg_select!` documentation) - #143948 (Update mdbook to 0.4.52) Failed merges: - #143926 (Remove deprecated fields in bootstrap) r? `@ghost` `@rustbot` modify labels: rollup

Rollup of 13 pull requests Successful merges: - #142301 (tests: Fix duplicated-path-in-error fail with musl) - #143630 (Drop `./x suggest`) - #143736 (Give all bytes of TypeId provenance) - #143752 (Don't panic if WASI_SDK_PATH not set when detecting compiler) - #143837 (Adjust `run_make_support::symbols` helpers) - #143878 (Port `#[pointee]` to the new attribute parsing infrastructure) - #143905 (Recover and suggest to use `;` to construct array type) - #143907 (core: make `str::split_at_unchecked()` inline) - #143910 (Add experimental `backtrace-trace-only` std feature) - #143927 (Preserve constness in trait objects up to hir ty lowering) - #143935 (rustc_type_ir/walk: move docstring to `TypeWalker` itself) - #143938 (Update books) - #143941 (update `cfg_select!` documentation) Failed merges: - #143926 (Remove deprecated fields in bootstrap) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of #142301 - Gelbpunkt:duplicated-path-in-error-musl, r=workingjubilee,fmease,jieyouxu tests: Fix duplicated-path-in-error fail with musl musl's dlopen returns a different error than glibc, which contains the name of the file. This would cause the test to fail, since the filename would appear twice in the output (once in the error from rustc, once in the error message from musl). Split the expected test outputs for the different libc implementations. Fixes #128474

rustbot assigned wesleywiser Jun 10, 2025

rustbot added 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 Jun 10, 2025

This comment has been minimized.

Sign in to view

Gelbpunkt force-pushed the duplicated-path-in-error-musl branch from 2f57322 to 20d33c5 Compare June 10, 2025 16:41

workingjubilee reviewed Jun 10, 2025

View reviewed changes

Gelbpunkt force-pushed the duplicated-path-in-error-musl branch 2 times, most recently from 21d3790 to 2988b2c Compare June 10, 2025 18:59

rustbot added A-compiletest Area: The compiletest test runner A-testsuite Area: The testsuite used to check the correctness of rustc T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Jun 10, 2025

Gelbpunkt requested a review from workingjubilee June 13, 2025 11:35

fmease 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 11, 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 11, 2025

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 11, 2025

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 11, 2025

bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 11, 2025

Gelbpunkt force-pushed the duplicated-path-in-error-musl branch from 3ffd47d to ae1b1b4 Compare July 14, 2025 16:38

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 14, 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 Jul 14, 2025

Kobzol mentioned this pull request Jul 14, 2025

Rollup of 14 pull requests #143946

Closed

Kobzol mentioned this pull request Jul 14, 2025

Rollup of 7 pull requests #143947

Closed

jhpratt mentioned this pull request Jul 15, 2025

Rollup of 16 pull requests #143951

Closed

samueltardieu mentioned this pull request Jul 15, 2025

Rollup of 13 pull requests #143958

Merged

bors merged commit 4e72ed7 into rust-lang:master Jul 15, 2025
11 checks passed

rustbot added this to the 1.90.0 milestone Jul 15, 2025

-// the path of the dylib.
+// the path of the dylib.
+// other stuff I can't comment on because GitHub reviews aren't great
+//[gnu]~? ERROR couldn't load codegen backend /non-existing-one.so
+//[musl]~? ERROR idk, you're the one making the PR

tests: Fix duplicated-path-in-error fail with musl #142301

tests: Fix duplicated-path-in-error fail with musl #142301

Conversation

Gelbpunkt commented Jun 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Jun 10, 2025

Uh oh!

This comment has been minimized.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Gelbpunkt Jun 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jieyouxu Jul 11, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

rustbot commented Jun 10, 2025

Uh oh!

Gelbpunkt commented Jun 28, 2025

Uh oh!

fmease commented Jul 11, 2025

Uh oh!

bors commented Jul 11, 2025

Uh oh!

jieyouxu commented Jul 11, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Gelbpunkt commented Jul 11, 2025

Uh oh!

jieyouxu commented Jul 11, 2025

Uh oh!

bors commented Jul 11, 2025

Uh oh!

Gelbpunkt commented Jul 11, 2025

Uh oh!

workingjubilee commented Jul 11, 2025

Uh oh!

Gelbpunkt commented Jul 14, 2025

Uh oh!

jieyouxu commented Jul 14, 2025

Uh oh!

Gelbpunkt commented Jul 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jieyouxu commented Jul 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

bors commented Jul 14, 2025

Uh oh!

Gelbpunkt commented Jul 14, 2025

Uh oh!

Gelbpunkt commented Jul 14, 2025

Uh oh!

jieyouxu commented Jul 14, 2025

Uh oh!

bors commented Jul 14, 2025

Uh oh!

Uh oh!

Uh oh!

Gelbpunkt commented Jun 10, 2025 •

edited

Loading

Gelbpunkt Jun 10, 2025 •

edited

Loading

jieyouxu Jul 11, 2025 •

edited

Loading

jieyouxu commented Jul 11, 2025 •

edited

Loading

Gelbpunkt commented Jul 14, 2025 •

edited

Loading

jieyouxu commented Jul 14, 2025 •

edited

Loading