This is an archive of the discontinued LLVM Phabricator instance.

Differential D62529

[llvm-readobj/llvm-readelf] - Simplify the elf-versioninfo.test test case.
ClosedPublic

Authored by grimar on May 28 2019, 7:51 AM.

Details

Reviewers
rupprecht
jhenderson
jakehehrlich
Commits
rG65dde1e0db64: [llvm-readobj/llvm-readelf] - Simplify the elf-versioninfo.test test case.
rL361932: [llvm-readobj/llvm-readelf] - Simplify the elf-versioninfo.test test case.
Summary

This removes 2 precompiled object from the test case and replaces
them with a single YAML. That allowed to simplify and clean up the test,
remove excessive checks.

Useful for D62520/D62516.

Diff Detail

Event Timeline

grimar created this revision.May 28 2019, 7:51 AM
grimar edited the summary of this revision. (Show Details)
rupprecht accepted this revision.May 28 2019, 11:58 AM
This revision is now accepted and ready to land.May 28 2019, 11:58 AM
Closed by commit rL361932: [llvm-readobj/llvm-readelf] - Simplify the elf-versioninfo.test test case. (authored by grimar). · Explain WhyMay 29 2019, 1:27 AM
This revision was automatically updated to reflect the committed changes.
Herald added a project: Restricted Project. · View Herald TranscriptMay 29 2019, 1:27 AM

Revision Contents

PathSize
test/
tools/
llvm-readobj/
Inputs/
298 lines

Diff 201672

test/tools/llvm-readobj/Inputs/verdef.elf-x86-64

  • This binary file was deleted.
PropertyOld ValueNew Value
File Mode100755null

test/tools/llvm-readobj/Inputs/verneed.elf-x86-64

  • This binary file was deleted.

test/tools/llvm-readobj/elf-versioninfo.test

// Test that llvm-readobj dumps version info tags correctly. ## Test that llvm-readobj dumps version info tags correctly.
RUN: llvm-readobj --dynamic-table -V %p/Inputs/verdef.elf-x86-64 | FileCheck %s --check-prefix=LLVM-VERDEF # RUN: yaml2obj %s --docnum=1 -o %t1
RUN: llvm-readelf --dynamic-table -V %p/Inputs/verdef.elf-x86-64 | FileCheck %s --check-prefix=GNU-VERDEF # RUN: llvm-readobj -V %t1 | FileCheck %s --check-prefix=LLVM
# RUN: llvm-readelf -V %t1 | FileCheck %s --check-prefix=GNU
LLVM-VERDEF: 0x000000006FFFFFF0 VERSYM 0x24C
LLVM-VERDEF: 0x000000006FFFFFFC VERDEF 0x25C --- !ELF
LLVM-VERDEF: 0x000000006FFFFFFD VERDEFNUM 3 FileHeader:
Class: ELFCLASS64
LLVM-VERDEF: Version symbols { Data: ELFDATA2LSB
LLVM-VERDEF-NEXT: Section Name: .gnu.version (20) OSABI: ELFOSABI_FREEBSD
LLVM-VERDEF-NEXT: Address: 0x24C Type: ET_DYN
LLVM-VERDEF-NEXT: Offset: 0x24C Machine: EM_X86_64
LLVM-VERDEF-NEXT: Link: 1 Sections:
LLVM-VERDEF-NEXT: Symbols [ - Name: .gnu.version
LLVM-VERDEF-NEXT: Symbol { Type: SHT_GNU_versym
LLVM-VERDEF-NEXT: Version: 0 Flags: [ SHF_ALLOC ]
LLVM-VERDEF-NEXT: Name: {{$}} Link: .dynsym
LLVM-VERDEF-NEXT: } AddressAlign: 0x0000000000000002
LLVM-VERDEF-NEXT: Symbol { EntSize: 0x0000000000000002
LLVM-VERDEF-NEXT: Version: 1 Entries: [ 0, 2, 3, 4, 5, 6]
LLVM-VERDEF-NEXT: Name: _end{{$}} - Name: .gnu.version_d
LLVM-VERDEF-NEXT: } Type: SHT_GNU_verdef
LLVM-VERDEF-NEXT: Symbol { Flags: [ SHF_ALLOC ]
LLVM-VERDEF-NEXT: Version: 1 Link: .dynstr
LLVM-VERDEF-NEXT: Name: _edata{{$}} AddressAlign: 0x0000000000000004
LLVM-VERDEF-NEXT: } Info: 0x0000000000000003
LLVM-VERDEF-NEXT: Symbol { Entries:
LLVM-VERDEF-NEXT: Version: 3 - Version: 1
LLVM-VERDEF-NEXT: Name: goo@@VERSION2 Flags: 0
LLVM-VERDEF-NEXT: } VersionNdx: 2
LLVM-VERDEF-NEXT: Symbol { Hash: 175630257
LLVM-VERDEF-NEXT: Version: 1 Names:
LLVM-VERDEF-NEXT: Name: __bss_start{{$}} - VERSION1
LLVM-VERDEF-NEXT: } - Version: 1
LLVM-VERDEF-NEXT: Symbol { Flags: 0
LLVM-VERDEF-NEXT: Version: 2 VersionNdx: 3
LLVM-VERDEF-NEXT: Name: foo@@VERSION1 Hash: 175630258
LLVM-VERDEF-NEXT: } Names:
LLVM-VERDEF-NEXT: Symbol { - VERSION2
LLVM-VERDEF-NEXT: Version: 2 - VERSION1
LLVM-VERDEF-NEXT: Name: VERSION1@@VERSION1 - Name: .gnu.version_r
LLVM-VERDEF-NEXT: } Type: SHT_GNU_verneed
LLVM-VERDEF-NEXT: Symbol { Flags: [ SHF_ALLOC ]
LLVM-VERDEF-NEXT: Version: 3 Link: .dynstr
LLVM-VERDEF-NEXT: Name: VERSION2@@VERSION2 AddressAlign: 0x0000000000000004
LLVM-VERDEF-NEXT: } Info: 0x0000000000000002
LLVM-VERDEF-NEXT: ] Dependencies:
LLVM-VERDEF-NEXT: } - Version: 1
File: verneed1.so.0
LLVM-VERDEF: SHT_GNU_verdef { Entries:
LLVM-VERDEF-NEXT: Definition { - Name: v1
LLVM-VERDEF-NEXT: Version: 1 Hash: 1938
LLVM-VERDEF-NEXT: Flags: Base (0x1) Flags: 0
LLVM-VERDEF-NEXT: Index: 1 Other: 4
LLVM-VERDEF-NEXT: Hash: 430712 - Name: v2
LLVM-VERDEF-NEXT: Name: blah Hash: 1939
LLVM-VERDEF-NEXT: } Flags: 0
LLVM-VERDEF-NEXT: Definition { Other: 5
LLVM-VERDEF-NEXT: Version: 1 - Version: 1
LLVM-VERDEF-NEXT: Flags: 0x0 File: verneed2.so.0
LLVM-VERDEF-NEXT: Index: 2 Entries:
LLVM-VERDEF-NEXT: Hash: 175630257 - Name: v3
LLVM-VERDEF-NEXT: Name: VERSION1 Hash: 1937
LLVM-VERDEF-NEXT: } Flags: 0
LLVM-VERDEF-NEXT: Definition { Other: 6
LLVM-VERDEF-NEXT: Version: 1 DynamicSymbols:
LLVM-VERDEF-NEXT: Flags: 0x0 - Name: sym1
LLVM-VERDEF-NEXT: Index: 3 Binding: STB_GLOBAL
LLVM-VERDEF-NEXT: Hash: 175630258 - Name: sym2
LLVM-VERDEF-NEXT: Name: VERSION2 Binding: STB_GLOBAL
LLVM-VERDEF-NEXT: Predecessor: VERSION1 - Name: sym3
LLVM-VERDEF-NEXT: } Binding: STB_GLOBAL
LLVM-VERDEF-NEXT: } - Name: sym4
Binding: STB_GLOBAL
GNU-VERDEF: 0x000000006ffffff0 (VERSYM) 0x24c - Name: sym5
GNU-VERDEF: 0x000000006ffffffc (VERDEF) 0x25c Binding: STB_GLOBAL
GNU-VERDEF: 0x000000006ffffffd (VERDEFNUM) 3 ...
GNU-VERDEF: Version symbols section '.gnu.version' contains 8 entries: # LLVM: Version symbols {
GNU-VERDEF-NEXT: Addr: 000000000000024c Offset: 0x00024c Link: 1 (.dynsym) # LLVM-NEXT: Section Name: .gnu.version
GNU-VERDEF-NEXT: 000: 0 (*local*) 1 (*global*) 1 (*global*) 3 (VERSION2) # LLVM-NEXT: Address: 0x0
GNU-VERDEF-NEXT: 004: 1 (*global*) 2 (VERSION1) 2 (VERSION1) 3 (VERSION2) # LLVM-NEXT: Offset: 0x280
# LLVM-NEXT: Link: 7
GNU-VERDEF: Dumper for .gnu.version_d is not implemented # LLVM-NEXT: Symbols [
# LLVM-NEXT: Symbol {
RUN: llvm-readobj -V %p/Inputs/verneed.elf-x86-64 | FileCheck %s --check-prefix=LLVM-VERNEED # LLVM-NEXT: Version: 0
RUN: llvm-readelf -V %p/Inputs/verneed.elf-x86-64 | FileCheck %s --check-prefix=GNU-VERNEED # LLVM-NEXT: Name:
# LLVM-NEXT: }
LLVM-VERNEED: SHT_GNU_verneed { # LLVM-NEXT: Symbol {
LLVM-VERNEED-NEXT: Dependency { # LLVM-NEXT: Version: 2
LLVM-VERNEED-NEXT: Version: 1 # LLVM-NEXT: Name: sym1@@VERSION1
LLVM-VERNEED-NEXT: Count: 2 # LLVM-NEXT: }
LLVM-VERNEED-NEXT: FileName: verneed1.so.0 # LLVM-NEXT: Symbol {
LLVM-VERNEED-NEXT: Entries [ # LLVM-NEXT: Version: 3
LLVM-VERNEED-NEXT: Entry { # LLVM-NEXT: Name: sym2@@VERSION2
LLVM-VERNEED-NEXT: Hash: 1938 # LLVM-NEXT: }
LLVM-VERNEED-NEXT: Flags: 0x0 # LLVM-NEXT: Symbol {
LLVM-VERNEED-NEXT: Index: 3 # LLVM-NEXT: Version: 4
LLVM-VERNEED-NEXT: Name: v2 # LLVM-NEXT: Name: sym3@v1
LLVM-VERNEED-NEXT: } # LLVM-NEXT: }
LLVM-VERNEED-NEXT: Entry { # LLVM-NEXT: Symbol {
LLVM-VERNEED-NEXT: Hash: 1939 # LLVM-NEXT: Version: 5
LLVM-VERNEED-NEXT: Flags: 0x0 # LLVM-NEXT: Name: sym4@v2
LLVM-VERNEED-NEXT: Index: 2 # LLVM-NEXT: }
LLVM-VERNEED-NEXT: Name: v3 # LLVM-NEXT: Symbol {
LLVM-VERNEED-NEXT: } # LLVM-NEXT: Version: 6
LLVM-VERNEED-NEXT: ] # LLVM-NEXT: Name: sym5@v3
LLVM-VERNEED-NEXT: } # LLVM-NEXT: }
LLVM-VERNEED-NEXT: Dependency { # LLVM-NEXT: ]
LLVM-VERNEED-NEXT: Version: 1 # LLVM-NEXT: }
LLVM-VERNEED-NEXT: Count: 1 # LLVM-NEXT: SHT_GNU_verdef {
LLVM-VERNEED-NEXT: FileName: verneed2.so.0 # LLVM-NEXT: Definition {
LLVM-VERNEED-NEXT: Entries [ # LLVM-NEXT: Version: 1
LLVM-VERNEED-NEXT: Entry { # LLVM-NEXT: Flags: 0x0
LLVM-VERNEED-NEXT: Hash: 1937 # LLVM-NEXT: Index: 2
LLVM-VERNEED-NEXT: Flags: 0x0 # LLVM-NEXT: Hash: 175630257
LLVM-VERNEED-NEXT: Index: 4 # LLVM-NEXT: Name: VERSION1
LLVM-VERNEED-NEXT: Name: v1 # LLVM-NEXT: }
LLVM-VERNEED-NEXT: } # LLVM-NEXT: Definition {
LLVM-VERNEED-NEXT: ] # LLVM-NEXT: Version: 1
LLVM-VERNEED-NEXT: } # LLVM-NEXT: Flags: 0x0
LLVM-VERNEED-NEXT: } # LLVM-NEXT: Index: 3
# LLVM-NEXT: Hash: 175630258
GNU-VERNEED: Version symbols section '.gnu.version' contains 4 entries: # LLVM-NEXT: Name: VERSION2
GNU-VERNEED-NEXT: Addr: 0000000000010228 Offset: 0x000228 Link: 1 (.dynsym) # LLVM-NEXT: Predecessor: VERSION1
GNU-VERNEED-NEXT: 000: 0 (*local*) 2 (v3) 3 (v2) 4 (v1) # LLVM-NEXT: }
# LLVM-NEXT: Definition {
GNU-VERNEED: Dumper for .gnu.version_r is not implemented # LLVM-NEXT: Version: 1
# LLVM-NEXT: Flags: 0x0
# LLVM-NEXT: Index: 3
# LLVM-NEXT: Hash: 175630258
# LLVM-NEXT: Name: VERSION2
# LLVM-NEXT: Predecessor: VERSION1
# LLVM-NEXT: }
# LLVM-NEXT: }
# LLVM-NEXT: SHT_GNU_verneed {
# LLVM-NEXT: Dependency {
# LLVM-NEXT: Version: 1
# LLVM-NEXT: Count: 2
# LLVM-NEXT: FileName: verneed1.so.0
# LLVM-NEXT: Entries [
# LLVM-NEXT: Entry {
# LLVM-NEXT: Hash: 1938
# LLVM-NEXT: Flags: 0x0
# LLVM-NEXT: Index: 4
# LLVM-NEXT: Name: v1
# LLVM-NEXT: }
# LLVM-NEXT: Entry {
# LLVM-NEXT: Hash: 1939
# LLVM-NEXT: Flags: 0x0
# LLVM-NEXT: Index: 5
# LLVM-NEXT: Name: v2
# LLVM-NEXT: }
# LLVM-NEXT: ]
# LLVM-NEXT: }
# LLVM-NEXT: Dependency {
# LLVM-NEXT: Version: 1
# LLVM-NEXT: Count: 1
# LLVM-NEXT: FileName: verneed2.so.0
# LLVM-NEXT: Entries [
# LLVM-NEXT: Entry {
# LLVM-NEXT: Hash: 1937
# LLVM-NEXT: Flags: 0x0
# LLVM-NEXT: Index: 6
# LLVM-NEXT: Name: v3
# LLVM-NEXT: }
# LLVM-NEXT: ]
# LLVM-NEXT: }
# LLVM-NEXT: }
# GNU: Version symbols section '.gnu.version' contains 6 entries:
# GNU-NEXT: Addr: 0000000000000000 Offset: 0x000280 Link: 7 (.dynsym)
# GNU-NEXT: 000: 0 (*local*) 2 (VERSION1) 3 (VERSION2) 4 (v1)
# GNU-NEXT: 004: 5 (v2) 6 (v3)
# GNU-VERDEF: Dumper for .gnu.version_d is not implemented
# GNU-VERNEED: Dumper for .gnu.version_r is not implemented