This is an archive of the discontinued LLVM Phabricator instance.

Differential D113085

[lld-macho] Enable search-paths tests on macOS
ClosedPublic

Authored by keith on Nov 2 2021, 11:02 PM.

Details

Reviewers
gkm
int3
Group Reviewers
Restricted Project
Commits
rG4313c56aa3e6: [lld-macho] Enable search-paths tests on macOS
Summary

I'm not sure what the history is here but this test passes on macOS
today. It seems like we should unify these tests if they need to run
cross platform.

Diff Detail

Event Timeline

keith created this revision.Nov 2 2021, 11:02 PM
Herald added a reviewer: gkm. · View Herald TranscriptNov 2 2021, 11:02 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.Nov 2 2021, 11:02 PM
Herald added a project: Restricted Project. · View Herald TranscriptNov 2 2021, 11:02 PM
Herald added a subscriber: llvm-commits. · View Herald Transcript
Harbormaster completed remote builds in B132152: Diff 384347.Nov 2 2021, 11:20 PM
int3 accepted this revision.Nov 3 2021, 7:59 AM
int3 added a subscriber: int3.

Thanks!

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

while we're at it, would be nice to clean this up

This revision is now accepted and ready to land.Nov 3 2021, 7:59 AM
keith updated this revision to Diff 384537.Nov 3 2021, 11:33 AM
keith marked an inline comment as done.

Add cleanup to setup

Harbormaster completed remote builds in B132292: Diff 384537.Nov 3 2021, 11:47 AM
Closed by commit rG4313c56aa3e6: [lld-macho] Enable search-paths tests on macOS (authored by keith). · Explain WhyNov 3 2021, 12:02 PM
This revision was automatically updated to reflect the committed changes.
keith added a commit: rG4313c56aa3e6: [lld-macho] Enable search-paths tests on macOS.

Revision Contents

PathSize
lld/
test/
MachO/
4 lines

Diff 384549

lld/test/MachO/search-paths.test

UNSUPPORTED: darwin RUN: rm -rf %t1 %t2; mkdir -p %t1 %t2
RUN: mkdir -p %t1 %t2
int3Unsubmitted
Done
ReplyInline Actions
UNSUPPORTED: darwin
- RUN: mkdir -p %t1 %t2
+ RUN: rm -rf %t1 %t2; mkdir -p %t1 %t2
RUN: %lld -v -dylib -o /dev/null -L%t1 -F%t2 2>&1 \

while we're at it, would be nice to clean this up

int3: while we're at it, would be nice to clean this up
RUN: %lld -v -dylib -o /dev/null -L%t1 -F%t2 2>&1 \ RUN: %lld -v -dylib -o /dev/null -L%t1 -F%t2 2>&1 \
RUN: | FileCheck -DLDIR=%t1 -DFDIR=%t2 %s RUN: | 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: Framework search paths: CHECK-NEXT: Framework search paths:
CHECK-NEXT: [[FDIR]] CHECK-NEXT: [[FDIR]]
CHECK-NEXT: /System/Library/Frameworks CHECK-NEXT: /System/Library/Frameworks
RUN: %lld -v -dylib -o /dev/null -L%t1 -F%t2 -Z 2>&1 \ RUN: %lld -v -dylib -o /dev/null -L%t1 -F%t2 -Z 2>&1 \
RUN: | FileCheck -DLDIR=%t1 -DFDIR=%t2 --check-prefix=CHECK_Z %s RUN: | 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]]