bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #123410 - madsmtm:relax-framework-linking-test, r=fmease

Browse source 
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).
This commit is contained in:
Matthias Krüger 2024-04-07 09:17:14 +02:00 • committed by GitHub
commit 4eef6e313e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/ui/linkage-attr/framework.omit.stderr
View file

@ -1,4 +1,4 @@
error: linking with `cc` failed: exit status: 1 error: linking with `LINKER` failed: exit status: 1
| |
ld: Undefined symbols: ld: Undefined symbols:
_CFRunLoopGetTypeID, referenced from: _CFRunLoopGetTypeID, referenced from:

4
tests/ui/linkage-attr/framework.rs
View file

@ -6,8 +6,10 @@
//@ [weak]run-pass //@ [weak]run-pass
//@ [both]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 //@ 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: "Undefined symbols for architecture .*" -> "ld: Undefined symbols:"
//@ normalize-stderr-test: "._CFRunLoopGetTypeID.," -> "_CFRunLoopGetTypeID," //@ normalize-stderr-test: "._CFRunLoopGetTypeID.," -> "_CFRunLoopGetTypeID,"