[llvm-readobj][test] - Remove --symbols --dyn-syms part from Object/readobj-shared-object.test.

[grimar]

Summary

The intention of Object/readobj-shared-object.test was to check the
general output for shared object.

I've added a case for testing dynamic objects to ELF/symbols.test.
Also we already test dynamic symbols printing in ELF/dyn-symbols.test +
I've added a case for --dyn-syms alias in D73164.

Hence we can remove this piece from Object/readobj-shared-object.test.

[MaskRay]

Can we delete the test/Object test and move the remaining --needed-libs pieces to test/tools/llvm-readobj/ELF/ ?

[grimar]

In D73175#1837691, @MaskRay wrote:

Can we delete the test/Object test and move the remaining --needed-libs pieces to test/tools/llvm-readobj/ELF/ ?

That is my intention, I posted D73174 to move the --needed-libs and after this patch we will be able to remove the test.
I'd probably do it in a separate commit saying that "we are testing --sections already elsewhere" though.

[jhenderson]

llvm/test/tools/llvm-readobj/ELF/symbols.test

5

It feels weird to me that we test relocatable and shared objects, but not regular ET_EXEC executables. Why do shared objects need specifically testing?

[grimar]

llvm/test/tools/llvm-readobj/ELF/symbols.test

5

I'd say it is wierd that we test relocatable object with dynamic symbols (--dyn-symbols, below) as they normally
do not have them. Perhaps having a test for both ET_DYN and ET_REL does not hurt to document the behavior?
I am not sure if we should add a test for ET_EXEC as it looks similar to ET_DYN in the context of this patch to me.
What do you think?

[jhenderson]

llvm/test/tools/llvm-readobj/ELF/symbols.test

5

I'd say it is wierd that we test relocatable object with dynamic symbols (--dyn-symbols, below) as they normally do not have them.

Fair point. I think one or more of the tools may have only allowed options like this for shared objects at one point. I don't know if that's still the case though. Perhaps a comment is needed to explain why we picked those two formats.

[grimar]

• Addressed review comments.

[jhenderson]

LGTM.

[MaskRay]

llvm/test/tools/llvm-readobj/ELF/symbols.test

9

dynamic libraries

-> The difference between ET_EXEC and ET_DYN

ET_DYN can also be used by position-independent executables.

llvm/test/Object/readobj-shared-object.test

-# RUN: llvm-readobj --sections --symbols --dyn-syms --needed-libs \
+# RUN: llvm-readobj --sections --needed-libs \
 # RUN:   %p/Inputs/shared-object-test.elf-i386 | FileCheck %s
 
-# RUN: llvm-readobj --sections --symbols --dyn-syms --needed-libs \
+# RUN: llvm-readobj --sections --needed-libs \
 # RUN:   %p/Inputs/shared-object-test.elf-x86-64 | FileCheck %s
 
 # CHECK:   Sections [
 # CHECK:   Section {
 # CHECK:     Name:  (0)
 # CHECK:     Type: SHT_NULL
 # CHECK:     Flags [ (0x0)
 # CHECK:     ]

 # CHECK:   Section {
 # CHECK:     Name: .strtab
 # CHECK:     Type: SHT_STRTAB
 # CHECK:     Flags [ (0x0)
 # CHECK:     ]
 # CHECK:   }
 # CHECK: ]
 
-# CHECK:   Symbols [
-# CHECK:   Symbol {
-# CHECK:     Name: .hash (0)
-# CHECK:     Binding: Local
-# CHECK:     Type: Section
-# CHECK:     Section: .hash
-# CHECK:   }
-# CHECK:   Symbol {
-# CHECK:     Name: .dynsym (0)
-# CHECK:     Binding: Local
-# CHECK:     Type: Section
-# CHECK:     Section: .dynsym
-# CHECK:   }
-# CHECK:   Symbol {
-# CHECK:     Name: .dynstr (0)
-# CHECK:     Binding: Local
-# CHECK:     Type: Section
-# CHECK:     Section: .dynstr
-# CHECK:   }
-# CHECK:   Symbol {
-# CHECK:     Name: .text (0)
-# CHECK:     Binding: Local
-# CHECK:     Type: Section
-# CHECK:     Section: .text
-# CHECK:   }
-# CHECK:   Symbol {
-# CHECK:     Name: .eh_frame (0)
-# CHECK:     Binding: Local
-# CHECK:     Type: Section
-# CHECK:     Section: .eh_frame
-# CHECK:   }
-# CHECK:   Symbol {
-# CHECK:     Name: .tdata (0)
-# CHECK:     Binding: Local
-# CHECK:     Type: Section
-# CHECK:     Section: .tdata
-# CHECK:   }
-# CHECK:   Symbol {
-# CHECK:     Name: .dynamic (0)
-# CHECK:     Binding: Local
-# CHECK:     Type: Section
-# CHECK:     Section: .dynamic
-# CHECK:   }
-# CHECK:   Symbol {
-# CHECK:     Name: .got.plt (0)
-# CHECK:     Binding: Local
-# CHECK:     Type: Section
-# CHECK:     Section: .got.plt
-# CHECK:   }
-# CHECK:   Symbol {
-# CHECK:     Name: .data (0)
-# CHECK:     Binding: Local
-# CHECK:     Type: Section
-# CHECK:     Section: .data
-# CHECK:   }
-# CHECK:   Symbol {
-# CHECK:     Name: .bss (0)
-# CHECK:     Binding: Local
-# CHECK:     Type: Section
-# CHECK:     Section: .bss
-# CHECK:   }
-# CHECK:   Symbol {
-# CHECK:     Name: shared.ll
-# CHECK:     Binding: Local
-# CHECK:     Type: File
-# CHECK:     Section: Absolute (0xFFF1)
-# CHECK:   }
-# CHECK:   Symbol {
-# CHECK:     Name: local_func
-# CHECK:     Binding: Local
-# CHECK:     Type: Function
-# CHECK:     Section: .text
-# CHECK:   }
-# CHECK:   Symbol {
-# CHECK:     Name: _GLOBAL_OFFSET_TABLE_
-# CHECK:     Binding: Local
-# CHECK:     Type: Object
-# CHECK:     Section: Absolute (0xFFF1)
-# CHECK:   }
-# CHECK:   Symbol {
-# CHECK:     Name: _DYNAMIC
-# CHECK:     Binding: Local
-# CHECK:     Type: Object
-# CHECK:     Section: Absolute (0xFFF1)
-# CHECK:   }
-# CHECK:   Symbol {
-# CHECK:     Name: common_sym
-# CHECK:     Binding: Global
-# CHECK:     Type: Object
-# CHECK:     Section: .bss
-# CHECK:   }
-# CHECK:   Symbol {
-# CHECK:     Name: tls_sym
-# CHECK:     Binding: Global
-# CHECK:     Type: TLS
-# CHECK:     Section: .tdata
-# CHECK:   }
-# CHECK:   Symbol {
-# CHECK:     Name: defined_sym
-# CHECK:     Binding: Global
-# CHECK:     Type: Object
-# CHECK:     Section: .data
-# CHECK:   }
-# CHECK:   Symbol {
-# CHECK:     Name: __bss_start
-# CHECK:     Binding: Global
-# CHECK:     Type: None
-# CHECK:     Section: Absolute (0xFFF1)
-# CHECK:   }
-# CHECK:   Symbol {
-# CHECK:     Name: _end
-# CHECK:     Binding: Global
-# CHECK:     Type: None
-# CHECK:     Section: Absolute (0xFFF1)
-# CHECK:   }
-# CHECK:   Symbol {
-# CHECK:     Name: global_func
-# CHECK:     Binding: Global
-# CHECK:     Type: Function
-# CHECK:     Section: .text
-# CHECK:   }
-# CHECK:   Symbol {
-# CHECK:     Name: _edata
-# CHECK:     Binding: Global
-# CHECK:     Type: None
-# CHECK:     Section: Absolute (0xFFF1)
-# CHECK:   }
-# CHECK: ]
-
-# CHECK: DynamicSymbols [
-# CHECK:   Symbol {
-# CHECK:     Name: common_sym
-# CHECK:     Binding: Global
-# CHECK:     Type: Object
-# CHECK:     Section: .bss
-# CHECK:   }
-# CHECK:   Symbol {
-# CHECK:     Name: tls_sym
-# CHECK:     Binding: Global
-# CHECK:     Type: TLS
-# CHECK:     Section: .tdata
-# CHECK:   }
-# CHECK:   Symbol {
-# CHECK:     Name: defined_sym
-# CHECK:     Binding: Global
-# CHECK:     Type: Object
-# CHECK:     Section: .data
-# CHECK:   }
-# CHECK:   Symbol {
-# CHECK:     Name: __bss_start
-# CHECK:     Binding: Global
-# CHECK:     Type: None
-# CHECK:     Section: Absolute (0xFFF1)
-# CHECK:   }
-# CHECK:   Symbol {
-# CHECK:     Name: _end
-# CHECK:     Binding: Global
-# CHECK:     Type: None
-# CHECK:     Section: Absolute (0xFFF1)
-# CHECK:   }
-# CHECK:   Symbol {
-# CHECK:     Name: global_func
-# CHECK:     Binding: Global
-# CHECK:     Type: Function
-# CHECK:     Section: .text
-# CHECK:   }
-# CHECK:   Symbol {
-# CHECK:     Name: _edata
-# CHECK:     Binding: Global
-# CHECK:     Type: None
-# CHECK:     Section: Absolute (0xFFF1)
-# CHECK:   }
-# CHECK: ]
-
 # CHECK:      NeededLibraries [
 # CHECK-NEXT:  libc.so.6
 # CHECK-NEXT:  libm.so.6
 # CHECK-NEXT: ]

llvm/test/tools/llvm-readobj/ELF/symbols.test

 ## This is a general test for --symbols option and its aliases.
 ## There are also other symbols* tests that check specific things.
 
 ## Case 1: Test how llvm-readobj and llvm-readelf dumps symbols.
+## a) Check relocatable objects.
 # RUN: yaml2obj %s --docnum=1 -o %t64
 # RUN: llvm-readobj --symbols %t64 | FileCheck %s --match-full-lines --strict-whitespace --check-prefix=SYMBOLS-LLVM
 # RUN: llvm-readelf --symbols %t64 | FileCheck %s --match-full-lines --strict-whitespace --check-prefix=SYMBOLS-GNU64
 # RUN: yaml2obj %s --docnum=2 -o %t32
 # RUN: llvm-readobj --symbols %t32 | FileCheck %s --match-full-lines --strict-whitespace --check-prefix=SYMBOLS-LLVM
 # RUN: llvm-readelf --symbols %t32 | FileCheck %s --match-full-lines --strict-whitespace --check-prefix=SYMBOLS-GNU32
+## b) Check dynamic objects.
+# RUN: yaml2obj %s --docnum=3 -o %t64.so
+# RUN: llvm-readobj --symbols %t64.so | FileCheck %s --match-full-lines --strict-whitespace --check-prefix=SYMBOLS-LLVM
+# RUN: llvm-readelf --symbols %t64.so | FileCheck %s --match-full-lines --strict-whitespace --check-prefix=SYMBOLS-GNU64
+# RUN: yaml2obj %s --docnum=4 -o %t32.so
+# RUN: llvm-readobj --symbols %t32.so | FileCheck %s --match-full-lines --strict-whitespace --check-prefix=SYMBOLS-LLVM
+# RUN: llvm-readelf --symbols %t32.so | FileCheck %s --match-full-lines --strict-whitespace --check-prefix=SYMBOLS-GNU32
 
 #      SYMBOLS-LLVM:Symbols [
 # SYMBOLS-LLVM-NEXT:  Symbol {
 # SYMBOLS-LLVM-NEXT:    Name:  (0)
 # SYMBOLS-LLVM-NEXT:    Value: 0x0
 # SYMBOLS-LLVM-NEXT:    Size: 0
 # SYMBOLS-LLVM-NEXT:    Binding: Local (0x0)
 # SYMBOLS-LLVM-NEXT:    Type: None (0x0)
FileHeader:
   Machine: EM_386
 Symbols:
   - Name:  foo
     Value: 0x1
   - Name:  bar
     Value: 0x2
 DynamicSymbols:
   - Name:  zed
+
+--- !ELF
+FileHeader:
+  Class:   ELFCLASS64
+  Data:    ELFDATA2LSB
+  Type:    ET_DYN
+  Machine: EM_X86_64
+Symbols:
+  - Name:  foo
+    Value: 0x1
+  - Name:  bar
+    Value: 0x2
+DynamicSymbols:
+  - Name:  zed
+
+--- !ELF
+FileHeader:
+  Class:   ELFCLASS32
+  Data:    ELFDATA2LSB
+  Type:    ET_DYN
+  Machine: EM_386
+Symbols:
+  - Name:  foo
+    Value: 0x1
+  - Name:  bar
+    Value: 0x2
+DynamicSymbols:
+  - Name:  zed