[llvm-readobj][test] - Merge 2 test cases together.

[grimar]

Summary

This merges invalid-attr-section-size.test and invalid-attr-version.test
into invalid-attributes-sec.test.

This allows to have a single place where other related test cases can be added.

[MaskRay]

LG. I wonder the test should be named attributes-invalid.test since users can find related tests by checking the prefix.

[grimar]

In D92316#2424052, @MaskRay wrote:

LG. I wonder the test should be named attributes-invalid.test since users can find related tests by checking the prefix.

I think renaming to attributes-invalid.test is a good idea. Will do.

[jhenderson]

llvm/test/tools/llvm-readobj/ELF/RISCV/invalid-attributes-sec.test

25–26

The intent of the invalid-attr-section-size.test was simply to show that llvm-readobj usefully reports the errors reported by the attribute parser, hence why the comment didn't mention the specific details. See https://reviews.llvm.org/D75833#1948304 and other comments in that review for context. Perhaps it is worth keeping the comment for that case generic like in the original, so that the intent isn't lost (the attribute parser unit tests are for testing the details of the parser).

[grimar]

• Addressed review comments.

[jhenderson]

LGTM.

llvm/test/tools/llvm-readobj/ELF/RISCV/attributes-invalid.test

25 ↗

(On Diff #308575)

I'd suggest this wording.

llvm/test/tools/llvm-readobj/ELF/RISCV/invalid-attr-section-size.test

-## This test case is used to ensure the error code is caught by llvm-readobj.
-
-# RUN: yaml2obj %s -D BITS=32 -o %t.32.o
-# RUN: llvm-readobj -A %t.32.o 2>&1 | FileCheck -DFILE=%t %s
-# RUN: yaml2obj %s -D BITS=64 -o %t.64.o
-# RUN: llvm-readobj -A %t.64.o 2>&1 | FileCheck -DFILE=%t %s
-
-# CHECK: warning: '[[FILE]].{{32|64}}.o': invalid section length 0 at offset 0x1
-
---- !ELF
-FileHeader:
-  Class:   ELFCLASS[[BITS]]
-  Data:    ELFDATA2LSB
-  Type:    ET_REL
-  Machine: EM_RISCV
-Sections:
-  - Name:    .riscv.attributes
-    Type:    SHT_RISCV_ATTRIBUTES
-## Version: 'A'(0x41), section length: 0
-    Content: 4100000000

llvm/test/tools/llvm-readobj/ELF/RISCV/invalid-attr-version.test

-## This test case is used to ensure llvm-readobj checks the version of
-## attribute sections correctly.
-
-# RUN: yaml2obj %s -D BITS=32 -o %t.32.o
-# RUN: llvm-readobj -A %t.32.o 2>&1 | FileCheck -DFILE=%t %s
-# RUN: yaml2obj %s -D BITS=64 -o %t.64.o
-# RUN: llvm-readobj -A %t.64.o 2>&1 | FileCheck -DFILE=%t %s
-
-# CHECK: warning: '[[FILE]].{{32|64}}.o': unrecognised FormatVersion: 0x42
-
---- !ELF
-FileHeader:
-  Class:   ELFCLASS[[BITS]]
-  Data:    ELFDATA2LSB
-  Type:    ET_REL
-  Machine: EM_RISCV
-Sections:
-  - Name:    .riscv.attributes
-    Type:    SHT_RISCV_ATTRIBUTES
-## Version: 'B'
-    Content: 42

llvm/test/tools/llvm-readobj/ELF/RISCV/invalid-attributes-sec.test

+## Check how we dump invalid SHT_RISCV_ATTRIBUTES sections.
+
+## This test case is used to ensure llvm-readobj checks the version of
+## attribute sections correctly. The only supported format is 'A' (41),
+## here we use 'B' (42).
+
+# RUN: yaml2obj %s -D BITS=32 -DCONTENT=42 -o %t1.32.o
+# RUN: llvm-readobj -A %t1.32.o 2>&1 | FileCheck -DFILE=%t1 %s --check-prefix=ERR-FORMAT
+# RUN: yaml2obj %s -D BITS=64 -DCONTENT=42 -o %t1.64.o
+# RUN: llvm-readobj -A %t1.64.o 2>&1 | FileCheck -DFILE=%t1 %s --check-prefix=ERR-FORMAT
+
+# ERR-FORMAT: warning: '[[FILE]].{{32|64}}.o': unrecognised FormatVersion: 0x42
+
+--- !ELF
+FileHeader:
+  Class:   ELFCLASS[[BITS=64]]
+  Data:    ELFDATA2LSB
+  Type:    ET_REL
+  Machine: EM_RISCV
+Sections:
+  - Name:    .riscv.attributes
+    Type:    SHT_RISCV_ATTRIBUTES
+    Content: [[CONTENT]]
+
+## Check we report a warning when the length of the attributes data
+## of the SHT_RISCV_ATTRIBUTES section is zero.
+
+# RUN: yaml2obj %s -D BITS=32 -DCONTENT=4100000000 -o %t2.32.o
+# RUN: llvm-readobj -A %t2.32.o 2>&1 | FileCheck -DFILE=%t2 %s --check-prefix=ERR-LENGTH
+# RUN: yaml2obj %s -D BITS=64 -DCONTENT=4100000000 -o %t2.64.o
+# RUN: llvm-readobj -A %t2.64.o 2>&1 | FileCheck -DFILE=%t2 %s --check-prefix=ERR-LENGTH
+
+# ERR-LENGTH: warning: '[[FILE]].{{32|64}}.o': invalid section length 0 at offset 0x1