about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMads Marquart <mads@marquart.dk>2024-04-03 15:07:53 +0200
committerMads Marquart <mads@marquart.dk>2024-04-06 09:00:07 +0200
commitde212963f8543d6c86e554716218fd67b84d64a2 (patch)
treed2cb60f77b7c1407cea5ccaaca486e16e4c848f1
parent23d47dba319331d4418827cfbb8c1af283497d3c (diff)
downloadrust-de212963f8543d6c86e554716218fd67b84d64a2.tar.gz
rust-de212963f8543d6c86e554716218fd67b84d64a2.zip
Relax framework linking test
This test was introduced in #118644, but was over-specified in that it assumed the path of the linker was always `cc`.
-rw-r--r--tests/ui/linkage-attr/framework.omit.stderr2
-rw-r--r--tests/ui/linkage-attr/framework.rs4
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,"