diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-04-07 09:17:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-07 09:17:14 +0200 |
| commit | 4eef6e313e025b10f78ef75723708ccb4bc3f808 (patch) | |
| tree | 7bac150adcb9c6d72cbce34ba4d3b3f21414d9b1 /tests | |
| parent | af2525317be950fdae635bcbb46b3e755d14ab49 (diff) | |
| parent | de212963f8543d6c86e554716218fd67b84d64a2 (diff) | |
| download | rust-4eef6e313e025b10f78ef75723708ccb4bc3f808.tar.gz rust-4eef6e313e025b10f78ef75723708ccb4bc3f808.zip | |
Rollup merge of #123410 - madsmtm:relax-framework-linking-test, r=fmease
Relax framework linking test This test was introduced by myself in https://github.com/rust-lang/rust/pull/118644, but was over-specified in that it assumed the path of the linker was always `cc`, which [causes a test failure for Chromium](https://issues.chromium.org/issues/332562251).
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ui/linkage-attr/framework.omit.stderr | 2 | ||||
| -rw-r--r-- | tests/ui/linkage-attr/framework.rs | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tests/ui/linkage-attr/framework.omit.stderr b/tests/ui/linkage-attr/framework.omit.stderr index 5cb4d391437..23e017cb012 100644 --- a/tests/ui/linkage-attr/framework.omit.stderr +++ b/tests/ui/linkage-attr/framework.omit.stderr @@ -1,4 +1,4 @@ -error: linking with `cc` failed: exit status: 1 +error: linking with `LINKER` failed: exit status: 1 | ld: Undefined symbols: _CFRunLoopGetTypeID, referenced from: diff --git a/tests/ui/linkage-attr/framework.rs b/tests/ui/linkage-attr/framework.rs index 662ef4c429d..824adf62206 100644 --- a/tests/ui/linkage-attr/framework.rs +++ b/tests/ui/linkage-attr/framework.rs @@ -6,8 +6,10 @@ //@ [weak]run-pass //@ [both]run-pass -// The linker's exact error output changes between Xcode versions. +// The linker's exact error output changes between Xcode versions, depends on +// linker invocation details, and the linker sometimes outputs more warnings. //@ compare-output-lines-by-subset +//@ normalize-stderr-test: "linking with `.*` failed" -> "linking with `LINKER` failed" //@ normalize-stderr-test: "Undefined symbols for architecture .*" -> "ld: Undefined symbols:" //@ normalize-stderr-test: "._CFRunLoopGetTypeID.," -> "_CFRunLoopGetTypeID," |