This is an archive of the discontinued LLVM Phabricator instance.

Differential D58771

[llvm-readobj]Add test showing behaviour of thin archive member path printing
ClosedPublic

Authored by jhenderson on Feb 28 2019, 3:09 AM.

Details

Reviewers
rupprecht
grimar
Higuoxing
Commits
rG88c643abf1df: [llvm-readobj]Add test showing behaviour of thin archive member path printing
rL355183: [llvm-readobj]Add test showing behaviour of thin archive member path printing
Summary

This was a test requested in D58677.

Diff Detail

Repository
rL LLVM

Event Timeline

jhenderson created this revision.Feb 28 2019, 3:09 AM
Herald added a project: Restricted Project. · View Herald TranscriptFeb 28 2019, 3:09 AM
Higuoxing accepted this revision.Feb 28 2019, 3:32 AM

LGTM :)

This revision is now accepted and ready to land.Feb 28 2019, 3:32 AM
grimar accepted this revision.Feb 28 2019, 3:59 AM

LGTM + leaved a comment.

test/tools/llvm-readobj/thin-archive-paths.test
19

I hope this will this work under both linux and windows (I am not sure).
I guess you might need to use:

Error reading file: a{{/|\\}}relative.a
grimar added inline comments.Feb 28 2019, 4:01 AM
test/tools/llvm-readobj/thin-archive-paths.test
19

On second thought, I guess the archive should not contain the windows style slashes.

jhenderson marked an inline comment as done.Feb 28 2019, 4:20 AM
jhenderson added inline comments.
test/tools/llvm-readobj/thin-archive-paths.test
19

Actually, the archive contains whatever slash is on the command-line when adding the member. In this case, it will be '/' even on Windows. The full path below will have a mixture of '/' and '\' on Windows. llvm-readobj then just prints what's in the archive.

BTW, I did this all on Windows, so it definitely works on there.

grimar added inline comments.Feb 28 2019, 4:24 AM
test/tools/llvm-readobj/thin-archive-paths.test
19

OK, great, thanks for the explanation!

rupprecht accepted this revision.Feb 28 2019, 7:47 AM

Thanks!

jhenderson closed this revision.Mar 1 2019, 1:25 AM
jhenderson added commits: rL355183: [llvm-readobj]Add test showing behaviour of thin archive member path printing, rG88c643abf1df: [llvm-readobj]Add test showing behaviour of thin archive member path printing.

I made a typo in the commmit that meant this didn't get closed.

Revision Contents

PathSize
test/
tools/
llvm-readobj/
33 lines

Diff 188700

test/tools/llvm-readobj/thin-archive-paths.test

# RUN: rm -rf %t
# RUN: mkdir -p %t/a/b
# RUN: cd %t
# RUN: cp %p/Inputs/trivial.obj.elf-x86-64 a/b/1.o
# The archive is deliberately in a different directory to the cwd, to show that
# the member paths printed are exactly what's in the archive and not relative
# to the cwd.
# RUN: llvm-ar rcT a/relative.a a/b/1.o
# Show that relative paths in the file header printing look sensible.
# RUN: llvm-readobj --file-headers a/relative.a | FileCheck %s --check-prefix=REL
# REL: File: b/1.o
# Show that relative paths in an error message for both archive and member look
# sensible.
# RUN: rm a/b/1.o
# RUN: not llvm-readobj --file-headers a/relative.a 2>&1 | FileCheck %s --check-prefix=ERR1
# RUN: not llvm-readelf --file-headers a/relative.a 2>&1 | FileCheck %s --check-prefix=ERR1
# ERR1: Error reading file: a/relative.a: 'b/1.o': {{[Nn]}}o such file or directory
grimarUnsubmitted
Not Done
ReplyInline Actions

I hope this will this work under both linux and windows (I am not sure).
I guess you might need to use:

Error reading file: a{{/|\\}}relative.a
grimar: I hope this will this work under both linux and windows (I am not sure). I guess you might need…
grimarUnsubmitted
Not Done
ReplyInline Actions

On second thought, I guess the archive should not contain the windows style slashes.

grimar: On second thought, I guess the archive should not contain the windows style slashes.
jhendersonAuthorUnsubmitted
Done
ReplyInline Actions

Actually, the archive contains whatever slash is on the command-line when adding the member. In this case, it will be '/' even on Windows. The full path below will have a mixture of '/' and '\' on Windows. llvm-readobj then just prints what's in the archive.

BTW, I did this all on Windows, so it definitely works on there.

jhenderson: Actually, the archive contains whatever slash is on the command-line when adding the member. In…
grimarUnsubmitted
Not Done
ReplyInline Actions

OK, great, thanks for the explanation!

grimar: OK, great, thanks for the explanation!
# RUN: mkdir -p %t/c
# RUN: cp %p/Inputs/trivial.obj.elf-x86-64 a/b/1.o
# RUN: llvm-ar rcT c/absolute.a %t/a/b/1.o
# Show that absolute paths in the file header printing are correct.
# RUN: llvm-readobj --file-headers c/absolute.a | FileCheck %s --check-prefix=ABS -DDIR=%t
# ABS: File: [[DIR]]/a/b/1.o
# Show that absolute paths in an error message for both archive and member are correct.
# RUN: rm a/b/1.o
# RUN: not llvm-readobj --file-headers %t/c/absolute.a 2>&1 | FileCheck %s --check-prefix=ERR2 -DDIR=%t
# RUN: not llvm-readelf --file-headers %t/c/absolute.a 2>&1 | FileCheck %s --check-prefix=ERR2 -DDIR=%t
# ERR2: Error reading file: [[DIR]]/c/absolute.a: '[[DIR]]/a/b/1.o': {{[Nn]}}o such file or directory