[PATCH] D86728: [lld-macho] Disable invalid/stub-link.s test for Mac

[Jez Ng via Phabricator via llvm-commits]

int3 created this revision.
int3 added reviewers: lld-macho, compnerd.
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.
int3 requested review of this revision.

It seems to be failing on some Google Buildbots.

This diff also includes a minor fix for the install name of one of
libSystem's re-exports. I don't think it's the cause of the test
failure, though. The wrong install name just meant that the symbol
lookup failure would still happen, but it would have been caused by the
re-export not being found, instead of the arch failing to match.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D86728

Files:
  lld/test/MachO/Inputs/iPhoneSimulator.sdk/usr/lib/libSystem.tbd
  lld/test/MachO/invalid/stub-link.s


Index: lld/test/MachO/invalid/stub-link.s
===================================================================
--- lld/test/MachO/invalid/stub-link.s
+++ lld/test/MachO/invalid/stub-link.s
@@ -1,3 +1,6 @@
+## FIXME: This test seems to be failing on some Google Mac buildbots for
+## unclear reasons, so it's disabled for now. See D85404 for details.
+# UNSUPPORTED: darwin
 # REQUIRES: x86
 
 # RUN: mkdir -p %t
Index: lld/test/MachO/Inputs/iPhoneSimulator.sdk/usr/lib/libSystem.tbd
===================================================================
--- lld/test/MachO/Inputs/iPhoneSimulator.sdk/usr/lib/libSystem.tbd
+++ lld/test/MachO/Inputs/iPhoneSimulator.sdk/usr/lib/libSystem.tbd
@@ -12,7 +12,7 @@
 archs:            [ i386, x86_64 ]
 uuids:            [ 'i386: 00000000-0000-0000-0000-000000000002', 'x86_64: 00000000-0000-0000-0000-000000000003' ]
 platform:         ios
-install-name:     '/usr/lib/libcache.dylib'
+install-name:     '/usr/lib/system/libcache.dylib'
 current-version:  83
 parent-umbrella:  System
 exports:


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D86728.288397.patch
Type: text/x-patch
Size: 1034 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200827/da604e6c/attachment.bin>