This is an archive of the discontinued LLVM Phabricator instance.

Differential D99271

[lld-macho][nfc] Fixed test so it output to %t/ rather than current directory.
ClosedPublic

Authored by oontvoo on Mar 24 2021, 8:50 AM.

Details

Reviewers
gribozavr2
int3
Group Reviewers
Restricted Project
Commits
rGd988ffc34fcb: [lld-macho][nfc] Fixed test so it output to %t/ rather than current directory.
Summary

The a.out broke our build.

Diff Detail

Event Timeline

oontvoo created this revision.Mar 24 2021, 8:50 AM
Herald added a project: Restricted Project. · View Herald TranscriptMar 24 2021, 8:50 AM
Herald added a reviewer: Restricted Project. · View Herald Transcript
oontvoo requested review of this revision.Mar 24 2021, 8:50 AM
Herald added a project: Restricted Project. · View Herald TranscriptMar 24 2021, 8:50 AM
Herald added a subscriber: llvm-commits. · View Herald Transcript
gribozavr2 accepted this revision.Mar 24 2021, 8:50 AM
This revision is now accepted and ready to land.Mar 24 2021, 8:50 AM
int3 added inline comments.Mar 24 2021, 12:09 PM
lld/test/MachO/dependency-info.s
23

why doesn't this have the input-file: prefix?

28

for consistency with the input-file lines

oontvoo updated this revision to Diff 333098.Mar 24 2021, 12:55 PM
oontvoo marked 2 inline comments as done.

updated diff

lld/test/MachO/dependency-info.s
23

D'oh - editorial error. (I must've accidentally deleted the prefix at some point) ... of course FileCheck didn't care as long as it matches partially.

int3 accepted this revision.Mar 24 2021, 1:54 PM

lgtm

This revision was landed with ongoing or failed builds.Mar 24 2021, 1:56 PM
Closed by commit rGd988ffc34fcb: [lld-macho][nfc] Fixed test so it output to %t/ rather than current directory. (authored by oontvoo). · Explain Why
This revision was automatically updated to reflect the committed changes.
oontvoo added a commit: rGd988ffc34fcb: [lld-macho][nfc] Fixed test so it output to %t/ rather than current directory..
Harbormaster completed remote builds in B95505: Diff 333011.Mar 24 2021, 3:31 PM
Harbormaster completed remote builds in B95565: Diff 333098.Mar 24 2021, 10:16 PM

Revision Contents

PathSize
lld/
test/
MachO/
6 lines

Diff 333116

lld/test/MachO/dependency-info.s

# REQUIRES: x86 # REQUIRES: x86
## FIXME: Paths on windows have both `\` and '/', as a result, they are in a different ## FIXME: Paths on windows have both `\` and '/', as a result, they are in a different
## order when sorted. Maybe create a separate test for that? ## order when sorted. Maybe create a separate test for that?
# UNSUPPORTED: system-windows # UNSUPPORTED: system-windows
# #
# RUN: rm -rf %t # RUN: rm -rf %t
# RUN: split-file %s %t # RUN: split-file %s %t
# RUN: llvm-mc -filetype=obj -triple=x86_64-apple-macos -o %t/foo.o %t/foo.s # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-macos -o %t/foo.o %t/foo.s
# RUN: %lld -dylib -o %t/libfoo.dylib %t/foo.o # RUN: %lld -dylib -o %t/libfoo.dylib %t/foo.o
# RUN: llvm-mc -filetype=obj -triple=x86_64-apple-macos -o %t/bar.o %t/bar.s # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-macos -o %t/bar.o %t/bar.s
# RUN: llvm-ar csr %t/bar.a %t/bar.o # RUN: llvm-ar csr %t/bar.a %t/bar.o
# RUN: llvm-mc -filetype=obj -triple=x86_64-apple-macos -o %t/main.o %t/main.s # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-macos -o %t/main.o %t/main.s
# RUN: %lld %t/main.o %t/bar.a %t/libfoo.dylib -lSystem -dependency_info %t/deps_info.out # RUN: %lld %t/main.o %t/bar.a %t/libfoo.dylib -lSystem -o %t/test.out -dependency_info %t/deps_info.out
# RUN: %python %S/Inputs/DependencyDump.py %t/deps_info.out | FileCheck %s # RUN: %python %S/Inputs/DependencyDump.py %t/deps_info.out | FileCheck %s
# CHECK: lld-version: {{.*}}LLD {{.*}} # CHECK: lld-version: {{.*}}LLD {{.*}}
# CHECK-DAG: input-file: {{.*}}/bar.a # CHECK-DAG: input-file: {{.*}}/bar.a
# CHECK-DAG: input-file: {{.*}}/libfoo.dylib # CHECK-DAG: input-file: {{.*}}/libfoo.dylib
# CHECK-DAG: input-file: {{.*}}/libSystem.tbd # CHECK-DAG: input-file: {{.*}}/libSystem.tbd
# CHECK-DAG: input-file: {{.*}}/main.o # CHECK-DAG: input-file: {{.*}}/main.o
# CHECK-DAG: bar.o # CHECK-DAG: input-file: {{.*}}bar.o
int3Unsubmitted
Done
ReplyInline Actions

why doesn't this have the input-file: prefix?

int3: why doesn't this have the `input-file:` prefix?
oontvooAuthorUnsubmitted
Done
ReplyInline Actions

D'oh - editorial error. (I must've accidentally deleted the prefix at some point) ... of course FileCheck didn't care as long as it matches partially.

oontvoo: D'oh - editorial error. (I must've accidentally deleted the prefix at some point) ... of course…
# CHECK-NEXT: not-found: {{.*}}/libdyld.dylib # CHECK-NEXT: not-found: {{.*}}/libdyld.dylib
## There could be more not-found here but we are not checking those because it's brittle. ## There could be more not-found here but we are not checking those because it's brittle.
# CHECK: output-file: a.out # CHECK: output-file: {{.*}}/test.out
int3Unsubmitted
Done
ReplyInline Actions
## There could be more not-found here but we are not checking those because it's brittle.
- # CHECK: output-file:{{.*}}test.out
+ # CHECK: output-file: {{.*}}/test.out
#--- foo.s

for consistency with the input-file lines

int3: for consistency with the input-file lines
#--- foo.s #--- foo.s
.globl __Z3foo .globl __Z3foo
__Z3foo: __Z3foo:
ret ret
#--- bar.s #--- bar.s
.globl _bar .globl _bar
Show All 10 Lines