From c9830be39f2a5da3c6a5de1ad2831548f5676fc8 Mon Sep 17 00:00:00 2001
From: George Rimar <grimar@accesssoftek.com>
Date: Wed, 29 May 2019 08:28:47 +0000
Subject: [PATCH] [llvm-readobj/llvm-readelf] - Simplify the
 elf-versioninfo.test test case.

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

Differential revision: https://reviews.llvm.org/D62529

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@361932 91177308-0d34-0410-b5e6-96231b3b80d8
---
 .../llvm-readobj/Inputs/verdef.elf-x86-64     | Bin 2256 -> 0 bytes
 .../llvm-readobj/Inputs/verneed.elf-x86-64    | Bin 13520 -> 0 bytes
 test/tools/llvm-readobj/elf-versioninfo.test  | 298 ++++++++++--------
 3 files changed, 173 insertions(+), 125 deletions(-)
 delete mode 100755 test/tools/llvm-readobj/Inputs/verdef.elf-x86-64
 delete mode 100644 test/tools/llvm-readobj/Inputs/verneed.elf-x86-64

diff --git a/test/tools/llvm-readobj/Inputs/verdef.elf-x86-64 b/test/tools/llvm-readobj/Inputs/verdef.elf-x86-64
deleted file mode 100755
index 4b907694e800a622f28357c2cbe4a4129316febf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2256
zcmcIl%Wl(95FIBah4LzeMHe8o5(^e!DToCNgo2<&l}bRMA|W9x2Zy>+6QkHbvVmVf
ztoj?U%90P@16XFq7WSYp$DZT3ZlbCZOy$g-$GLOI_l)~tZF9ZiI48uUD!0X<p}Jw~
zN5>}4hTN1njhvCwQd9SwJ`D?(^~n6x$IV8K!j|Tps9_~rQ_Esz1BaUQ50@;@^e8ih
znmBBC6dccK+Z|BL>RFUu<Gu6yLziawFQ@)mer}?!%*el?{v|yz`(!?PIHz@KQ=gsT
zm)5Qy%G0&SPc|Ml>s(wHuiXvwC-4(rwxdWquNB8$ocO&&Ua4Kx{qPP@Z(bkVaZ$(-
zyjR>K@<o~B=*p3b{y}Gd{ZBQypwWwI2J(<8n&ZglAMX|zLoEnmRgHeJ7<}lD=Yh@K
z6+6gDI8|^j5OQl|@rBH-%*}-TEE~^$j>i!qn`Zwu`?=YF%+C6>P5z_8`7o5w_nTXK
zN4vpF-L2OTsfl)-%DiwcMwXBMr||~#o#w|~P2>0K41dPsgM7U@BOmuLjo;$kd)B=3
zVB_wDsyTTN<E*$zyPt@wOcpm7bmOEa?soT$`?lSSccQMi-6(0N9=y(Lxf{8Ij<}&8
zhx-s-kZ$C6c3z4bhq__nw{%54=%jW!McU9m5WE*~*=Q%^H}zMmfjI6OGXWv*Pw5&Q
zC7%4JCjWtf*mz`y{x<Z%>=4iSpvHFzLLBRJo-oT}ofYCaPt^7q&+*KoUROM3jW*{m
z*C?)nIQnE=_#ikJ9)2JA{iH@tQOfu&4FbzK=Nu6~GBD4_{@GVw<ET$O|3B=}VR))?
zeSB-NC)1CLUsWvjC=2Uju8UHx|5}6Wt(Z5o1AR9qc!oUoPyU7K<Jm1WRUfU;t)f%c
VcvnSvp~f`)H^aX#ChNM4{|l6Nt*ih5

diff --git a/test/tools/llvm-readobj/Inputs/verneed.elf-x86-64 b/test/tools/llvm-readobj/Inputs/verneed.elf-x86-64
deleted file mode 100644
index 3a9c8d8df8da38631340f7dd361a3dd9c0efb7c8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13520
zcmeHO%}*0i5T7n6enK^V5KUw+B~3Kz0&2WyYE*)W8t|qUEK(>5w5GcfImywZAO8e@
z21kw_IT{la@MMf<>-^rE*=`%~!bRgu(l_7p-u`xb*m-Z?+<!P36bhsi&~0*B(c3EG
zm>$yzq6*!l0UihG1RZ8`KmRJ?uJ~-$eg0c1t^A0@!Hm2PNucC~ecq#-ie5+5A&8=r
ztW){44<qFohdiv6LJUly%qKjSddf8~;Ltzik(5!c*Z1UWI`6J8#AHk|PsV%lRGr~G
zH=oZs@QAt!RleBSee4(au@eQ<$9Js29M=^}T!Af@SdRGz`Y?d8kA``~ydRw&&}o>N
z-aEaYu6Whe(&qrT9C-JV!)9TOR%@+Btu{XvCCw<N)d^Y{r`2&<%sk`b;b(O?_K0FS
zFZrrr&YqvEoU_ZL*SieU4FN;I5HJJ`0YktLFa!(%L%<ODrxDn}3*XKt2KR>FzW!r`
zs9pNW<IqTjCFpfr<L>7+Q|TLYyi)Cca{3qOc$M1SWF3J<hJYbp2p9r}fFWQA7y^cX
zAz%m?0)~Jg@OL4gd!xDst2*{{LFYZA?ZA6<&vZ)c*<PvapPmuB+va6i_p-O-jKOj7
zV}BUr_VSr;Nd05ZN_17Yu4`TV*tgEp_jbDpy)6D;qQ|0hOTzhe-T7RT4FN;I5HJJ`
z0YktLFa!(%L%<L)1Pp=y27yrD_`9!owCL?Ogii|Zj_PQqAO=VIV0d>uXhr^7K+orE
z2F}UvbuJzKfxYa5``9U(Uuz_5D-<m@UPXLDJXvZsx|G=#MfGY@_mL@Ut=e)mdbylZ
zl-6GJ=tM44U0Hg;sm;_|xN2IRqbR8-Y0FEV(`=GfTPg98bUuO3$IoZ)J$-!V(Sy5s
zaR=bQ3m9m>Li;9L0_$_BjlKy?`n`enQ}_-LdLEjueUY*lG+xSO^Jx4z&PNYLb?u|X
zVwh$>2=l|F{TbLmCH|=oy7q0>CBF<Klg_XC$}h7o{~dt#g*GH#`$Dcru8!&xETEQz
zXML+}F-%FI&aZeVez({UpZ2Y?=T;udA<0*!>sB4lKt8`H|C^%ZS2R#~@3W5eVeYK2
z7RpLPNe~qngLM5`XNGME$?{`Kh!NfSPQz=ReAS<^pxCJmJeK@-Vm!$lm34l_Z;ox*
h+!716Dfwy622oa*S(jPbEB~51okVmYi}XTo{%@DYknI2f

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