[llvm-readobj][llvm-objdump][test] - Improve dynamic section testing.

This adds --strict-whitespace --match-full-lines flags to
improve the testing and reveal formatting issues we have.

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

2 files changed, 105 insertions, 105 deletions

diff --git a/llvm/test/tools/llvm-objdump/elf-dynamic-section-machine-specific.test b/llvm/test/tools/llvm-objdump/elf-dynamic-section-machine-specific.test
index 36a096706fb..e2f859a82eb 100644
--- a/llvm/test/tools/llvm-objdump/elf-dynamic-section-machine-specific.test
+++ b/llvm/test/tools/llvm-objdump/elf-dynamic-section-machine-specific.test
@@ -37,56 +37,56 @@ ProgramHeaders:
 
 ## Case 2: Test that MIPS machine-specific tags can be dumped.
 # RUN: yaml2obj --docnum=2 -o %t.mips %s
-# RUN: llvm-objdump -p %t.mips | FileCheck %s --check-prefix=MIPS
+# RUN: llvm-objdump -p %t.mips | FileCheck %s  --strict-whitespace --match-full-lines --check-prefix=MIPS
 
-# MIPS:      Dynamic Section:
-# MIPS-NEXT:   MIPS_RLD_VERSION           0x0000000012345678
-# MIPS-NEXT:   MIPS_TIME_STAMP            0x0000000011223344
-# MIPS-NEXT:   MIPS_ICHECKSUM             0x0000000011112222
-# MIPS-NEXT:   MIPS_IVERSION              0x0000000000000001
-# MIPS-NEXT:   MIPS_FLAGS                 0x0000000011111111
-# MIPS-NEXT:   MIPS_BASE_ADDRESS          0x0000000087654321
-# MIPS-NEXT:   MIPS_MSYM                  0x0000000000001000
-# MIPS-NEXT:   MIPS_CONFLICT              0x0000000000001000
-# MIPS-NEXT:   MIPS_LIBLIST               0x0000000000001000
-# MIPS-NEXT:   MIPS_LOCAL_GOTNO           0x0000000000000001
-# MIPS-NEXT:   MIPS_CONFLICTNO            0x0000000000000001
-# MIPS-NEXT:   MIPS_LIBLISTNO             0x0000000000000001
-# MIPS-NEXT:   MIPS_SYMTABNO              0x0000000000000001
-# MIPS-NEXT:   MIPS_UNREFEXTNO            0x0000000000000000
-# MIPS-NEXT:   MIPS_GOTSYM                0x0000000000000000
-# MIPS-NEXT:   MIPS_HIPAGENO              0x0000000088776655
-# MIPS-NEXT:   MIPS_RLD_MAP               0x0000000000001000
-# MIPS-NEXT:   MIPS_DELTA_CLASS           0x0000000000001000
-# MIPS-NEXT:   MIPS_DELTA_CLASS_NO        0x0000000000000001
-# MIPS-NEXT:   MIPS_DELTA_INSTANCE        0x0000000000001000
+#      MIPS:Dynamic Section:
+# MIPS-NEXT:  MIPS_RLD_VERSION     0x0000000012345678
+# MIPS-NEXT:  MIPS_TIME_STAMP      0x0000000011223344
+# MIPS-NEXT:  MIPS_ICHECKSUM       0x0000000011112222
+# MIPS-NEXT:  MIPS_IVERSION        0x0000000000000001
+# MIPS-NEXT:  MIPS_FLAGS           0x0000000011111111
+# MIPS-NEXT:  MIPS_BASE_ADDRESS    0x0000000087654321
+# MIPS-NEXT:  MIPS_MSYM            0x0000000000001000
+# MIPS-NEXT:  MIPS_CONFLICT        0x0000000000001000
+# MIPS-NEXT:  MIPS_LIBLIST         0x0000000000001000
+# MIPS-NEXT:  MIPS_LOCAL_GOTNO     0x0000000000000001
+# MIPS-NEXT:  MIPS_CONFLICTNO      0x0000000000000001
+# MIPS-NEXT:  MIPS_LIBLISTNO       0x0000000000000001
+# MIPS-NEXT:  MIPS_SYMTABNO        0x0000000000000001
+# MIPS-NEXT:  MIPS_UNREFEXTNO      0x0000000000000000
+# MIPS-NEXT:  MIPS_GOTSYM          0x0000000000000000
+# MIPS-NEXT:  MIPS_HIPAGENO        0x0000000088776655
+# MIPS-NEXT:  MIPS_RLD_MAP         0x0000000000001000
+# MIPS-NEXT:  MIPS_DELTA_CLASS     0x0000000000001000
+# MIPS-NEXT:  MIPS_DELTA_CLASS_NO  0x0000000000000001
+# MIPS-NEXT:  MIPS_DELTA_INSTANCE  0x0000000000001000
 ## FIXME: llvm-objdump does not print spaces after MIPS_DELTA_INSTANCE_NO, MIPS_PROTECTED_GOTIDX
 ##        and other long tags. The output looks broken because of that.
-# MIPS-NEXT:   MIPS_DELTA_INSTANCE_NO0x0000000000000001
-# MIPS-NEXT:   MIPS_DELTA_RELOC           0x0000000000001000
-# MIPS-NEXT:   MIPS_DELTA_RELOC_NO        0x0000000000000001
-# MIPS-NEXT:   MIPS_DELTA_SYM             0x0000000000001000
-# MIPS-NEXT:   MIPS_DELTA_SYM_NO          0x0000000000000001
-# MIPS-NEXT:   MIPS_DELTA_CLASSSYM        0x0000000000001000
-# MIPS-NEXT:   MIPS_DELTA_CLASSSYM_NO0x0000000000000001
-# MIPS-NEXT:   MIPS_CXX_FLAGS             0x0000000088887777
-# MIPS-NEXT:   MIPS_PIXIE_INIT            0x0000000000001000
-# MIPS-NEXT:   MIPS_LOCALPAGE_GOTIDX0x0000000000000001
-# MIPS-NEXT:   MIPS_LOCAL_GOTIDX          0x0000000000000001
-# MIPS-NEXT:   MIPS_HIDDEN_GOTIDX         0x0000000000000001
-# MIPS-NEXT:   MIPS_PROTECTED_GOTIDX0x0000000000000001
-# MIPS-NEXT:   MIPS_OPTIONS               0x0000000000001000
-# MIPS-NEXT:   MIPS_INTERFACE             0x0000000000001000
-# MIPS-NEXT:   MIPS_DYNSTR_ALIGN          0x0000000088888888
-# MIPS-NEXT:   MIPS_INTERFACE_SIZE        0x0000000000000010
-# MIPS-NEXT:   MIPS_RLD_TEXT_RESOLVE_ADDR0x0000000000000008
-# MIPS-NEXT:   MIPS_PERF_SUFFIX           0x0000000000000000
-# MIPS-NEXT:   MIPS_COMPACT_SIZE          0x0000000000000010
-# MIPS-NEXT:   MIPS_GP_VALUE              0x0000000000000001
-# MIPS-NEXT:   MIPS_AUX_DYNAMIC           0x0000000000001000
-# MIPS-NEXT:   MIPS_PLTGOT                0x0000000000001000
-# MIPS-NEXT:   MIPS_RWPLT                 0x0000000000001000
-# MIPS-NEXT:   MIPS_RLD_MAP_REL           0x0000000000001000
+# MIPS-NEXT:  MIPS_DELTA_INSTANCE_NO0x0000000000000001
+# MIPS-NEXT:  MIPS_DELTA_RELOC     0x0000000000001000
+# MIPS-NEXT:  MIPS_DELTA_RELOC_NO  0x0000000000000001
+# MIPS-NEXT:  MIPS_DELTA_SYM       0x0000000000001000
+# MIPS-NEXT:  MIPS_DELTA_SYM_NO    0x0000000000000001
+# MIPS-NEXT:  MIPS_DELTA_CLASSSYM  0x0000000000001000
+# MIPS-NEXT:  MIPS_DELTA_CLASSSYM_NO0x0000000000000001
+# MIPS-NEXT:  MIPS_CXX_FLAGS       0x0000000088887777
+# MIPS-NEXT:  MIPS_PIXIE_INIT      0x0000000000001000
+# MIPS-NEXT:  MIPS_LOCALPAGE_GOTIDX0x0000000000000001
+# MIPS-NEXT:  MIPS_LOCAL_GOTIDX    0x0000000000000001
+# MIPS-NEXT:  MIPS_HIDDEN_GOTIDX   0x0000000000000001
+# MIPS-NEXT:  MIPS_PROTECTED_GOTIDX0x0000000000000001
+# MIPS-NEXT:  MIPS_OPTIONS         0x0000000000001000
+# MIPS-NEXT:  MIPS_INTERFACE       0x0000000000001000
+# MIPS-NEXT:  MIPS_DYNSTR_ALIGN    0x0000000088888888
+# MIPS-NEXT:  MIPS_INTERFACE_SIZE  0x0000000000000010
+# MIPS-NEXT:  MIPS_RLD_TEXT_RESOLVE_ADDR0x0000000000000008
+# MIPS-NEXT:  MIPS_PERF_SUFFIX     0x0000000000000000
+# MIPS-NEXT:  MIPS_COMPACT_SIZE    0x0000000000000010
+# MIPS-NEXT:  MIPS_GP_VALUE        0x0000000000000001
+# MIPS-NEXT:  MIPS_AUX_DYNAMIC     0x0000000000001000
+# MIPS-NEXT:  MIPS_PLTGOT          0x0000000000001000
+# MIPS-NEXT:  MIPS_RWPLT           0x0000000000001000
+# MIPS-NEXT:  MIPS_RLD_MAP_REL     0x0000000000001000
 
 --- !ELF
 FileHeader:
diff --git a/llvm/test/tools/llvm-objdump/elf-dynamic-section.test b/llvm/test/tools/llvm-objdump/elf-dynamic-section.test
index b2154170941..a401c3881c9 100644
--- a/llvm/test/tools/llvm-objdump/elf-dynamic-section.test
+++ b/llvm/test/tools/llvm-objdump/elf-dynamic-section.test
@@ -1,64 +1,64 @@
 # RUN: yaml2obj %s > %t
 # RUN: llvm-objdump -p %t | FileCheck %s
 
-# CHECK:      Dynamic Section:
-# CHECK-NEXT:   NEEDED               D
-# CHECK-NEXT:   PLTRELSZ             0x0000000000000010
-# CHECK-NEXT:   PLTGOT               0x0000000000001000
-# CHECK-NEXT:   HASH                 0x0000000000001000
-# CHECK-NEXT:   STRTAB               0x0000000000001000
-# CHECK-NEXT:   SYMTAB               0x0000000000001000
-# CHECK-NEXT:   RELA                 0x0000000000001000
-# CHECK-NEXT:   RELASZ               0x0000000000000010
-# CHECK-NEXT:   RELAENT              0x0000000000000789
-# CHECK-NEXT:   STRSZ                0x0000000000000010
-# CHECK-NEXT:   SYMENT               0x0000000000000987
-# CHECK-NEXT:   INIT                 0x0000000000001000
-# CHECK-NEXT:   FINI                 0x0000000000001000
-# CHECK-NEXT:   SONAME               U
-# CHECK-NEXT:   RPATH                f
-# CHECK-NEXT:   SYMBOLIC             0x1234567890abcdef
-# CHECK-NEXT:   REL                  0x0000000000001000
-# CHECK-NEXT:   RELSZ                0x0000000000000010
-# CHECK-NEXT:   RELENT               0x0000000000000123
-# CHECK-NEXT:   PLTREL               0x0000000000000007
-# CHECK-NEXT:   DEBUG                0xfedcba0987654321
-# CHECK-NEXT:   TEXTREL              0x1122334455667788
-# CHECK-NEXT:   JMPREL               0x0000000000001000
-# CHECK-NEXT:   BIND_NOW             0x8877665544332211
-# CHECK-NEXT:   INIT_ARRAY           0x0000000000001000
-# CHECK-NEXT:   FINI_ARRAY           0x0000000000001000
-# CHECK-NEXT:   INIT_ARRAYSZ         0x0000000000000010
-# CHECK-NEXT:   FINI_ARRAYSZ         0x0000000000000010
-# CHECK-NEXT:   RUNPATH              w
-# CHECK-NEXT:   FLAGS                0xaabbccddeeff9900
-# CHECK-NEXT:   PREINIT_ARRAY        0x0000000000001000
-# CHECK-NEXT:   PREINIT_ARRAYSZ      0x0000000000000010
-# CHECK-NEXT:   SYMTAB_SHNDX         0x0000000000001000
-# CHECK-NEXT:   RELRSZ               0x0000000000000010
-# CHECK-NEXT:   RELR                 0x0000000000001000
-# CHECK-NEXT:   RELRENT              0x0000000000004321
-# CHECK-NEXT:   ANDROID_REL          0x0000000000001000
-# CHECK-NEXT:   ANDROID_RELSZ        0x0000000000000010
-# CHECK-NEXT:   ANDROID_RELA         0x0000000000001000
-# CHECK-NEXT:   ANDROID_RELASZ       0x0000000000000010
-# CHECK-NEXT:   ANDROID_RELR         0x0000000000001000
-# CHECK-NEXT:   ANDROID_RELRSZ       0x0000000000000010
-# CHECK-NEXT:   ANDROID_RELRENT      0x0000000000001234
-# CHECK-NEXT:   GNU_HASH             0x0000000000001000
-# CHECK-NEXT:   TLSDESC_PLT          0x0000000000001000
-# CHECK-NEXT:   TLSDESC_GOT          0x0000000000001000
-# CHECK-NEXT:   RELACOUNT            0x0000000000000000
-# CHECK-NEXT:   RELCOUNT             0x0000000000000000
-# CHECK-NEXT:   FLAGS_1              0x0000000087654321
-# CHECK-NEXT:   VERSYM               0x0000000000001000
-# CHECK-NEXT:   VERDEF               0x0000000000001000
-# CHECK-NEXT:   VERDEFNUM            0x0000000000000000
-# CHECK-NEXT:   VERNEED              0x0000000000001000
-# CHECK-NEXT:   VERNEEDNUM           0x0000000000000000
-# CHECK-NEXT:   AUXILIARY            D
-# CHECK-NEXT:   FILTER               U
-# CHECK-NEXT:   <unknown:>0x1234abcd 0x0000000000000001
+#      CHECK:Dynamic Section:
+# CHECK-NEXT:  NEEDED               D
+# CHECK-NEXT:  PLTRELSZ             0x0000000000000010
+# CHECK-NEXT:  PLTGOT               0x0000000000001000
+# CHECK-NEXT:  HASH                 0x0000000000001000
+# CHECK-NEXT:  STRTAB               0x0000000000001000
+# CHECK-NEXT:  SYMTAB               0x0000000000001000
+# CHECK-NEXT:  RELA                 0x0000000000001000
+# CHECK-NEXT:  RELASZ               0x0000000000000010
+# CHECK-NEXT:  RELAENT              0x0000000000000789
+# CHECK-NEXT:  STRSZ                0x0000000000000010
+# CHECK-NEXT:  SYMENT               0x0000000000000987
+# CHECK-NEXT:  INIT                 0x0000000000001000
+# CHECK-NEXT:  FINI                 0x0000000000001000
+# CHECK-NEXT:  SONAME               U
+# CHECK-NEXT:  RPATH                f
+# CHECK-NEXT:  SYMBOLIC             0x1234567890abcdef
+# CHECK-NEXT:  REL                  0x0000000000001000
+# CHECK-NEXT:  RELSZ                0x0000000000000010
+# CHECK-NEXT:  RELENT               0x0000000000000123
+# CHECK-NEXT:  PLTREL               0x0000000000000007
+# CHECK-NEXT:  DEBUG                0xfedcba0987654321
+# CHECK-NEXT:  TEXTREL              0x1122334455667788
+# CHECK-NEXT:  JMPREL               0x0000000000001000
+# CHECK-NEXT:  BIND_NOW             0x8877665544332211
+# CHECK-NEXT:  INIT_ARRAY           0x0000000000001000
+# CHECK-NEXT:  FINI_ARRAY           0x0000000000001000
+# CHECK-NEXT:  INIT_ARRAYSZ         0x0000000000000010
+# CHECK-NEXT:  FINI_ARRAYSZ         0x0000000000000010
+# CHECK-NEXT:  RUNPATH              w
+# CHECK-NEXT:  FLAGS                0xaabbccddeeff9900
+# CHECK-NEXT:  PREINIT_ARRAY        0x0000000000001000
+# CHECK-NEXT:  PREINIT_ARRAYSZ      0x0000000000000010
+# CHECK-NEXT:  SYMTAB_SHNDX         0x0000000000001000
+# CHECK-NEXT:  RELRSZ               0x0000000000000010
+# CHECK-NEXT:  RELR                 0x0000000000001000
+# CHECK-NEXT:  RELRENT              0x0000000000004321
+# CHECK-NEXT:  ANDROID_REL          0x0000000000001000
+# CHECK-NEXT:  ANDROID_RELSZ        0x0000000000000010
+# CHECK-NEXT:  ANDROID_RELA         0x0000000000001000
+# CHECK-NEXT:  ANDROID_RELASZ       0x0000000000000010
+# CHECK-NEXT:  ANDROID_RELR         0x0000000000001000
+# CHECK-NEXT:  ANDROID_RELRSZ       0x0000000000000010
+# CHECK-NEXT:  ANDROID_RELRENT      0x0000000000001234
+# CHECK-NEXT:  GNU_HASH             0x0000000000001000
+# CHECK-NEXT:  TLSDESC_PLT          0x0000000000001000
+# CHECK-NEXT:  TLSDESC_GOT          0x0000000000001000
+# CHECK-NEXT:  RELACOUNT            0x0000000000000000
+# CHECK-NEXT:  RELCOUNT             0x0000000000000000
+# CHECK-NEXT:  FLAGS_1              0x0000000087654321
+# CHECK-NEXT:  VERSYM               0x0000000000001000
+# CHECK-NEXT:  VERDEF               0x0000000000001000
+# CHECK-NEXT:  VERDEFNUM            0x0000000000000000
+# CHECK-NEXT:  VERNEED              0x0000000000001000
+# CHECK-NEXT:  VERNEEDNUM           0x0000000000000000
+# CHECK-NEXT:  AUXILIARY            D
+# CHECK-NEXT:  FILTER               U
+# CHECK-NEXT:  <unknown:>0x1234abcd 0x0000000000000001
 
 --- !ELF
 FileHeader: