Skip to content

Commit 4eef6e3

Browse files
authored
Rollup merge of #123410 - madsmtm:relax-framework-linking-test, r=fmease
Relax framework linking test This test was introduced by myself in #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).
2 parents af25253 + de21296 commit 4eef6e3

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

tests/ui/linkage-attr/framework.omit.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
error: linking with `cc` failed: exit status: 1
1+
error: linking with `LINKER` failed: exit status: 1
22
|
33
ld: Undefined symbols:
44
_CFRunLoopGetTypeID, referenced from:

tests/ui/linkage-attr/framework.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@
66
//@ [weak]run-pass
77
//@ [both]run-pass
88

9-
// The linker's exact error output changes between Xcode versions.
9+
// The linker's exact error output changes between Xcode versions, depends on
10+
// linker invocation details, and the linker sometimes outputs more warnings.
1011
//@ compare-output-lines-by-subset
12+
//@ normalize-stderr-test: "linking with `.*` failed" -> "linking with `LINKER` failed"
1113
//@ normalize-stderr-test: "Undefined symbols for architecture .*" -> "ld: Undefined symbols:"
1214
//@ normalize-stderr-test: "._CFRunLoopGetTypeID.," -> "_CFRunLoopGetTypeID,"
1315

0 commit comments

Comments
 (0)