This is an archive of the discontinued LLVM Phabricator instance.

Differential D111361

[lld][test] Remove /usr/local/lib test requirement
ClosedPublic

Authored by keith on Oct 7 2021, 3:08 PM.

Details

Reviewers
thakis
thevinster
gkm
Group Reviewers
Restricted Project
Commits
rGdfeaa1941bd0: [lld][test] Remove /usr/local/lib test requirement
Summary

This field only exists if the directory exists on the machine running
the test. It likely exists for most Intel macOS users because of
homebrew, but doesn't exist on some of the CI machines. This
unfortunately makes this test a bit less strict.

Diff Detail

Event Timeline

keith created this revision.Oct 7 2021, 3:08 PM
Herald added a reviewer: gkm. · View Herald TranscriptOct 7 2021, 3:08 PM
Herald added a project: Restricted Project. · View Herald Transcript
Herald added a reviewer: Restricted Project. · View Herald Transcript
keith requested review of this revision.Oct 7 2021, 3:08 PM
Herald added a project: Restricted Project. · View Herald TranscriptOct 7 2021, 3:08 PM
Herald added a subscriber: llvm-commits. · View Herald Transcript
keith mentioned this in D111268: [lld][test] Fix darwin REQUIRES (NFC).Oct 7 2021, 3:09 PM
thevinster accepted this revision.Oct 7 2021, 3:15 PM
thevinster added inline comments.
lld/test/MachO/search-paths-darwin.test
10

nit: Align this with Library search paths. Else, LGTM assuming CI passes.

This revision is now accepted and ready to land.Oct 7 2021, 3:15 PM
This revision was landed with ongoing or failed builds.Oct 7 2021, 3:18 PM
Closed by commit rGdfeaa1941bd0: [lld][test] Remove /usr/local/lib test requirement (authored by keith). · Explain Why
This revision was automatically updated to reflect the committed changes.
keith added a commit: rGdfeaa1941bd0: [lld][test] Remove /usr/local/lib test requirement.
Harbormaster completed remote builds in B127636: Diff 378024.Oct 7 2021, 3:34 PM

Revision Contents

PathSize
lld/
test/
MachO/
3 lines

Diff 378028

lld/test/MachO/search-paths-darwin.test

REQUIRES: x86 REQUIRES: x86
REQUIRES: system-darwin REQUIRES: system-darwin
RUN: mkdir -p %t1 %t2 RUN: mkdir -p %t1 %t2
RUN: not ld64.lld -arch x86_64 -v -L%t1 -F%t2 2>&1 | FileCheck -DLDIR=%t1 -DFDIR=%t2 %s RUN: not ld64.lld -arch x86_64 -v -L%t1 -F%t2 2>&1 | FileCheck -DLDIR=%t1 -DFDIR=%t2 %s
CHECK: Library search paths: CHECK: Library search paths:
CHECK-NEXT: [[LDIR]] CHECK-NEXT: [[LDIR]]
CHECK-NEXT: /usr/lib CHECK-NEXT: /usr/lib
CHECK-NEXT: /usr/local/lib CHECK: Framework search paths:
thevinsterUnsubmitted
Not Done
ReplyInline Actions

nit: Align this with Library search paths. Else, LGTM assuming CI passes.

thevinster: nit: Align this with Library search paths. Else, LGTM assuming CI passes.
CHECK-NEXT: Framework search paths:
CHECK-NEXT: [[FDIR]] CHECK-NEXT: [[FDIR]]
CHECK-NEXT: /Library/Frameworks CHECK-NEXT: /Library/Frameworks
CHECK-NEXT: /System/Library/Frameworks CHECK-NEXT: /System/Library/Frameworks
RUN: not ld64.lld -arch x86_64 -v -L%t1 -F%t2 -Z 2>&1 | FileCheck -DLDIR=%t1 -DFDIR=%t2 --check-prefix=CHECK_Z %s RUN: not ld64.lld -arch x86_64 -v -L%t1 -F%t2 -Z 2>&1 | FileCheck -DLDIR=%t1 -DFDIR=%t2 --check-prefix=CHECK_Z %s
CHECK_Z: Library search paths: CHECK_Z: Library search paths:
CHECK_Z-NEXT: [[LDIR]] CHECK_Z-NEXT: [[LDIR]]
CHECK_Z-NEXT: Framework search paths: CHECK_Z-NEXT: Framework search paths:
CHECK_Z-NEXT: [[FDIR]] CHECK_Z-NEXT: [[FDIR]]