[ObjectYAML][test] Address comments in D80203

[Higuoxing]

Summary

This patch addresses comments in D80203

[Higuoxing]

Update.

[MaskRay]

llvm/test/tools/yaml2obj/ELF/DWARF/debug-str.yaml

18

I think you can just make this a SHDRS: check line. The cost is negligible.

[Higuoxing]

Address @MaskRay 's comments. Thanks for the suggestion!

[Higuoxing]

Offset => Off

[jhenderson]

Thanks, LGTM, but best wait for @MaskRay to clarify what he means.

llvm/test/tools/yaml2obj/ELF/DWARF/debug-str.yaml

18

I'm not quite sure I follow @MaskRay?

[Higuoxing]

Ping. Hi @MaskRay, are you happy with this revision?

llvm/test/tools/yaml2obj/ELF/DWARF/debug-str.yaml

 # DWARF-DEFAULT-NEXT: [     2] b
 # DWARF-DEFAULT-NEXT: [     4] c
 
 ## Check the default sh_type, sh_entsize, sh_info, sh_flags and sh_addralign of the
 ## .debug_str section header.
 
 # RUN: llvm-readelf -S %t1.o | FileCheck %s --check-prefix=SHDRS-DEFAULT
 
-#                Name       Type     Address          Offset Size   ES Flg Lk Inf Al
+# SHDRS-DEFAULT: Name       Type     Address          Off    Size   ES Flg Lk Inf Al
 # SHDRS-DEFAULT: .debug_str PROGBITS 0000000000000000 000040 000006 01 MS  0  0   1
 
 --- !ELF
 FileHeader:
   Class:   ELFCLASS64
   Data:    ELFDATA2LSB
   Type:    ET_EXEC
   Machine: EM_X86_64
 DWARF:
   debug_str:
     - a
     - b
     - c
 
 ## b) Generate the .debug_str section from the raw section content.
 
 # RUN: yaml2obj --docnum=2 %s -o %t2.o
 # RUN: llvm-readelf --string-dump=.debug_str %t2.o | FileCheck %s --check-prefix=DWARF-DEFAULT
 # RUN: llvm-readelf -S %t2.o | FileCheck %s --check-prefix=SHDRS
 
-#        Name       Type     Address          Offset Size   ES Flg Lk Inf Al
+# SHDRS: Name       Type     Address          Off    Size   ES Flg Lk Inf Al
 # SHDRS: .debug_str PROGBITS 0000000000000000 000040 000006 01 MS  0  0   0
 
 --- !ELF
 FileHeader:
   Class:   ELFCLASS64
   Data:    ELFDATA2LSB
   Type:    ET_EXEC
   Machine: EM_X86_64
 Sections:
   - Name:    .debug_str
     Type:    SHT_PROGBITS
     Content: "610062006300"
 
 ## c) Generate the .debug_str section when the "Size" is specified.
 
 # RUN: yaml2obj --docnum=3 %s -o %t3.o
 # RUN: llvm-readelf -S %t3.o | FileCheck %s --check-prefix=SIZE
 # RUN: llvm-readelf --hex-dump=.debug_str %t3.o | FileCheck %s --check-prefix=SIZE-CONTENT
 
-#       Name       Type     Address          Offset Size   ES Flg Lk Inf Al
+# SIZE: Name       Type     Address          Off    Size   ES Flg Lk Inf Al
 # SIZE: .debug_str PROGBITS 0000000000000000 000040 000010 01 MS  0  0   0
 
 #       SIZE-CONTENT: Hex dump of section '.debug_str':
 #  SIZE-CONTENT-NEXT: 0x00000000 00000000 00000000 00000000 00000000 ................
 # SIZE-CONTENT-EMPTY:
 
 --- !ELF
 FileHeader:
debug_str:
     - a
 
 ## f) Test that all the properties can be overridden by the section header when
 ## the "debug_str" entry doesn't exist.
 
 # RUN: yaml2obj --docnum=6 %s -o %t6.o
 # RUN: llvm-readelf -S %t6.o | FileCheck %s --check-prefix=OVERRIDDEN
 
-#             Index Name       Type   Address          Offset Size   ES Flg Lk Inf Al
+# OVERRIDDEN: [Nr]  Name       Type   Address          Off    Size   ES Flg Lk Inf Al
 # OVERRIDDEN: [ 1]  .sec       STRTAB 0000000000000000 000040 000000 00     0  0   0
 # OVERRIDDEN: [ 2]  .debug_str STRTAB 0000000000002020 000050 000006 02 A   1  1   2
 
 --- !ELF
 FileHeader:
   Class:   ELFCLASS64
   Data:    ELFDATA2LSB
   Type:    ET_EXEC
   Machine: EM_X86_64
 Sections:
   - Name:         .sec               # Linked by .debug_str.
     Type:         SHT_STRTAB
   - Name:         .debug_str
     Type:         SHT_STRTAB         # SHT_PROGBITS by default.
     Flags:        [SHF_ALLOC]        # [SHF_STRINGS, SHF_MERGE] by default.
     Link:         .sec               # 0 by default.
     EntSize:      2                  # 1 by default.
     Info:         1                  # 0 by default.
     AddressAlign: 2                  # 0 by default.
     Address:      0x0000000000002020 # 0x00 by default.
     Offset:       0x00000050         # 0x40 for the first section.
-    Size:         6                  # Set the "Size" so that we can reuse the check tag "OVERRIEDDEN"
+    Size:         6                  # Set the "Size" so that we can reuse the check tag "OVERRIDDEN"
 
 ## g) Test that all the properties can be overridden by the section header when
 ## the "debug_str" entry is used.
 
 # RUN: yaml2obj --docnum=7 %s -o %t7.o
 # RUN: llvm-readelf --string-dump=.debug_str %t7.o | FileCheck %s --check-prefix=DWARF-DEFAULT
 # RUN: llvm-readelf -S %t7.o | FileCheck %s --check-prefix=OVERRIDDEN
 

 --- !ELF
 FileHeader:
   Class:   ELFCLASS64
   Data:    ELFDATA2LSB
   Type:    ET_EXEC
   Machine: EM_X86_64
 DWARF:
 
-## i) Test that if we try to initialize the .debug_str section with a preserved "Type", e.g.,
-## SHT_DYNAMIC, yaml2obj will treat it as a dynamic section and discard the content in the
-## "DWARF" entry.
+## i) Test that if we try to initialize the .debug_str section with a "Type" with non-standard
+## syntax, e.g., SHT_DYNAMIC, yaml2obj will treat it as a dynamic section and discard the
+## content in the "DWARF" entry.
 
 # RUN: yaml2obj --docnum=9 %s -o %t9.o
 # RUN: llvm-readelf -S %t9.o | FileCheck %s --check-prefix=DYN-SHDR
 # RUN: llvm-readelf -d %t9.o | FileCheck %s --check-prefix=DYNAMIC
 
 # RUN: yaml2obj --docnum=10 %s -o %t10.o
 # RUN: llvm-readelf -S %t10.o | FileCheck %s --check-prefix=DYN-SHDR
 # RUN: llvm-readelf -d %t10.o | FileCheck %s --check-prefix=DYNAMIC
 
-#           Name       Type    Address          Offset Size   ES Flg Lk Inf Al
-# DYN-SHDR: .debug_str DYNAMIC 0000000000000000 000040 000010 10      0   0  0
+# DYN-SHDR: Name       Type    Address          Off    Size   ES Flg Lk Inf Al
+# DYN-SHDR: .debug_str DYNAMIC 0000000000000000 000040 000010 10     0  0   0
 
 #      DYNAMIC: Dynamic section at offset 0x40 contains 1 entries:
 # DYNAMIC-NEXT:  Tag                Type   Name/Value
 # DYNAMIC-NEXT:  0x0000000000000000 (NULL) 0x0
 
 --- !ELF
 FileHeader:
   Class:   ELFCLASS64