From d2b845dd6c90508c6258b4023fdf9ab5519fee3f Mon Sep 17 00:00:00 2001 From: Jez Ng Date: Thu, 27 Aug 2020 11:10:59 -0700 Subject: [PATCH] [lld-macho] Disable invalid/stub-link.s test for Mac 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. Differential Revision: https://reviews.llvm.org/D86728 --- .../MachO/Inputs/iPhoneSimulator.sdk/usr/lib/libSystem.tbd | 2 +- lld/test/MachO/invalid/stub-link.s | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lld/test/MachO/Inputs/iPhoneSimulator.sdk/usr/lib/libSystem.tbd b/lld/test/MachO/Inputs/iPhoneSimulator.sdk/usr/lib/libSystem.tbd index 56246f480d99..86d576b507cd 100644 --- a/lld/test/MachO/Inputs/iPhoneSimulator.sdk/usr/lib/libSystem.tbd +++ b/lld/test/MachO/Inputs/iPhoneSimulator.sdk/usr/lib/libSystem.tbd @@ -12,7 +12,7 @@ exports: 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: diff --git a/lld/test/MachO/invalid/stub-link.s b/lld/test/MachO/invalid/stub-link.s index 8160ff69e071..bcbdea1220a4 100644 --- a/lld/test/MachO/invalid/stub-link.s +++ b/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