diff options
| author | Jordan Rupprecht <rupprecht@google.com> | 2019-01-11 18:06:31 +0000 |
|---|---|---|
| committer | Jordan Rupprecht <rupprecht@google.com> | 2019-01-11 18:06:31 +0000 |
| commit | 7f4892c68909e420becab208432463abb8b009ef (patch) | |
| tree | 617bc26af70438c67131e9bd1b0e5daa8617a708 /llvm/test/tools | |
| parent | 19dd3165eb89fda3ea71d523e35c70ed5e721755 (diff) | |
[llvm-objcopy][NFC] Consistenly use two dashes for flags in tests.
Summary:
As pointed out in D53667, our use of hyphens in flags can be inconsistent, mixing `-` with `--`. This change makes all long style flags use `--`.
Automatically changed via:
```
find test/tools/llvm-objcopy/ELF -type f | xargs sed -i 's/ -\([a-zA-Z]\{3\}\)/ --\1/g'
```
Two false positives were manually fixed/reverted.
Reviewers: jhenderson, espindola, alexshap
Reviewed By: jhenderson
Subscribers: emaste, javed.absar, arichardson, fedor.sergeev, jakehehrlich, llvm-commits
Differential Revision: https://reviews.llvm.org/D56513
Diffstat (limited to 'llvm/test/tools')
101 files changed, 203 insertions, 199 deletions
diff --git a/llvm/test/tools/llvm-objcopy/ELF/abs-symbol.test b/llvm/test/tools/llvm-objcopy/ELF/abs-symbol.test index fb261ce341a..5f2536d1df9 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/abs-symbol.test +++ b/llvm/test/tools/llvm-objcopy/ELF/abs-symbol.test @@ -1,6 +1,6 @@ # RUN: yaml2obj %s > %t # RUN: llvm-objcopy %t %t2 -# RUN: llvm-readobj -symbols %t2 | FileCheck %s +# RUN: llvm-readobj --symbols %t2 | FileCheck %s !ELF FileHeader: diff --git a/llvm/test/tools/llvm-objcopy/ELF/add-gnu-debuglink.test b/llvm/test/tools/llvm-objcopy/ELF/add-gnu-debuglink.test index 16f4637ffa9..330571c3377 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/add-gnu-debuglink.test +++ b/llvm/test/tools/llvm-objcopy/ELF/add-gnu-debuglink.test @@ -1,7 +1,7 @@ # RUN: yaml2obj %s > %t # RUN: printf 0000 > %t.blob -# RUN: llvm-objcopy -add-gnu-debuglink=%t.blob %t %t2 -# RUN: llvm-readobj -sections -section-data %t2 | FileCheck %s +# RUN: llvm-objcopy --add-gnu-debuglink=%t.blob %t %t2 +# RUN: llvm-readobj --sections --section-data %t2 | FileCheck %s !ELF FileHeader: diff --git a/llvm/test/tools/llvm-objcopy/ELF/add-section-remove.test b/llvm/test/tools/llvm-objcopy/ELF/add-section-remove.test index 9e7abc76aa3..fe462dba1e8 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/add-section-remove.test +++ b/llvm/test/tools/llvm-objcopy/ELF/add-section-remove.test @@ -1,7 +1,7 @@ # RUN: yaml2obj %s > %t # RUN: echo 0000 > %t.sec -# RUN: llvm-objcopy -R .test2 -add-section=.test2=%t.sec %t %t2 -# RUN: llvm-readobj -file-headers -sections -section-data %t2 | FileCheck %s +# RUN: llvm-objcopy -R .test2 --add-section=.test2=%t.sec %t %t2 +# RUN: llvm-readobj --file-headers --sections --section-data %t2 | FileCheck %s !ELF FileHeader: diff --git a/llvm/test/tools/llvm-objcopy/ELF/add-section.test b/llvm/test/tools/llvm-objcopy/ELF/add-section.test index 369d1194efc..bf3ffdb090e 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/add-section.test +++ b/llvm/test/tools/llvm-objcopy/ELF/add-section.test @@ -1,8 +1,8 @@ # RUN: yaml2obj %s > %t # RUN: llvm-objcopy -O binary -j .test2 %t %t.sec # RUN: llvm-objcopy -R .test2 %t %t2 -# RUN: llvm-objcopy -add-section=.test2=%t.sec %t2 %t3 -# RUN: llvm-readobj -file-headers -sections -section-data %t3 | FileCheck %s +# RUN: llvm-objcopy --add-section=.test2=%t.sec %t2 %t3 +# RUN: llvm-readobj --file-headers --sections --section-data %t3 | FileCheck %s !ELF FileHeader: diff --git a/llvm/test/tools/llvm-objcopy/ELF/armexidx-link.test b/llvm/test/tools/llvm-objcopy/ELF/armexidx-link.test index ec942a1e6fc..596a7807ee7 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/armexidx-link.test +++ b/llvm/test/tools/llvm-objcopy/ELF/armexidx-link.test @@ -1,6 +1,6 @@ # RUN: yaml2obj %s > %t -# RUN: llvm-objcopy -remove-section=.text.bar %t %t2 -# RUN: llvm-readobj -sections %t2 | FileCheck %s +# RUN: llvm-objcopy --remove-section=.text.bar %t %t2 +# RUN: llvm-readobj --sections %t2 | FileCheck %s # CHECK: Index: 2 # CHECK-NEXT: Name: .ARM.exidx.text.foo (1) diff --git a/llvm/test/tools/llvm-objcopy/ELF/auto-remove-shndx.test b/llvm/test/tools/llvm-objcopy/ELF/auto-remove-shndx.test index 5452f34d96d..5a23493fa94 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/auto-remove-shndx.test +++ b/llvm/test/tools/llvm-objcopy/ELF/auto-remove-shndx.test @@ -1,5 +1,5 @@ # RUN: %python %p/Inputs/ungzip.py %p/Inputs/many-sections.o.gz > %t # RUN: llvm-objcopy -R .text -R s0 -R s1 -R s2 -R s3 -R s4 -R s5 -R s6 %t %t2 -# RUN: llvm-readobj -sections %t2 | FileCheck --check-prefix=SECS %s +# RUN: llvm-readobj --sections %t2 | FileCheck --check-prefix=SECS %s # SECS-NOT: Name: .symtab_shndx diff --git a/llvm/test/tools/llvm-objcopy/ELF/basic-archive-copy.test b/llvm/test/tools/llvm-objcopy/ELF/basic-archive-copy.test index bc050c3c70d..cf973d6cd3f 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/basic-archive-copy.test +++ b/llvm/test/tools/llvm-objcopy/ELF/basic-archive-copy.test @@ -8,9 +8,9 @@ # RUN: llvm-ar p %t2.a > %t3 # RUN: cmp %t2 %t3 -# RUN: llvm-readobj -sections %t2 | FileCheck %s -# RUN: llvm-nm -print-armap %t.a | FileCheck --check-prefix=INDEX-TABLE %s -# RUN: llvm-nm -print-armap %t2.a | FileCheck --check-prefix=INDEX-TABLE %s +# RUN: llvm-readobj --sections %t2 | FileCheck %s +# RUN: llvm-nm --print-armap %t.a | FileCheck --check-prefix=INDEX-TABLE %s +# RUN: llvm-nm --print-armap %t2.a | FileCheck --check-prefix=INDEX-TABLE %s # Verify that llvm-objcopy has not modifed the input. # RUN: cmp %t.copy.a %t.a @@ -22,8 +22,8 @@ # RUN: llvm-objcopy %t.no.index.a %t2.no.index.a # RUN: llvm-ar p %t2.no.index.a > %t4 -# RUN: llvm-nm -print-armap %t.no.index.a | FileCheck --check-prefix=NO-INDEX-TABLE %s -# RUN: llvm-nm -print-armap %t2.no.index.a | FileCheck --check-prefix=NO-INDEX-TABLE %s +# RUN: llvm-nm --print-armap %t.no.index.a | FileCheck --check-prefix=NO-INDEX-TABLE %s +# RUN: llvm-nm --print-armap %t2.no.index.a | FileCheck --check-prefix=NO-INDEX-TABLE %s # RUN: cmp %t2 %t4 # NO-INDEX-TABLE-NOT: Archive map diff --git a/llvm/test/tools/llvm-objcopy/ELF/basic-copy.test b/llvm/test/tools/llvm-objcopy/ELF/basic-copy.test index 266d48b495e..b6b0bcc612b 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/basic-copy.test +++ b/llvm/test/tools/llvm-objcopy/ELF/basic-copy.test @@ -1,6 +1,6 @@ # RUN: yaml2obj %s > %t # RUN: llvm-objcopy %t %t2 -# RUN: llvm-readobj -sections %t2 | FileCheck %s +# RUN: llvm-readobj --sections %t2 | FileCheck %s !ELF FileHeader: diff --git a/llvm/test/tools/llvm-objcopy/ELF/basic-keep.test b/llvm/test/tools/llvm-objcopy/ELF/basic-keep.test index 79d7717d9c0..8488a2679b3 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/basic-keep.test +++ b/llvm/test/tools/llvm-objcopy/ELF/basic-keep.test @@ -1,7 +1,7 @@ # RUN: yaml2obj %s > %t -# RUN: llvm-objcopy -strip-non-alloc -keep-section=.test %t %t2 -# RUN: llvm-strip --strip-all -keep-section=.test %t -o %t3 -# RUN: llvm-readobj -file-headers -sections %t2 | FileCheck %s +# RUN: llvm-objcopy --strip-non-alloc --keep-section=.test %t %t2 +# RUN: llvm-strip --strip-all --keep-section=.test %t -o %t3 +# RUN: llvm-readobj --file-headers --sections %t2 | FileCheck %s # RUN: cmp %t2 %t3 !ELF diff --git a/llvm/test/tools/llvm-objcopy/ELF/basic-only-section.test b/llvm/test/tools/llvm-objcopy/ELF/basic-only-section.test index 536a0fc4cca..e47a97ac6d7 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/basic-only-section.test +++ b/llvm/test/tools/llvm-objcopy/ELF/basic-only-section.test @@ -1,7 +1,7 @@ # RUN: yaml2obj %s > %t -# RUN: llvm-objcopy -only-section=.test %t %t2 +# RUN: llvm-objcopy --only-section=.test %t %t2 # RUN: llvm-objcopy -j .test %t %t3 -# RUN: llvm-readobj -file-headers -sections %t2 | FileCheck %s +# RUN: llvm-readobj --file-headers --sections %t2 | FileCheck %s # RUN: diff %t2 %t3 !ELF diff --git a/llvm/test/tools/llvm-objcopy/ELF/basic-relocations.test b/llvm/test/tools/llvm-objcopy/ELF/basic-relocations.test index e9afc05044e..e043041ba5d 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/basic-relocations.test +++ b/llvm/test/tools/llvm-objcopy/ELF/basic-relocations.test @@ -1,6 +1,6 @@ # RUN: yaml2obj %s > %t # RUN: llvm-objcopy %t %t2 -# RUN: llvm-readobj -relocations %t2 | FileCheck %s +# RUN: llvm-readobj --relocations %t2 | FileCheck %s !ELF FileHeader: diff --git a/llvm/test/tools/llvm-objcopy/ELF/binary-input-arch.test b/llvm/test/tools/llvm-objcopy/ELF/binary-input-arch.test index 08f02da882b..4c04b6ee329 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/binary-input-arch.test +++ b/llvm/test/tools/llvm-objcopy/ELF/binary-input-arch.test @@ -1,25 +1,25 @@ # RUN: echo abcd > %t.txt # RUN: llvm-objcopy -I binary -B aarch64 %t.txt %t.aarch64.o -# RUN: llvm-readobj -file-headers %t.aarch64.o | FileCheck %s --check-prefixes=CHECK,AARCH64,64 +# RUN: llvm-readobj --file-headers %t.aarch64.o | FileCheck %s --check-prefixes=CHECK,AARCH64,64 # RUN: llvm-objcopy -I binary -B arm %t.txt %t.arm.o -# RUN: llvm-readobj -file-headers %t.arm.o | FileCheck %s --check-prefixes=CHECK,ARM,32 +# RUN: llvm-readobj --file-headers %t.arm.o | FileCheck %s --check-prefixes=CHECK,ARM,32 # RUN: llvm-objcopy -I binary -B i386 %t.txt %t.i386.o -# RUN: llvm-readobj -file-headers %t.i386.o | FileCheck %s --check-prefixes=CHECK,I386,32 +# RUN: llvm-readobj --file-headers %t.i386.o | FileCheck %s --check-prefixes=CHECK,I386,32 # RUN: llvm-objcopy -I binary -B i386:x86-64 %t.txt %t.i386_x86-64.o -# RUN: llvm-readobj -file-headers %t.i386_x86-64.o | FileCheck %s --check-prefixes=CHECK,X86-64,64 +# RUN: llvm-readobj --file-headers %t.i386_x86-64.o | FileCheck %s --check-prefixes=CHECK,X86-64,64 # RUN: llvm-objcopy -I binary -B powerpc:common64 %t.txt %t.powerpc_common64.o -# RUN: llvm-readobj -file-headers %t.powerpc_common64.o | FileCheck %s --check-prefixes=CHECK,PPC,64 +# RUN: llvm-readobj --file-headers %t.powerpc_common64.o | FileCheck %s --check-prefixes=CHECK,PPC,64 # RUN: llvm-objcopy -I binary -B sparc %t.txt %t.sparc.o -# RUN: llvm-readobj -file-headers %t.sparc.o | FileCheck %s --check-prefixes=CHECK,SPARC,32 +# RUN: llvm-readobj --file-headers %t.sparc.o | FileCheck %s --check-prefixes=CHECK,SPARC,32 # RUN: llvm-objcopy -I binary -B x86-64 %t.txt %t.x86-64.o -# RUN: llvm-readobj -file-headers %t.x86-64.o | FileCheck %s --check-prefixes=CHECK,X86-64,64 +# RUN: llvm-readobj --file-headers %t.x86-64.o | FileCheck %s --check-prefixes=CHECK,X86-64,64 # CHECK: Format: # AARCH64-SAME: ELF64-aarch64-little diff --git a/llvm/test/tools/llvm-objcopy/ELF/binary-input.test b/llvm/test/tools/llvm-objcopy/ELF/binary-input.test index 3e9b1bad112..d7a708dcea5 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/binary-input.test +++ b/llvm/test/tools/llvm-objcopy/ELF/binary-input.test @@ -2,7 +2,7 @@ # Preserve input to verify it is not modified # RUN: cp %t.x-txt %t-copy.txt # RUN: llvm-objcopy -I binary -B i386:x86-64 %t.x-txt %t.o -# RUN: llvm-readobj -sections -symbols %t.o | FileCheck %s +# RUN: llvm-readobj --sections --symbols %t.o | FileCheck %s # RUN: cmp %t.x-txt %t-copy.txt # CHECK: Sections [ diff --git a/llvm/test/tools/llvm-objcopy/ELF/binary-remove-all-but-one.test b/llvm/test/tools/llvm-objcopy/ELF/binary-remove-all-but-one.test index e1ef7d6b0a4..857b76d9a2f 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/binary-remove-all-but-one.test +++ b/llvm/test/tools/llvm-objcopy/ELF/binary-remove-all-but-one.test @@ -1,7 +1,7 @@ # RUN: yaml2obj %s -o %t # RUN: llvm-objcopy -R .text -R .text3 -O binary %t %t2 # RUN: od -Ax -t x1 %t2 | FileCheck %s -# RUN: wc -c %t2 | FileCheck %s -check-prefix=SIZE +# RUN: wc -c %t2 | FileCheck %s --check-prefix=SIZE !ELF FileHeader: diff --git a/llvm/test/tools/llvm-objcopy/ELF/binary-remove-end.test b/llvm/test/tools/llvm-objcopy/ELF/binary-remove-end.test index 1c2994bf852..eddeaf167ec 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/binary-remove-end.test +++ b/llvm/test/tools/llvm-objcopy/ELF/binary-remove-end.test @@ -1,7 +1,7 @@ # RUN: yaml2obj %s -o %t # RUN: llvm-objcopy -R .text3 -O binary %t %t2 # RUN: od -Ax -v -t x1 %t2 | FileCheck %s -# RUN: wc -c %t2 | FileCheck %s -check-prefix=SIZE +# RUN: wc -c %t2 | FileCheck %s --check-prefix=SIZE !ELF FileHeader: diff --git a/llvm/test/tools/llvm-objcopy/ELF/binary-remove-middle.test b/llvm/test/tools/llvm-objcopy/ELF/binary-remove-middle.test index 6d69907a4a7..fbc2f6a9ee3 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/binary-remove-middle.test +++ b/llvm/test/tools/llvm-objcopy/ELF/binary-remove-middle.test @@ -1,7 +1,7 @@ # RUN: yaml2obj %s -o %t # RUN: llvm-objcopy -R .text2 -O binary %t %t2 # RUN: od -Ax -v -t x1 %t2 | FileCheck %s -# RUN: wc -c %t2 | FileCheck %s -check-prefix=SIZE +# RUN: wc -c %t2 | FileCheck %s --check-prefix=SIZE !ELF FileHeader: diff --git a/llvm/test/tools/llvm-objcopy/ELF/check-addr-offset-align.test b/llvm/test/tools/llvm-objcopy/ELF/check-addr-offset-align.test index ca2367ba434..bc219fff783 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/check-addr-offset-align.test +++ b/llvm/test/tools/llvm-objcopy/ELF/check-addr-offset-align.test @@ -1,6 +1,6 @@ # RUN: yaml2obj %s -o %t # RUN: llvm-objcopy %t %t2 -# RUN: llvm-readobj -program-headers %t2 | FileCheck %s +# RUN: llvm-readobj --program-headers %t2 | FileCheck %s !ELF FileHeader: diff --git a/llvm/test/tools/llvm-objcopy/ELF/common-symbol.test b/llvm/test/tools/llvm-objcopy/ELF/common-symbol.test index b659356eab0..9ec49c71165 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/common-symbol.test +++ b/llvm/test/tools/llvm-objcopy/ELF/common-symbol.test @@ -1,6 +1,6 @@ # RUN: yaml2obj %s > %t # RUN: llvm-objcopy %t %t2 -# RUN: llvm-readobj -symbols %t2 | FileCheck %s +# RUN: llvm-readobj --symbols %t2 | FileCheck %s !ELF FileHeader: diff --git a/llvm/test/tools/llvm-objcopy/ELF/compress-debug-sections-zlib-gnu.test b/llvm/test/tools/llvm-objcopy/ELF/compress-debug-sections-zlib-gnu.test index 7199b2e5e11..0a360d0da15 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/compress-debug-sections-zlib-gnu.test +++ b/llvm/test/tools/llvm-objcopy/ELF/compress-debug-sections-zlib-gnu.test @@ -4,12 +4,12 @@ # RUN: llvm-objcopy --compress-debug-sections=zlib-gnu %t.o %t-compressed.o # RUN: llvm-objcopy --decompress-debug-sections %t-compressed.o %t-decompressed.o -# RUN: llvm-objdump -s %t.o -section=.debug_foo | FileCheck %s +# RUN: llvm-objdump -s %t.o --section=.debug_foo | FileCheck %s # RUN: llvm-objdump -s %t-compressed.o | FileCheck %s --check-prefix=CHECK-COMPRESSED -# RUN: llvm-readobj -relocations -s %t-compressed.o | FileCheck %s --check-prefix=CHECK-FLAGS -# RUN: llvm-readobj -relocations -s %t-decompressed.o | FileCheck %s --check-prefix=CHECK-HEADER -# RUN: llvm-readobj -relocations -s %t.o | FileCheck %s --check-prefix=CHECK-HEADER -# RUN: llvm-objdump -s %t-decompressed.o -section=.debug_foo | FileCheck %s +# RUN: llvm-readobj --relocations -s %t-compressed.o | FileCheck %s --check-prefix=CHECK-FLAGS +# RUN: llvm-readobj --relocations -s %t-decompressed.o | FileCheck %s --check-prefix=CHECK-HEADER +# RUN: llvm-readobj --relocations -s %t.o | FileCheck %s --check-prefix=CHECK-HEADER +# RUN: llvm-objdump -s %t-decompressed.o --section=.debug_foo | FileCheck %s # CHECK: .debug_foo: # CHECK-NEXT: 0000 00000000 00000000 diff --git a/llvm/test/tools/llvm-objcopy/ELF/compress-debug-sections-zlib.test b/llvm/test/tools/llvm-objcopy/ELF/compress-debug-sections-zlib.test index d2ca6ef249b..1e7dfc9728c 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/compress-debug-sections-zlib.test +++ b/llvm/test/tools/llvm-objcopy/ELF/compress-debug-sections-zlib.test @@ -4,12 +4,12 @@ # RUN: llvm-objcopy --compress-debug-sections=zlib %t.o %t-compressed.o # RUN: llvm-objcopy --decompress-debug-sections %t-compressed.o %t-decompressed.o -# RUN: llvm-objdump -s %t.o -section=.debug_foo | FileCheck %s +# RUN: llvm-objdump -s %t.o --section=.debug_foo | FileCheck %s # RUN: llvm-objdump -s %t-compressed.o | FileCheck %s --check-prefix=CHECK-COMPRESSED -# RUN: llvm-readobj -relocations -s %t-compressed.o | FileCheck %s --check-prefix=CHECK-FLAGS -# RUN: llvm-readobj -relocations -s %t-decompressed.o | FileCheck %s --check-prefix=CHECK-HEADER -# RUN: llvm-readobj -relocations -s %t.o | FileCheck %s --check-prefix=CHECK-HEADER -# RUN: llvm-objdump -s %t-decompressed.o -section=.debug_foo | FileCheck %s +# RUN: llvm-readobj --relocations -s %t-compressed.o | FileCheck %s --check-prefix=CHECK-FLAGS +# RUN: llvm-readobj --relocations -s %t-decompressed.o | FileCheck %s --check-prefix=CHECK-HEADER +# RUN: llvm-readobj --relocations -s %t.o | FileCheck %s --check-prefix=CHECK-HEADER +# RUN: llvm-objdump -s %t-decompressed.o --section=.debug_foo | FileCheck %s # CHECK: .debug_foo: # CHECK-NEXT: 0000 00000000 00000000 diff --git a/llvm/test/tools/llvm-objcopy/ELF/compress-debug-sections.test b/llvm/test/tools/llvm-objcopy/ELF/compress-debug-sections.test index 6fadad3f383..014303fe638 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/compress-debug-sections.test +++ b/llvm/test/tools/llvm-objcopy/ELF/compress-debug-sections.test @@ -12,9 +12,9 @@ # RUN: llvm-objcopy --decompress-debug-sections %tzg.o %t3.o # Using redirects to avoid llvm-objdump from printing the filename. -# RUN: llvm-objdump -s -section=.debug_str - < %t.o > %t.txt -# RUN: llvm-objdump -s -section=.debug_str - < %t2.o > %t2.txt -# RUN: llvm-objdump -s -section=.debug_str - < %t3.o > %t3.txt +# RUN: llvm-objdump -s --section=.debug_str - < %t.o > %t.txt +# RUN: llvm-objdump -s --section=.debug_str - < %t2.o > %t2.txt +# RUN: llvm-objdump -s --section=.debug_str - < %t3.o > %t3.txt # RUN: diff %t.txt %t2.txt # RUN: diff %t.txt %t3.txt diff --git a/llvm/test/tools/llvm-objcopy/ELF/copy-osabi.test b/llvm/test/tools/llvm-objcopy/ELF/copy-osabi.test index 67dcfaa5faf..75a22bc9bdf 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/copy-osabi.test +++ b/llvm/test/tools/llvm-objcopy/ELF/copy-osabi.test @@ -1,6 +1,6 @@ # RUN: yaml2obj %s > %t # RUN: llvm-objcopy %t %t2 -# RUN: llvm-readobj -file-headers %t2 | FileCheck %s +# RUN: llvm-readobj --file-headers %t2 | FileCheck %s ## Check that llvm-objcopy preserves the OSABI and ABIVersion fields. # CHECK: OS/ABI: FreeBSD (0x9) diff --git a/llvm/test/tools/llvm-objcopy/ELF/discard-all.test b/llvm/test/tools/llvm-objcopy/ELF/discard-all.test index db068697262..cc676b59f59 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/discard-all.test +++ b/llvm/test/tools/llvm-objcopy/ELF/discard-all.test @@ -3,7 +3,7 @@ # RUN: llvm-objcopy --discard-all %t %t2 # Verify that llvm-objcopy has not modified the input. # RUN: cmp %t %t1 -# RUN: llvm-readobj -symbols %t2 | FileCheck %s +# RUN: llvm-readobj --symbols %t2 | FileCheck %s # RUN: llvm-objcopy -x %t %t3 # Verify that llvm-objcopy has not modified the input. diff --git a/llvm/test/tools/llvm-objcopy/ELF/drawf-fission.test b/llvm/test/tools/llvm-objcopy/ELF/drawf-fission.test index 112bffbc891..76f74ce7e80 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/drawf-fission.test +++ b/llvm/test/tools/llvm-objcopy/ELF/drawf-fission.test @@ -1,8 +1,8 @@ -# RUN: llvm-objcopy -extract-dwo %p/Inputs/dwarf.dwo %t -# RUN: llvm-objcopy -strip-dwo %p/Inputs/dwarf.dwo %t2 -# RUN: llvm-objcopy -split-dwo=%t3 %p/Inputs/dwarf.dwo %t4 -# RUN: llvm-readobj -file-headers -sections %t | FileCheck %s -check-prefix=DWARF -# RUN: llvm-readobj -file-headers -sections %t2 | FileCheck %s -check-prefix=STRIP +# RUN: llvm-objcopy --extract-dwo %p/Inputs/dwarf.dwo %t +# RUN: llvm-objcopy --strip-dwo %p/Inputs/dwarf.dwo %t2 +# RUN: llvm-objcopy --split-dwo=%t3 %p/Inputs/dwarf.dwo %t4 +# RUN: llvm-readobj --file-headers --sections %t | FileCheck %s --check-prefix=DWARF +# RUN: llvm-readobj --file-headers --sections %t2 | FileCheck %s --check-prefix=STRIP # RUN: diff %t %t3 # RUN: diff %t2 %t4 diff --git a/llvm/test/tools/llvm-objcopy/ELF/dump-section.test b/llvm/test/tools/llvm-objcopy/ELF/dump-section.test index 8e66f65e04a..7a25f9cf926 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/dump-section.test +++ b/llvm/test/tools/llvm-objcopy/ELF/dump-section.test @@ -1,6 +1,6 @@ # RUN: yaml2obj %s > %t # RUN: llvm-objcopy -O binary -j .text %t %t2 -# RUN: llvm-objcopy -O binary -only-section .text %t %t3 +# RUN: llvm-objcopy -O binary --only-section .text %t %t3 # RUN: llvm-objcopy --dump-section .text=%t4 %t %t5 # RUN: llvm-objcopy --dump-section .foo=%t6 %t %t7 # RUN: not llvm-objcopy --dump-section .bar=%t8 %t %t9 2>&1 | FileCheck %s --check-prefix=NOBITS diff --git a/llvm/test/tools/llvm-objcopy/ELF/dynamic-relocations.test b/llvm/test/tools/llvm-objcopy/ELF/dynamic-relocations.test index e544e2dd8ef..1c0fabc7806 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/dynamic-relocations.test +++ b/llvm/test/tools/llvm-objcopy/ELF/dynamic-relocations.test @@ -1,5 +1,5 @@ # RUN: llvm-objcopy %p/Inputs/dynrel.elf %t -# RUN: llvm-readobj -sections -section-data %t | FileCheck %s +# RUN: llvm-readobj --sections --section-data %t | FileCheck %s #CHECK: Name: .rela.plt #CHECK-NEXT: Type: SHT_RELA diff --git a/llvm/test/tools/llvm-objcopy/ELF/dynamic.test b/llvm/test/tools/llvm-objcopy/ELF/dynamic.test index 3e9ea2069f9..5eb8809b41e 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/dynamic.test +++ b/llvm/test/tools/llvm-objcopy/ELF/dynamic.test @@ -1,6 +1,6 @@ # RUN: llvm-objcopy %p/Inputs/dynamic.so %t -# RUN: llvm-readobj -dynamic-table %t | FileCheck %s -# RUN: llvm-readobj -sections %t | FileCheck -check-prefix=LINK %s +# RUN: llvm-readobj --dynamic-table %t | FileCheck %s +# RUN: llvm-readobj --sections %t | FileCheck --check-prefix=LINK %s #CHECK: DynamicSection [ #CHECK-NEXT: Tag Type Name/Value diff --git a/llvm/test/tools/llvm-objcopy/ELF/dynstr.test b/llvm/test/tools/llvm-objcopy/ELF/dynstr.test index 6e193065a77..68ec586649e 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/dynstr.test +++ b/llvm/test/tools/llvm-objcopy/ELF/dynstr.test @@ -1,6 +1,6 @@ # RUN: yaml2obj %s > %t # RUN: llvm-objcopy %t %t2 -# RUN: llvm-readobj -sections -section-data %t2 | FileCheck %s +# RUN: llvm-readobj --sections --section-data %t2 | FileCheck %s !ELF FileHeader: diff --git a/llvm/test/tools/llvm-objcopy/ELF/dynsym.test b/llvm/test/tools/llvm-objcopy/ELF/dynsym.test index 2e05a4aa22f..6a7eef38cd9 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/dynsym.test +++ b/llvm/test/tools/llvm-objcopy/ELF/dynsym.test @@ -1,6 +1,6 @@ # RUN: llvm-objcopy %p/Inputs/dynsym.so %t -# RUN: llvm-readobj -dyn-symbols %t | FileCheck %s -# RUN: llvm-readobj -sections %t | FileCheck -check-prefix=LINK %s +# RUN: llvm-readobj --dyn-symbols %t | FileCheck %s +# RUN: llvm-readobj --sections %t | FileCheck --check-prefix=LINK %s #LINK: Name: .dynsym #LINK-NEXT: Type: SHT_DYNSYM diff --git a/llvm/test/tools/llvm-objcopy/ELF/elf32be.test b/llvm/test/tools/llvm-objcopy/ELF/elf32be.test index 786c862807e..374b7994ae3 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/elf32be.test +++ b/llvm/test/tools/llvm-objcopy/ELF/elf32be.test @@ -1,6 +1,6 @@ # RUN: yaml2obj %s > %t # RUN: llvm-objcopy %t %t2 -# RUN: llvm-readobj -file-headers -sections %t2 | FileCheck %s +# RUN: llvm-readobj --file-headers --sections %t2 | FileCheck %s !ELF FileHeader: diff --git a/llvm/test/tools/llvm-objcopy/ELF/elf32le.test b/llvm/test/tools/llvm-objcopy/ELF/elf32le.test index ed7d5ff5dbb..b2cb40ce141 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/elf32le.test +++ b/llvm/test/tools/llvm-objcopy/ELF/elf32le.test @@ -1,6 +1,6 @@ # RUN: yaml2obj %s > %t # RUN: llvm-objcopy %t %t2 -# RUN: llvm-readobj -file-headers -sections %t2 | FileCheck %s +# RUN: llvm-readobj --file-headers --sections %t2 | FileCheck %s !ELF FileHeader: diff --git a/llvm/test/tools/llvm-objcopy/ELF/elf64be.test b/llvm/test/tools/llvm-objcopy/ELF/elf64be.test index 49e707ec59d..97977b0c195 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/elf64be.test +++ b/llvm/test/tools/llvm-objcopy/ELF/elf64be.test @@ -1,6 +1,6 @@ # RUN: yaml2obj %s > %t # RUN: llvm-objcopy %t %t2 -# RUN: llvm-readobj -file-headers -sections %t2 | FileCheck %s +# RUN: llvm-readobj --file-headers --sections %t2 | FileCheck %s !ELF FileHeader: diff --git a/llvm/test/tools/llvm-objcopy/ELF/empty-section.test b/llvm/test/tools/llvm-objcopy/ELF/empty-section.test index 8847327a069..5c55383ac09 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/empty-section.test +++ b/llvm/test/tools/llvm-objcopy/ELF/empty-section.test @@ -1,6 +1,6 @@ # RUN: yaml2obj %s > %t # RUN: llvm-objcopy %t %t2 -# RUN: llvm-readobj -sections %t2 | FileCheck %s +# RUN: llvm-readobj --sections %t2 | FileCheck %s !ELF FileHeader: diff --git a/llvm/test/tools/llvm-objcopy/ELF/explicit-keep-remove.test b/llvm/test/tools/llvm-objcopy/ELF/explicit-keep-remove.test index fea708edfd4..98ad3ae7592 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/explicit-keep-remove.test +++ b/llvm/test/tools/llvm-objcopy/ELF/explicit-keep-remove.test @@ -1,6 +1,6 @@ # RUN: yaml2obj %s > %t -# RUN: llvm-objcopy -R=.test -keep-section=.test %t %t2 -# RUN: llvm-readobj -file-headers -sections %t2 | FileCheck %s +# RUN: llvm-objcopy -R=.test --keep-section=.test %t %t2 +# RUN: llvm-readobj --file-headers --sections %t2 | FileCheck %s !ELF FileHeader: diff --git a/llvm/test/tools/llvm-objcopy/ELF/explicit-only-section-remove.test b/llvm/test/tools/llvm-objcopy/ELF/explicit-only-section-remove.test index 15a315906ab..8a152e57a5d 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/explicit-only-section-remove.test +++ b/llvm/test/tools/llvm-objcopy/ELF/explicit-only-section-remove.test @@ -1,6 +1,6 @@ # RUN: yaml2obj %s > %t -# RUN: llvm-objcopy -R=.test -only-section=.test %t %t2 -# RUN: llvm-readobj -file-headers -sections %t2 | FileCheck %s +# RUN: llvm-objcopy -R=.test --only-section=.test %t %t2 +# RUN: llvm-readobj --file-headers --sections %t2 | FileCheck %s !ELF FileHeader: diff --git a/llvm/test/tools/llvm-objcopy/ELF/globalize.test b/llvm/test/tools/llvm-objcopy/ELF/globalize.test index 4941cf12e92..c05a0a6bf77 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/globalize.test +++ b/llvm/test/tools/llvm-objcopy/ELF/globalize.test @@ -3,7 +3,7 @@ # RUN: --globalize-symbol Local \ # RUN: --globalize-symbol Weak \ # RUN: --globalize-symbol WeakUndef %t %t2 -# RUN: llvm-readobj -symbols %t2 | FileCheck %s +# RUN: llvm-readobj --symbols %t2 | FileCheck %s !ELF FileHeader: diff --git a/llvm/test/tools/llvm-objcopy/ELF/group-big-endian.test b/llvm/test/tools/llvm-objcopy/ELF/group-big-endian.test index d5a02607113..dd5ca88144b 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/group-big-endian.test +++ b/llvm/test/tools/llvm-objcopy/ELF/group-big-endian.test @@ -1,6 +1,6 @@ # RUN: yaml2obj %s > %t -# RUN: llvm-objcopy -remove-section=.text.bar %t %t2 -# RUN: llvm-readobj -elf-section-groups %t2 | FileCheck %s +# RUN: llvm-objcopy --remove-section=.text.bar %t %t2 +# RUN: llvm-readobj --elf-section-groups %t2 | FileCheck %s # In this test the section .text.bar is getting removed, as a result, # the indices of the sections which go after .text.bar will change, diff --git a/llvm/test/tools/llvm-objcopy/ELF/group-unchanged.test b/llvm/test/tools/llvm-objcopy/ELF/group-unchanged.test index 9e86172bad5..31fba11adca 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/group-unchanged.test +++ b/llvm/test/tools/llvm-objcopy/ELF/group-unchanged.test @@ -1,6 +1,6 @@ # RUN: yaml2obj %s > %t -# RUN: llvm-objcopy -remove-section=.text.bar %t %t2 -# RUN: llvm-readobj -elf-section-groups %t2 | FileCheck %s +# RUN: llvm-objcopy --remove-section=.text.bar %t %t2 +# RUN: llvm-readobj --elf-section-groups %t2 | FileCheck %s # In this test the section .text.bar is getting removed, since this section # goes after all the sections comprising a group, the content of the diff --git a/llvm/test/tools/llvm-objcopy/ELF/group.test b/llvm/test/tools/llvm-objcopy/ELF/group.test index 4023f1228f0..2e058f5d6a5 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/group.test +++ b/llvm/test/tools/llvm-objcopy/ELF/group.test @@ -1,6 +1,6 @@ # RUN: yaml2obj %s > %t -# RUN: llvm-objcopy -remove-section=.text.bar %t %t2 -# RUN: llvm-readobj -elf-section-groups %t2 | FileCheck %s +# RUN: llvm-objcopy --remove-section=.text.bar %t %t2 +# RUN: llvm-readobj --elf-section-groups %t2 | FileCheck %s # In this test the section .text.bar is getting removed, as a result, # the indices of the sections which go after .text.bar will change, diff --git a/llvm/test/tools/llvm-objcopy/ELF/help-message.test b/llvm/test/tools/llvm-objcopy/ELF/help-message.test index 504ce215c53..2dc92f67310 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/help-message.test +++ b/llvm/test/tools/llvm-objcopy/ELF/help-message.test @@ -1,15 +1,19 @@ +# RUN: llvm-objcopy -help | FileCheck --check-prefix=OBJCOPY-USAGE %s # RUN: llvm-objcopy --help | FileCheck --check-prefix=OBJCOPY-USAGE %s # RUN: not llvm-objcopy 2>&1 | FileCheck --check-prefix=OBJCOPY-USAGE %s # RUN: not llvm-objcopy -abcabc 2>&1 | FileCheck --check-prefix=UNKNOWN-ARG %s -# RUN: not llvm-objcopy -strip-debug 2>&1 | FileCheck %s --check-prefix=NO-INPUT-FILES +# RUN: not llvm-objcopy --abcabc 2>&1 | FileCheck --check-prefix=UNKNOWN-ARG %s +# RUN: not llvm-objcopy --strip-debug 2>&1 | FileCheck %s --check-prefix=NO-INPUT-FILES +# RUN: llvm-strip -help | FileCheck --check-prefix=STRIP-USAGE %s # RUN: llvm-strip --help | FileCheck --check-prefix=STRIP-USAGE %s # RUN: not llvm-strip 2>&1 | FileCheck --check-prefix=STRIP-USAGE %s # RUN: not llvm-strip -abcabc 2>&1 | FileCheck --check-prefix=UNKNOWN-ARG %s -# RUN: not llvm-strip -strip-debug 2>&1 | FileCheck %s --check-prefix=NO-INPUT-FILES +# RUN: not llvm-strip --abcabc 2>&1 | FileCheck --check-prefix=UNKNOWN-ARG %s +# RUN: not llvm-strip --strip-debug 2>&1 | FileCheck %s --check-prefix=NO-INPUT-FILES # OBJCOPY-USAGE: USAGE: llvm-objcopy # STRIP-USAGE: USAGE: llvm-strip -# UNKNOWN-ARG: unknown argument '-abcabc' +# UNKNOWN-ARG: unknown argument '{{-+}}abcabc' # NO-INPUT-FILES: No input file specified diff --git a/llvm/test/tools/llvm-objcopy/ELF/keep-file-symbols.test b/llvm/test/tools/llvm-objcopy/ELF/keep-file-symbols.test index 85546887ae5..3d7299d9138 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/keep-file-symbols.test +++ b/llvm/test/tools/llvm-objcopy/ELF/keep-file-symbols.test @@ -1,8 +1,8 @@ # RUN: yaml2obj %s > %t # RUN: llvm-objcopy --strip-all --keep-file-symbols %t %t2 -# RUN: llvm-readobj -symbols %t2 | FileCheck %s --check-prefix=STRIPALL +# RUN: llvm-readobj --symbols %t2 | FileCheck %s --check-prefix=STRIPALL # RUN: llvm-objcopy --keep-file-symbols --strip-symbol foo %t %t2 -# RUN: llvm-readobj -symbols %t2 | FileCheck %s --check-prefix=STRIP +# RUN: llvm-readobj --symbols %t2 | FileCheck %s --check-prefix=STRIP !ELF FileHeader: diff --git a/llvm/test/tools/llvm-objcopy/ELF/keep-global-symbols-mix-globalize.test b/llvm/test/tools/llvm-objcopy/ELF/keep-global-symbols-mix-globalize.test index 2de5807173c..bc5cba6f921 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/keep-global-symbols-mix-globalize.test +++ b/llvm/test/tools/llvm-objcopy/ELF/keep-global-symbols-mix-globalize.test @@ -11,7 +11,7 @@ # RUN: --globalize-symbol Global1 \ # RUN: --keep-global-symbol Global2 \ # RUN: %t.o %t.2.o -# RUN: llvm-readobj -elf-output-style=GNU -symbols %t.2.o | FileCheck %s +# RUN: llvm-readobj --elf-output-style=GNU --symbols %t.2.o | FileCheck %s !ELF FileHeader: diff --git a/llvm/test/tools/llvm-objcopy/ELF/keep-global-symbols.test b/llvm/test/tools/llvm-objcopy/ELF/keep-global-symbols.test index 8ce1d7f3a2a..6714740af87 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/keep-global-symbols.test +++ b/llvm/test/tools/llvm-objcopy/ELF/keep-global-symbols.test @@ -39,7 +39,7 @@ # RUN: -G Weak1 \ # RUN: --globalize-symbol Weak2 \ # RUN: %t.o %t.2.o -# RUN: llvm-readobj -elf-output-style=GNU -symbols %t.2.o | FileCheck %s +# RUN: llvm-readobj --elf-output-style=GNU --symbols %t.2.o | FileCheck %s !ELF FileHeader: diff --git a/llvm/test/tools/llvm-objcopy/ELF/keep-many.test b/llvm/test/tools/llvm-objcopy/ELF/keep-many.test index 2abb19dd92b..2f1019ace3c 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/keep-many.test +++ b/llvm/test/tools/llvm-objcopy/ELF/keep-many.test @@ -1,6 +1,6 @@ # RUN: yaml2obj %s > %t -# RUN: llvm-objcopy -strip-non-alloc -keep-section=.test -keep-section=.test3 %t %t2 -# RUN: llvm-readobj -file-headers -sections %t2 | FileCheck %s +# RUN: llvm-objcopy --strip-non-alloc --keep-section=.test --keep-section=.test3 %t %t2 +# RUN: llvm-readobj --file-headers --sections %t2 | FileCheck %s !ELF FileHeader: diff --git a/llvm/test/tools/llvm-objcopy/ELF/keep-only-section.test b/llvm/test/tools/llvm-objcopy/ELF/keep-only-section.test index 38aa52cc70f..4bf33846e88 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/keep-only-section.test +++ b/llvm/test/tools/llvm-objcopy/ELF/keep-only-section.test @@ -1,7 +1,7 @@ # RUN: yaml2obj %s > %t -# RUN: llvm-objcopy -keep-section=.test2 -only-section=.test %t %t2 -# RUN: llvm-objcopy -j .test -keep-section=.test2 %t %t3 -# RUN: llvm-readobj -file-headers -sections %t2 | FileCheck %s +# RUN: llvm-objcopy --keep-section=.test2 --only-section=.test %t %t2 +# RUN: llvm-objcopy -j .test --keep-section=.test2 %t %t3 +# RUN: llvm-readobj --file-headers --sections %t2 | FileCheck %s # RUN: diff %t2 %t3 !ELF diff --git a/llvm/test/tools/llvm-objcopy/ELF/keep-symbol-remove-section.test b/llvm/test/tools/llvm-objcopy/ELF/keep-symbol-remove-section.test index 6b02caa876e..2dbfb2c8c86 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/keep-symbol-remove-section.test +++ b/llvm/test/tools/llvm-objcopy/ELF/keep-symbol-remove-section.test @@ -1,6 +1,6 @@ # RUN: yaml2obj %s > %t # RUN: llvm-objcopy --remove-section .text --keep-symbol foo %t %t2 -# RUN: llvm-readobj -symbols %t2 | FileCheck %s +# RUN: llvm-readobj --symbols %t2 | FileCheck %s !ELF FileHeader: diff --git a/llvm/test/tools/llvm-objcopy/ELF/keep-symbol.test b/llvm/test/tools/llvm-objcopy/ELF/keep-symbol.test index 8c6415f3cb6..40a7ddecfad 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/keep-symbol.test +++ b/llvm/test/tools/llvm-objcopy/ELF/keep-symbol.test @@ -1,8 +1,8 @@ # RUN: yaml2obj %s > %t # RUN: llvm-objcopy --discard-all -K foo --keep-symbol bar %t %t2 # RUN: llvm-objcopy -K foo -N foo -N bar --keep-symbol bar -N baz %t %t3 -# RUN: llvm-readobj -symbols %t2 | FileCheck %s -# RUN: llvm-readobj -symbols %t3 | FileCheck %s +# RUN: llvm-readobj --symbols %t2 | FileCheck %s +# RUN: llvm-readobj --symbols %t3 | FileCheck %s !ELF FileHeader: diff --git a/llvm/test/tools/llvm-objcopy/ELF/localize-hidden.test b/llvm/test/tools/llvm-objcopy/ELF/localize-hidden.test index 05d747b800b..41662003fe8 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/localize-hidden.test +++ b/llvm/test/tools/llvm-objcopy/ELF/localize-hidden.test @@ -1,6 +1,6 @@ # RUN: yaml2obj %s > %t -# RUN: llvm-objcopy -localize-hidden %t %t2 -# RUN: llvm-readobj -relocations -symbols %t2 | FileCheck %s +# RUN: llvm-objcopy --localize-hidden %t %t2 +# RUN: llvm-readobj --relocations --symbols %t2 | FileCheck %s !ELF FileHeader: diff --git a/llvm/test/tools/llvm-objcopy/ELF/localize.test b/llvm/test/tools/llvm-objcopy/ELF/localize.test index 2e2d6ccd6bf..a04c51d8fc1 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/localize.test +++ b/llvm/test/tools/llvm-objcopy/ELF/localize.test @@ -5,7 +5,7 @@ # RUN: -L Weak \ # RUN: -L GlobalCommon \ # RUN: %t %t2 -# RUN: llvm-readobj -symbols %t2 | FileCheck %s +# RUN: llvm-readobj --symbols %t2 | FileCheck %s !ELF FileHeader: diff --git a/llvm/test/tools/llvm-objcopy/ELF/many-sections.test b/llvm/test/tools/llvm-objcopy/ELF/many-sections.test index e9e12cf913f..57239f32e4a 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/many-sections.test +++ b/llvm/test/tools/llvm-objcopy/ELF/many-sections.test @@ -1,8 +1,8 @@ RUN: %python %p/Inputs/ungzip.py %p/Inputs/many-sections.o.gz > %t RUN: llvm-objcopy %t %t2 -RUN: llvm-readobj -file-headers %t2 | FileCheck --check-prefix=EHDR %s -RUN: llvm-readobj -sections %t2 | FileCheck --check-prefix=SECS %s -RUN: llvm-readobj -symbols %t2 | grep "Symbol {" | wc -l | FileCheck --check-prefix=SYMS %s +RUN: llvm-readobj --file-headers %t2 | FileCheck --check-prefix=EHDR %s +RUN: llvm-readobj --sections %t2 | FileCheck --check-prefix=SECS %s +RUN: llvm-readobj --symbols %t2 | grep "Symbol {" | wc -l | FileCheck --check-prefix=SYMS %s EHDR: Format: ELF64-x86-64 EHDR-NEXT: Arch: x86_64 diff --git a/llvm/test/tools/llvm-objcopy/ELF/marker-segment.test b/llvm/test/tools/llvm-objcopy/ELF/marker-segment.test index 01b55ebc32c..226d21ccba9 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/marker-segment.test +++ b/llvm/test/tools/llvm-objcopy/ELF/marker-segment.test @@ -1,6 +1,6 @@ # RUN: yaml2obj %s -o %t # RUN: llvm-objcopy %t %t2 -# RUN: llvm-readobj -program-headers %t2 | FileCheck %s +# RUN: llvm-readobj --program-headers %t2 | FileCheck %s !ELF FileHeader: diff --git a/llvm/test/tools/llvm-objcopy/ELF/no-symbol-relocation.test b/llvm/test/tools/llvm-objcopy/ELF/no-symbol-relocation.test index 5e60ec856e7..9def536c239 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/no-symbol-relocation.test +++ b/llvm/test/tools/llvm-objcopy/ELF/no-symbol-relocation.test @@ -1,6 +1,6 @@ # RUN: yaml2obj %s > %t # RUN: llvm-objcopy %t %t2 -# RUN: llvm-readobj -relocations %t2 | FileCheck %s +# RUN: llvm-readobj --relocations %t2 | FileCheck %s !ELF FileHeader: diff --git a/llvm/test/tools/llvm-objcopy/ELF/null-symbol.test b/llvm/test/tools/llvm-objcopy/ELF/null-symbol.test index 61ed4107839..94f5ab5d8c2 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/null-symbol.test +++ b/llvm/test/tools/llvm-objcopy/ELF/null-symbol.test @@ -1,6 +1,6 @@ # RUN: yaml2obj %s > %t # RUN: llvm-objcopy %t %t2 -# RUN: llvm-readobj -symbols %t2 | FileCheck %s +# RUN: llvm-readobj --symbols %t2 | FileCheck %s !ELF FileHeader: diff --git a/llvm/test/tools/llvm-objcopy/ELF/only-section-many.test b/llvm/test/tools/llvm-objcopy/ELF/only-section-many.test index 2f956238dc9..43ccff1c2c2 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/only-section-many.test +++ b/llvm/test/tools/llvm-objcopy/ELF/only-section-many.test @@ -1,6 +1,6 @@ # RUN: yaml2obj %s > %t # RUN: llvm-objcopy -j .test1 -j .test2 %t %t2 -# RUN: llvm-readobj -file-headers -sections %t2 | FileCheck %s +# RUN: llvm-readobj --file-headers --sections %t2 | FileCheck %s !ELF FileHeader: diff --git a/llvm/test/tools/llvm-objcopy/ELF/only-section-remove-strtab.test b/llvm/test/tools/llvm-objcopy/ELF/only-section-remove-strtab.test index e336181d9fa..c88fef2fd0c 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/only-section-remove-strtab.test +++ b/llvm/test/tools/llvm-objcopy/ELF/only-section-remove-strtab.test @@ -1,7 +1,7 @@ # RUN: yaml2obj %s > %t -# RUN: llvm-objcopy -R .symtab -R .strtab -only-section=.test %t %t2 +# RUN: llvm-objcopy -R .symtab -R .strtab --only-section=.test %t %t2 # RUN: llvm-objcopy -j .test -R .strtab -R .symtab %t %t3 -# RUN: llvm-readobj -file-headers -sections %t2 | FileCheck %s +# RUN: llvm-readobj --file-headers --sections %t2 | FileCheck %s # RUN: diff %t2 %t3 !ELF diff --git a/llvm/test/tools/llvm-objcopy/ELF/only-section-strip-non-alloc.test b/llvm/test/tools/llvm-objcopy/ELF/only-section-strip-non-alloc.test index f61b4ae664c..ae39b51226b 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/only-section-strip-non-alloc.test +++ b/llvm/test/tools/llvm-objcopy/ELF/only-section-strip-non-alloc.test @@ -1,6 +1,6 @@ # RUN: yaml2obj %s > %t -# RUN: llvm-objcopy -strip-non-alloc -only-section=.test %t %t2 -# RUN: llvm-readobj -file-headers -sections %t2 | FileCheck %s +# RUN: llvm-objcopy --strip-non-alloc --only-section=.test %t %t2 +# RUN: llvm-readobj --file-headers --sections %t2 | FileCheck %s !ELF FileHeader: diff --git a/llvm/test/tools/llvm-objcopy/ELF/overlap-chain.test b/llvm/test/tools/llvm-objcopy/ELF/overlap-chain.test index a084abbb5ba..6b54e73b66a 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/overlap-chain.test +++ b/llvm/test/tools/llvm-objcopy/ELF/overlap-chain.test @@ -5,7 +5,7 @@ # RUN: yaml2obj %s -o %t # RUN: llvm-objcopy %t %t2 -# RUN: llvm-readobj -program-headers %t2 | FileCheck %s +# RUN: llvm-readobj --program-headers %t2 | FileCheck %s !ELF FileHeader: diff --git a/llvm/test/tools/llvm-objcopy/ELF/prefix-symbols.test b/llvm/test/tools/llvm-objcopy/ELF/prefix-symbols.test index 8761ba9fada..1e6a54a8cf8 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/prefix-symbols.test +++ b/llvm/test/tools/llvm-objcopy/ELF/prefix-symbols.test @@ -1,8 +1,8 @@ # RUN: yaml2obj %s > %t # RUN: llvm-objcopy --prefix-symbols prefix %t %t2 -# RUN: llvm-readobj -symbols %t2 | FileCheck %s --check-prefix=COMMON --check-prefix=BASIC +# RUN: llvm-readobj --symbols %t2 | FileCheck %s --check-prefix=COMMON --check-prefix=BASIC # RUN: llvm-objcopy --redefine-sym bar=baz --prefix-symbols prefix %t %t3 -# RUN: llvm-readobj -symbols %t3 | FileCheck %s --check-prefix=COMMON --check-prefix=REDEF +# RUN: llvm-readobj --symbols %t3 | FileCheck %s --check-prefix=COMMON --check-prefix=REDEF !ELF FileHeader: diff --git a/llvm/test/tools/llvm-objcopy/ELF/program-headers.test b/llvm/test/tools/llvm-objcopy/ELF/program-headers.test index dc2551030ec..9c123d21547 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/program-headers.test +++ b/llvm/test/tools/llvm-objcopy/ELF/program-headers.test @@ -1,6 +1,6 @@ # RUN: yaml2obj %s -o %t # RUN: llvm-objcopy %t %t2 -# RUN: llvm-readobj -program-headers %t2 | FileCheck %s +# RUN: llvm-readobj --program-headers %t2 | FileCheck %s !ELF FileHeader: diff --git a/llvm/test/tools/llvm-objcopy/ELF/pt-phdr.test b/llvm/test/tools/llvm-objcopy/ELF/pt-phdr.test index 336ce769770..dba40efc640 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/pt-phdr.test +++ b/llvm/test/tools/llvm-objcopy/ELF/pt-phdr.test @@ -2,7 +2,7 @@ # segments. # RUN: llvm-objcopy %p/Inputs/pt-phdr.elf %t -# RUN: llvm-readobj -program-headers %t | FileCheck %s +# RUN: llvm-readobj --program-headers %t | FileCheck %s #CHECK: ProgramHeaders [ #CHECK-NEXT: ProgramHeader { diff --git a/llvm/test/tools/llvm-objcopy/ELF/redefine-symbol.test b/llvm/test/tools/llvm-objcopy/ELF/redefine-symbol.test index a0600fac83b..c56621a79d8 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/redefine-symbol.test +++ b/llvm/test/tools/llvm-objcopy/ELF/redefine-symbol.test @@ -1,6 +1,6 @@ # RUN: yaml2obj %s > %t # RUN: llvm-objcopy --redefine-sym foo=oof --redefine-sym empty= %t %t2 -# RUN: llvm-readobj -symbols %t2 | FileCheck %s +# RUN: llvm-readobj --symbols %t2 | FileCheck %s # RUN: not llvm-objcopy --redefine-sym barbar %t %t2 2>&1 | FileCheck %s --check-prefix=BAD-FORMAT # RUN: not llvm-objcopy --redefine-sym foo=f1 --redefine-sym foo=f2 %t %t2 2>&1 | FileCheck %s --check-prefix=MULTIPLE-REDEFINITION diff --git a/llvm/test/tools/llvm-objcopy/ELF/reloc-no-symtab.test b/llvm/test/tools/llvm-objcopy/ELF/reloc-no-symtab.test index ea593613df0..96bf4d3f77d 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/reloc-no-symtab.test +++ b/llvm/test/tools/llvm-objcopy/ELF/reloc-no-symtab.test @@ -7,8 +7,8 @@ # RUN: yaml2obj %s > %t.original # RUN: llvm-strip %t.original -o %t.stripped -# RUN: llvm-readobj -sections %t.original | FileCheck %s -# RUN: llvm-readobj -sections %t.stripped | FileCheck %s +# RUN: llvm-readobj --sections %t.original | FileCheck %s +# RUN: llvm-readobj --sections %t.stripped | FileCheck %s !ELF FileHeader: diff --git a/llvm/test/tools/llvm-objcopy/ELF/relocatable-phdr.test b/llvm/test/tools/llvm-objcopy/ELF/relocatable-phdr.test index b6218956aff..40216467a24 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/relocatable-phdr.test +++ b/llvm/test/tools/llvm-objcopy/ELF/relocatable-phdr.test @@ -2,7 +2,7 @@ # for offset and header size when copied with llvm-objcopy. # RUN: yaml2obj %s > %t # RUN: llvm-objcopy %t %t2 -# RUN: llvm-readobj -file-headers %t2 | FileCheck %s +# RUN: llvm-readobj --file-headers %t2 | FileCheck %s !ELF FileHeader: diff --git a/llvm/test/tools/llvm-objcopy/ELF/remove-multiple-sections.test b/llvm/test/tools/llvm-objcopy/ELF/remove-multiple-sections.test index 5e5de97cd31..1f1bc4ce191 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/remove-multiple-sections.test +++ b/llvm/test/tools/llvm-objcopy/ELF/remove-multiple-sections.test @@ -1,6 +1,6 @@ # RUN: yaml2obj %s > %t # RUN: llvm-objcopy -R .test2 -R .test3 -R .test5 %t %t2 -# RUN: llvm-readobj -sections %t2 | FileCheck %s +# RUN: llvm-readobj --sections %t2 | FileCheck %s !ELF FileHeader: diff --git a/llvm/test/tools/llvm-objcopy/ELF/remove-section-with-symbol.test b/llvm/test/tools/llvm-objcopy/ELF/remove-section-with-symbol.test index 067c0b25ea7..949d34cd5e8 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/remove-section-with-symbol.test +++ b/llvm/test/tools/llvm-objcopy/ELF/remove-section-with-symbol.test @@ -1,6 +1,6 @@ # RUN: yaml2obj %s > %t # RUN: llvm-objcopy -R .test %t %t2 -# RUN: llvm-readobj -file-headers -symbols %t2 | FileCheck %s +# RUN: llvm-readobj --file-headers --symbols %t2 | FileCheck %s !ELF FileHeader: diff --git a/llvm/test/tools/llvm-objcopy/ELF/remove-section.test b/llvm/test/tools/llvm-objcopy/ELF/remove-section.test index f19e7b7684e..7bde47599e7 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/remove-section.test +++ b/llvm/test/tools/llvm-objcopy/ELF/remove-section.test @@ -2,13 +2,13 @@ # RUN: cp %t %t1 # RUN: llvm-objcopy -R .test2 %t %t2 -# RUN: llvm-readobj -file-headers -sections %t2 | FileCheck %s +# RUN: llvm-readobj --file-headers --sections %t2 | FileCheck %s # Verify that the first run of llvm-objcopy # has not modified the input binary. # RUN: cmp %t %t1 -# RUN: llvm-objcopy -remove-section=.test2 %t1 %t3 +# RUN: llvm-objcopy --remove-section=.test2 %t1 %t3 # RUN: cmp %t2 %t3 !ELF diff --git a/llvm/test/tools/llvm-objcopy/ELF/remove-shndx.test b/llvm/test/tools/llvm-objcopy/ELF/remove-shndx.test index b8ea94cbc1d..6cc3a1a291f 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/remove-shndx.test +++ b/llvm/test/tools/llvm-objcopy/ELF/remove-shndx.test @@ -2,6 +2,6 @@ # that needs it, even if the original was removed. RUN: %python %p/Inputs/ungzip.py %p/Inputs/many-sections.o.gz > %t RUN: llvm-objcopy -R .symtab_shndx %t %t2 -RUN: llvm-readobj -sections %t2 | FileCheck %s +RUN: llvm-readobj --sections %t2 | FileCheck %s CHECK: Name: .symtab_shndx ( diff --git a/llvm/test/tools/llvm-objcopy/ELF/remove-symtab.test b/llvm/test/tools/llvm-objcopy/ELF/remove-symtab.test index 0e3f82b3a0d..5c53962b14b 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/remove-symtab.test +++ b/llvm/test/tools/llvm-objcopy/ELF/remove-symtab.test @@ -1,6 +1,6 @@ # RUN: yaml2obj %s > %t # RUN: llvm-objcopy -R .symtab %t %t2 -# RUN: llvm-readobj -file-headers -sections %t2 | FileCheck %s +# RUN: llvm-readobj --file-headers --sections %t2 | FileCheck %s !ELF FileHeader: diff --git a/llvm/test/tools/llvm-objcopy/ELF/rename-section-flag-osproc-mask.test b/llvm/test/tools/llvm-objcopy/ELF/rename-section-flag-osproc-mask.test index 58a5ffa1888..a7692905106 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/rename-section-flag-osproc-mask.test +++ b/llvm/test/tools/llvm-objcopy/ELF/rename-section-flag-osproc-mask.test @@ -2,9 +2,9 @@ # ===== x86_64 ===== -# RUN: yaml2obj -docnum 1 %s > %t-x86_64.o +# RUN: yaml2obj --docnum 1 %s > %t-x86_64.o # RUN: llvm-objcopy --rename-section=.foo=.bar,alloc %t-x86_64.o -# RUN: llvm-readobj -sections %t-x86_64.o | FileCheck %s --check-prefix=X86_64 +# RUN: llvm-readobj --sections %t-x86_64.o | FileCheck %s --check-prefix=X86_64 --- !ELF FileHeader: @@ -27,9 +27,9 @@ Sections: # ===== hex ===== -# RUN: yaml2obj -docnum 2 %s > %t-hex.o +# RUN: yaml2obj --docnum 2 %s > %t-hex.o # RUN: llvm-objcopy --rename-section=.foo=.bar,alloc %t-hex.o -# RUN: llvm-readobj -sections %t-hex.o | FileCheck %s --check-prefix=HEX +# RUN: llvm-readobj --sections %t-hex.o | FileCheck %s --check-prefix=HEX --- !ELF FileHeader: @@ -52,9 +52,9 @@ Sections: # ===== mips ===== -# RUN: yaml2obj -docnum 3 %s > %t-mips.o +# RUN: yaml2obj --docnum 3 %s > %t-mips.o # RUN: llvm-objcopy --rename-section=.foo=.bar,alloc %t-mips.o -# RUN: llvm-readobj -sections %t-mips.o | FileCheck %s --check-prefix=MIPS +# RUN: llvm-readobj --sections %t-mips.o | FileCheck %s --check-prefix=MIPS --- !ELF FileHeader: @@ -91,9 +91,9 @@ Sections: # ===== arm ===== -# RUN: yaml2obj -docnum 4 %s > %t-arm.o +# RUN: yaml2obj --docnum 4 %s > %t-arm.o # RUN: llvm-objcopy --rename-section=.foo=.bar,alloc %t-arm.o -# RUN: llvm-readobj -sections %t-arm.o | FileCheck %s --check-prefix=ARM +# RUN: llvm-readobj --sections %t-arm.o | FileCheck %s --check-prefix=ARM --- !ELF FileHeader: diff --git a/llvm/test/tools/llvm-objcopy/ELF/rename-section-flag-preserved.test b/llvm/test/tools/llvm-objcopy/ELF/rename-section-flag-preserved.test index d944e40094c..6c22eb892bf 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/rename-section-flag-preserved.test +++ b/llvm/test/tools/llvm-objcopy/ELF/rename-section-flag-preserved.test @@ -2,29 +2,29 @@ # Single flags on a section with all flags: # RUN: llvm-objcopy --rename-section=.foo=.bar,alloc %t %t.alloc -# RUN: llvm-readobj -sections %t.alloc | FileCheck %s --check-prefixes=CHECK,ALLOC,WRITE +# RUN: llvm-readobj --sections %t.alloc | FileCheck %s --check-prefixes=CHECK,ALLOC,WRITE # RUN: llvm-objcopy --rename-section=.foo=.bar,load %t %t.load -# RUN: llvm-readobj -sections %t.load | FileCheck %s --check-prefixes=CHECK,WRITE +# RUN: llvm-readobj --sections %t.load | FileCheck %s --check-prefixes=CHECK,WRITE # RUN: llvm-objcopy --rename-section=.foo=.bar,noload %t %t.noload -# RUN: llvm-readobj -sections %t.noload | FileCheck %s --check-prefixes=CHECK,WRITE +# RUN: llvm-readobj --sections %t.noload | FileCheck %s --check-prefixes=CHECK,WRITE # RUN: llvm-objcopy --rename-section=.foo=.bar,readonly %t %t.readonly -# RUN: llvm-readobj -sections %t.readonly | FileCheck %s --check-prefixes=CHECK +# RUN: llvm-readobj --sections %t.readonly | FileCheck %s --check-prefixes=CHECK # RUN: llvm-objcopy --rename-section=.foo=.bar,debug %t %t.debug -# RUN: llvm-readobj -sections %t.debug | FileCheck %s --check-prefixes=CHECK,WRITE +# RUN: llvm-readobj --sections %t.debug | FileCheck %s --check-prefixes=CHECK,WRITE # RUN: llvm-objcopy --rename-section=.foo=.bar,code %t %t.code -# RUN: llvm-readobj -sections %t.code | FileCheck %s --check-prefixes=CHECK,EXEC,WRITE +# RUN: llvm-readobj --sections %t.code | FileCheck %s --check-prefixes=CHECK,EXEC,WRITE # RUN: llvm-objcopy --rename-section=.foo=.bar,data %t %t.data -# RUN: llvm-readobj -sections %t.data | FileCheck %s --check-prefixes=CHECK,WRITE +# RUN: llvm-readobj --sections %t.data | FileCheck %s --check-prefixes=CHECK,WRITE # RUN: llvm-objcopy --rename-section=.foo=.bar,rom %t %t.rom -# RUN: llvm-readobj -sections %t.rom | FileCheck %s --check-prefixes=CHECK,WRITE +# RUN: llvm-readobj --sections %t.rom | FileCheck %s --check-prefixes=CHECK,WRITE # RUN: llvm-objcopy --rename-section=.foo=.bar,contents %t %t.contents -# RUN: llvm-readobj -sections %t.contents | FileCheck %s --check-prefixes=CHECK,WRITE +# RUN: llvm-readobj --sections %t.contents | FileCheck %s --check-prefixes=CHECK,WRITE # RUN: llvm-objcopy --rename-section=.foo=.bar,merge %t %t.merge -# RUN: llvm-readobj -sections %t.merge | FileCheck %s --check-prefixes=CHECK,MERGE,WRITE +# RUN: llvm-readobj --sections %t.merge | FileCheck %s --check-prefixes=CHECK,MERGE,WRITE # RUN: llvm-objcopy --rename-section=.foo=.bar,strings %t %t.strings -# RUN: llvm-readobj -sections %t.strings | FileCheck %s --check-prefixes=CHECK,STRINGS,WRITE +# RUN: llvm-readobj --sections %t.strings | FileCheck %s --check-prefixes=CHECK,STRINGS,WRITE # RUN: llvm-objcopy --rename-section=.foo=.bar,share %t %t.share -# RUN: llvm-readobj -sections %t.share | FileCheck %s --check-prefixes=CHECK,WRITE +# RUN: llvm-readobj --sections %t.share | FileCheck %s --check-prefixes=CHECK,WRITE !ELF FileHeader: diff --git a/llvm/test/tools/llvm-objcopy/ELF/rename-section-flag.test b/llvm/test/tools/llvm-objcopy/ELF/rename-section-flag.test index f31452dd436..75f35af4b30 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/rename-section-flag.test +++ b/llvm/test/tools/llvm-objcopy/ELF/rename-section-flag.test @@ -2,35 +2,35 @@ # Single flags on a section with no flags: # RUN: llvm-objcopy --rename-section=.foo=.bar,alloc %t %t.alloc -# RUN: llvm-readobj -sections %t.alloc | FileCheck %s --check-prefixes=CHECK,ALLOC,WRITE +# RUN: llvm-readobj --sections %t.alloc | FileCheck %s --check-prefixes=CHECK,ALLOC,WRITE # RUN: llvm-objcopy --rename-section=.foo=.bar,load %t %t.load -# RUN: llvm-readobj -sections %t.load | FileCheck %s --check-prefixes=CHECK,WRITE +# RUN: llvm-readobj --sections %t.load | FileCheck %s --check-prefixes=CHECK,WRITE # RUN: llvm-objcopy --rename-section=.foo=.bar,noload %t %t.noload -# RUN: llvm-readobj -sections %t.noload | FileCheck %s --check-prefixes=CHECK,WRITE +# RUN: llvm-readobj --sections %t.noload | FileCheck %s --check-prefixes=CHECK,WRITE # RUN: llvm-objcopy --rename-section=.foo=.bar,readonly %t %t.readonly -# RUN: llvm-readobj -sections %t.readonly | FileCheck %s --check-prefixes=CHECK +# RUN: llvm-readobj --sections %t.readonly | FileCheck %s --check-prefixes=CHECK # RUN: llvm-objcopy --rename-section=.foo=.bar,debug %t %t.debug -# RUN: llvm-readobj -sections %t.debug | FileCheck %s --check-prefixes=CHECK,WRITE +# RUN: llvm-readobj --sections %t.debug | FileCheck %s --check-prefixes=CHECK,WRITE # RUN: llvm-objcopy --rename-section=.foo=.bar,code %t %t.code -# RUN: llvm-readobj -sections %t.code | FileCheck %s --check-prefixes=CHECK,EXEC,WRITE +# RUN: llvm-readobj --sections %t.code | FileCheck %s --check-prefixes=CHECK,EXEC,WRITE # RUN: llvm-objcopy --rename-section=.foo=.bar,data %t %t.data -# RUN: llvm-readobj -sections %t.data | FileCheck %s --check-prefixes=CHECK,WRITE +# RUN: llvm-readobj --sections %t.data | FileCheck %s --check-prefixes=CHECK,WRITE # RUN: llvm-objcopy --rename-section=.foo=.bar,rom %t %t.rom -# RUN: llvm-readobj -sections %t.rom | FileCheck %s --check-prefixes=CHECK,WRITE +# RUN: llvm-readobj --sections %t.rom | FileCheck %s --check-prefixes=CHECK,WRITE # RUN: llvm-objcopy --rename-section=.foo=.bar,contents %t %t.contents -# RUN: llvm-readobj -sections %t.contents | FileCheck %s --check-prefixes=CHECK,WRITE +# RUN: llvm-readobj --sections %t.contents | FileCheck %s --check-prefixes=CHECK,WRITE # RUN: llvm-objcopy --rename-section=.foo=.bar,merge %t %t.merge -# RUN: llvm-readobj -sections %t.merge | FileCheck %s --check-prefixes=CHECK,MERGE,WRITE +# RUN: llvm-readobj --sections %t.merge | FileCheck %s --check-prefixes=CHECK,MERGE,WRITE # RUN: llvm-objcopy --rename-section=.foo=.bar,strings %t %t.strings -# RUN: llvm-readobj -sections %t.strings | FileCheck %s --check-prefixes=CHECK,STRINGS,WRITE +# RUN: llvm-readobj --sections %t.strings | FileCheck %s --check-prefixes=CHECK,STRINGS,WRITE # RUN: llvm-objcopy --rename-section=.foo=.bar,share %t %t.share -# RUN: llvm-readobj -sections %t.share | FileCheck %s --check-prefixes=CHECK,WRITE +# RUN: llvm-readobj --sections %t.share | FileCheck %s --check-prefixes=CHECK,WRITE # Multiple flags: # RUN: llvm-objcopy --rename-section=.foo=.bar,alloc,readonly,strings %t %t.alloc_ro_strings -# RUN: llvm-readobj -sections %t.alloc_ro_strings | FileCheck %s --check-prefixes=CHECK,ALLOC,STRINGS +# RUN: llvm-readobj --sections %t.alloc_ro_strings | FileCheck %s --check-prefixes=CHECK,ALLOC,STRINGS # RUN: llvm-objcopy --rename-section=.foo=.bar,alloc,code %t %t.alloc_code -# RUN: llvm-readobj -sections %t.alloc_code | FileCheck %s --check-prefixes=CHECK,ALLOC,EXEC,WRITE +# RUN: llvm-readobj --sections %t.alloc_code | FileCheck %s --check-prefixes=CHECK,ALLOC,EXEC,WRITE # Invalid flags: # RUN: not llvm-objcopy --rename-section=.foo=.bar,xyzzy %t %t.xyzzy 2>&1 | FileCheck %s --check-prefix=BAD-FLAG diff --git a/llvm/test/tools/llvm-objcopy/ELF/rename-section-multiple.test b/llvm/test/tools/llvm-objcopy/ELF/rename-section-multiple.test index 8feff9fda74..e614f656053 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/rename-section-multiple.test +++ b/llvm/test/tools/llvm-objcopy/ELF/rename-section-multiple.test @@ -1,6 +1,6 @@ # RUN: yaml2obj %s > %t # RUN: llvm-objcopy --rename-section=.test1=.test2 --rename-section=.test3=.test4 --rename-section=.test5=.test6 %t %t2 -# RUN: llvm-readobj -file-headers -sections -section-data %t2 | FileCheck %s +# RUN: llvm-readobj --file-headers --sections --section-data %t2 | FileCheck %s !ELF FileHeader: diff --git a/llvm/test/tools/llvm-objcopy/ELF/rename-section.test b/llvm/test/tools/llvm-objcopy/ELF/rename-section.test index 505cf7770d7..feaec44823b 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/rename-section.test +++ b/llvm/test/tools/llvm-objcopy/ELF/rename-section.test @@ -1,6 +1,6 @@ # RUN: yaml2obj %s > %t # RUN: llvm-objcopy --rename-section=.foo=.bar %t %t2 -# RUN: llvm-readobj -file-headers -sections -section-data %t2 | FileCheck %s +# RUN: llvm-readobj --file-headers --sections --section-data %t2 | FileCheck %s # RUN: not llvm-objcopy --rename-section=.foo.bar --rename-section=.foo=.other %t %t2 2>&1 | FileCheck %s --check-prefix=BAD-FORMAT # RUN: not llvm-objcopy --rename-section=.foo=.bar --rename-section=.foo=.other %t %t2 2>&1 | FileCheck %s --check-prefix=MULTIPLE-RENAMES diff --git a/llvm/test/tools/llvm-objcopy/ELF/segment-shift-section-remove.test b/llvm/test/tools/llvm-objcopy/ELF/segment-shift-section-remove.test index caeb5596ef7..563a9e3f836 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/segment-shift-section-remove.test +++ b/llvm/test/tools/llvm-objcopy/ELF/segment-shift-section-remove.test @@ -1,6 +1,6 @@ # RUN: yaml2obj %s -o %t # RUN: llvm-objcopy -R .text2 %t %t2 -# RUN: llvm-readobj -file-headers -sections -program-headers %t2 | FileCheck %s +# RUN: llvm-readobj --file-headers --sections --program-headers %t2 | FileCheck %s !ELF FileHeader: diff --git a/llvm/test/tools/llvm-objcopy/ELF/segment-shift.test b/llvm/test/tools/llvm-objcopy/ELF/segment-shift.test index 635fdccf75e..b4caa197aec 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/segment-shift.test +++ b/llvm/test/tools/llvm-objcopy/ELF/segment-shift.test @@ -1,6 +1,6 @@ # RUN: yaml2obj %s -o %t # RUN: llvm-objcopy %t %t2 -# RUN: llvm-readobj -program-headers %t2 | FileCheck %s +# RUN: llvm-readobj --program-headers %t2 | FileCheck %s !ELF FileHeader: diff --git a/llvm/test/tools/llvm-objcopy/ELF/segment-test-remove-section.test b/llvm/test/tools/llvm-objcopy/ELF/segment-test-remove-section.test index 9b98dc8611f..49a9003cb15 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/segment-test-remove-section.test +++ b/llvm/test/tools/llvm-objcopy/ELF/segment-test-remove-section.test @@ -6,7 +6,7 @@ # RUN: yaml2obj %s -o %t # RUN: llvm-objcopy -R .text2 %t %t2 -# RUN: llvm-readobj -file-headers -program-headers -sections %t2 | FileCheck %s +# RUN: llvm-readobj --file-headers --program-headers --sections %t2 | FileCheck %s # RUN: od -t x1 -j 8192 %t2 | FileCheck %s --check-prefix=DATA !ELF diff --git a/llvm/test/tools/llvm-objcopy/ELF/strict-no-add.test b/llvm/test/tools/llvm-objcopy/ELF/strict-no-add.test index 15f5251db34..4f24df31bf9 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/strict-no-add.test +++ b/llvm/test/tools/llvm-objcopy/ELF/strict-no-add.test @@ -4,7 +4,7 @@ RUN: %python %p/Inputs/ungzip.py %p/Inputs/many-sections.o.gz > %t.0 RUN: cat %p/Inputs/alloc-symtab.o > %t RUN: llvm-objcopy -R .text -R s0 -R s1 -R s2 -R s3 -R s4 -R s5 -R s6 %t.0 %t2 -RUN: llvm-objcopy -add-section=.s0=%t -add-section=.s1=%t -add-section=.s2=%t %t2 %t2 -RUN: llvm-readobj -sections %t2 | FileCheck --check-prefix=SECS %s +RUN: llvm-objcopy --add-section=.s0=%t --add-section=.s1=%t --add-section=.s2=%t %t2 %t2 +RUN: llvm-readobj --sections %t2 | FileCheck --check-prefix=SECS %s SECS-NOT: Name: .symtab_shndx diff --git a/llvm/test/tools/llvm-objcopy/ELF/strip-all-and-keep-symbol.test b/llvm/test/tools/llvm-objcopy/ELF/strip-all-and-keep-symbol.test index 72e17a7d224..9892a126507 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/strip-all-and-keep-symbol.test +++ b/llvm/test/tools/llvm-objcopy/ELF/strip-all-and-keep-symbol.test @@ -1,13 +1,13 @@ # RUN: yaml2obj %s > %t # RUN: cp %t %t1 # RUN: llvm-objcopy --strip-all --keep-symbol foo %t %t2 -# RUN: llvm-readobj -sections -symbols %t2 | FileCheck %s +# RUN: llvm-readobj --sections --symbols %t2 | FileCheck %s # Verify that the first run of llvm-objcopy # has not modified the input binary. # RUN: cmp %t %t1 -# RUN: llvm-strip -keep-symbol=foo %t1 +# RUN: llvm-strip --keep-symbol=foo %t1 # RUN: cmp %t1 %t2 # RUN: cp %t %t3 diff --git a/llvm/test/tools/llvm-objcopy/ELF/strip-all-and-remove.test b/llvm/test/tools/llvm-objcopy/ELF/strip-all-and-remove.test index 9ee738aca24..5455c6bb7bc 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/strip-all-and-remove.test +++ b/llvm/test/tools/llvm-objcopy/ELF/strip-all-and-remove.test @@ -1,10 +1,10 @@ # RUN: yaml2obj %s > %t # RUN: cp %t %t1 -# RUN: llvm-strip -remove-section=.text.bar %t -# RUN: llvm-readobj -file-headers -sections -symbols %t | FileCheck %s +# RUN: llvm-strip --remove-section=.text.bar %t +# RUN: llvm-readobj --file-headers --sections --symbols %t | FileCheck %s -# RUN: llvm-objcopy -strip-all -remove-section=.text.bar %t1 %t1 +# RUN: llvm-objcopy --strip-all --remove-section=.text.bar %t1 %t1 # RUN: cmp %t %t1 !ELF diff --git a/llvm/test/tools/llvm-objcopy/ELF/strip-all-gnu.test b/llvm/test/tools/llvm-objcopy/ELF/strip-all-gnu.test index f6dbcc70cf4..8253526d23c 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/strip-all-gnu.test +++ b/llvm/test/tools/llvm-objcopy/ELF/strip-all-gnu.test @@ -2,7 +2,7 @@ # RUN: cp %t %t1 # RUN: llvm-objcopy --strip-all-gnu %t %t2 # RUN: llvm-strip --strip-all-gnu %t -o %t3 -# RUN: llvm-readobj -file-headers -sections %t2 | FileCheck %s +# RUN: llvm-readobj --file-headers --sections %t2 | FileCheck %s # RUN: cmp %t2 %t3 !ELF diff --git a/llvm/test/tools/llvm-objcopy/ELF/strip-all.test b/llvm/test/tools/llvm-objcopy/ELF/strip-all.test index 5c5b6fd374f..87388e09747 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/strip-all.test +++ b/llvm/test/tools/llvm-objcopy/ELF/strip-all.test @@ -1,7 +1,7 @@ # RUN: yaml2obj %s > %t # RUN: cp %t %t3 # RUN: llvm-objcopy --strip-all %t %t2 -# RUN: llvm-readobj -file-headers -sections %t2 | FileCheck %s +# RUN: llvm-readobj --file-headers --sections %t2 | FileCheck %s # Verify that the previous llvm-objcopy's run has not modified the input. # RUN: cmp %t %t3 diff --git a/llvm/test/tools/llvm-objcopy/ELF/strip-debug-and-remove.test b/llvm/test/tools/llvm-objcopy/ELF/strip-debug-and-remove.test index 5d2b0c7af95..d2d0b34d976 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/strip-debug-and-remove.test +++ b/llvm/test/tools/llvm-objcopy/ELF/strip-debug-and-remove.test @@ -1,10 +1,10 @@ # RUN: yaml2obj %s > %t # RUN: cp %t %t1 -# RUN: llvm-strip -strip-debug -remove-section=.text.bar %t -# RUN: llvm-readobj -file-headers -sections -symbols %t | FileCheck %s +# RUN: llvm-strip --strip-debug --remove-section=.text.bar %t +# RUN: llvm-readobj --file-headers --sections --symbols %t | FileCheck %s -# RUN: llvm-objcopy -strip-debug -remove-section=.text.bar %t1 %t1 +# RUN: llvm-objcopy --strip-debug --remove-section=.text.bar %t1 %t1 # RUN: cmp %t %t1 !ELF diff --git a/llvm/test/tools/llvm-objcopy/ELF/strip-debug.test b/llvm/test/tools/llvm-objcopy/ELF/strip-debug.test index 6c833f301c7..b88744e5f42 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/strip-debug.test +++ b/llvm/test/tools/llvm-objcopy/ELF/strip-debug.test @@ -1,12 +1,12 @@ # RUN: yaml2obj %s > %t # RUN: cp %t %t3 -# RUN: llvm-objcopy -strip-debug %t %t2 -# RUN: llvm-readobj -file-headers -sections -symbols %t2 | FileCheck %s +# RUN: llvm-objcopy --strip-debug %t %t2 +# RUN: llvm-readobj --file-headers --sections --symbols %t2 | FileCheck %s # Verify that the previous run of llvm-objcopy has not modified the input. # RUN: cmp %t %t3 -# RUN: llvm-strip -strip-debug %t3 +# RUN: llvm-strip --strip-debug %t3 # RUN: cmp %t2 %t3 # RUN: cp %t %t4 diff --git a/llvm/test/tools/llvm-objcopy/ELF/strip-dwo-groups.test b/llvm/test/tools/llvm-objcopy/ELF/strip-dwo-groups.test index 957bb553b72..724b0635b91 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/strip-dwo-groups.test +++ b/llvm/test/tools/llvm-objcopy/ELF/strip-dwo-groups.test @@ -1,6 +1,6 @@ # RUN: cp %p/Inputs/groups.o %t -# RUN: llvm-objcopy -strip-dwo %t -# RUN: llvm-readobj -elf-section-groups %t | FileCheck %s +# RUN: llvm-objcopy --strip-dwo %t +# RUN: llvm-readobj --elf-section-groups %t | FileCheck %s // Source code of groups.o: // @@ -18,11 +18,11 @@ // // clang -g -gsplit-dwarf -std=c++11 -c groups.cpp -o groups.o -// `llvm-objcopy -strip-dwo` strips out dwo sections, as a result, the index of +// `llvm-objcopy --strip-dwo` strips out dwo sections, as a result, the index of // the symbol table, the indices of the symbols and the indices of the sections // which go after the removed ones will change. Consequently, the fields // Link, Info and the content of .group need to be updated. In the past -// `llvm-objcopy -strip-dwo` used to produce invalid binaries with +// `llvm-objcopy --strip-dwo` used to produce invalid binaries with // broken .group section, this test verifies the correctness of // Link, Info and the content of this section. diff --git a/llvm/test/tools/llvm-objcopy/ELF/strip-dwo-inplace.test b/llvm/test/tools/llvm-objcopy/ELF/strip-dwo-inplace.test index 31bbd36a31a..fc2d6c34280 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/strip-dwo-inplace.test +++ b/llvm/test/tools/llvm-objcopy/ELF/strip-dwo-inplace.test @@ -1,6 +1,6 @@ # RUN: cp %p/Inputs/dwarf.dwo %t -# RUN: llvm-objcopy -strip-dwo %t -# RUN: llvm-readobj -file-headers -sections %t | FileCheck %s +# RUN: llvm-objcopy --strip-dwo %t +# RUN: llvm-readobj --file-headers --sections %t | FileCheck %s CHECK: SectionHeaderCount: 24 diff --git a/llvm/test/tools/llvm-objcopy/ELF/strip-multiple-files.test b/llvm/test/tools/llvm-objcopy/ELF/strip-multiple-files.test index d1496eb5220..9aef8728443 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/strip-multiple-files.test +++ b/llvm/test/tools/llvm-objcopy/ELF/strip-multiple-files.test @@ -4,7 +4,7 @@ # tests so we only have to run FileCheck on it once. # RUN: cp %t.o %t.1.o # RUN: llvm-strip --keep-symbol=foo %t.1.o -o %t.stripped.o -# RUN: llvm-readobj -symbols %t.stripped.o | FileCheck %s +# RUN: llvm-readobj --symbols %t.stripped.o | FileCheck %s # llvm-strip on two files: # RUN: cp %t.o %t.1.o diff --git a/llvm/test/tools/llvm-objcopy/ELF/strip-non-alloc.test b/llvm/test/tools/llvm-objcopy/ELF/strip-non-alloc.test index 270670cffd3..8db732147d3 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/strip-non-alloc.test +++ b/llvm/test/tools/llvm-objcopy/ELF/strip-non-alloc.test @@ -1,6 +1,6 @@ # RUN: yaml2obj %s > %t # RUN: llvm-objcopy --strip-non-alloc %t %t2 -# RUN: llvm-readobj -file-headers -sections %t2 | FileCheck %s +# RUN: llvm-readobj --file-headers --sections %t2 | FileCheck %s !ELF FileHeader: diff --git a/llvm/test/tools/llvm-objcopy/ELF/strip-preserve-atime.test b/llvm/test/tools/llvm-objcopy/ELF/strip-preserve-atime.test index 5cee21fb96c..aad537cf48e 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/strip-preserve-atime.test +++ b/llvm/test/tools/llvm-objcopy/ELF/strip-preserve-atime.test @@ -43,7 +43,7 @@ # Preserve dates in split DWO files. # RUN: cp %p/Inputs/dwarf.dwo %t-input.dwo # RUN: touch -a -t 199505050555.55 %t-input.dwo -# RUN: llvm-objcopy -p -split-dwo=%t-dwo %t-input.dwo %t-nondwo +# RUN: llvm-objcopy -p --split-dwo=%t-dwo %t-input.dwo %t-nondwo # RUN: ls -lu %t-dwo | FileCheck %s --check-prefix=CHECK-PRESERVE-ATIME # RUN: llvm-readobj %t-dwo # RUN: ls -lu %t-nondwo | FileCheck %s --check-prefix=CHECK-PRESERVE-ATIME diff --git a/llvm/test/tools/llvm-objcopy/ELF/strip-preserve-mtime.test b/llvm/test/tools/llvm-objcopy/ELF/strip-preserve-mtime.test index ac430b4ecbd..5f247aefdbf 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/strip-preserve-mtime.test +++ b/llvm/test/tools/llvm-objcopy/ELF/strip-preserve-mtime.test @@ -41,7 +41,7 @@ # Preserve dates in split DWO files. # RUN: cp %p/Inputs/dwarf.dwo %t-input.dwo # RUN: touch -m -t 199705050555.55 %t-input.dwo -# RUN: llvm-objcopy -p -split-dwo=%t-dwo %t-input.dwo %t-nondwo +# RUN: llvm-objcopy -p --split-dwo=%t-dwo %t-input.dwo %t-nondwo # RUN: ls -l %t-dwo | FileCheck %s --check-prefix=CHECK-PRESERVE-MTIME # RUN: llvm-readobj %t-dwo # RUN: ls -l %t-nondwo | FileCheck %s --check-prefix=CHECK-PRESERVE-MTIME diff --git a/llvm/test/tools/llvm-objcopy/ELF/strip-sections-keep.test b/llvm/test/tools/llvm-objcopy/ELF/strip-sections-keep.test index f0031faef6e..711687f9253 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/strip-sections-keep.test +++ b/llvm/test/tools/llvm-objcopy/ELF/strip-sections-keep.test @@ -1,5 +1,5 @@ # RUN: yaml2obj %s > %t -# RUN: llvm-objcopy -strip-sections -keep-section=.shstrtab %t %t2 +# RUN: llvm-objcopy --strip-sections --keep-section=.shstrtab %t %t2 # RUN: od -Ax -t c %t2 | FileCheck %s !ELF diff --git a/llvm/test/tools/llvm-objcopy/ELF/strip-sections-only-section.test b/llvm/test/tools/llvm-objcopy/ELF/strip-sections-only-section.test index 2c14a7272e3..e2236a9fdd9 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/strip-sections-only-section.test +++ b/llvm/test/tools/llvm-objcopy/ELF/strip-sections-only-section.test @@ -1,7 +1,7 @@ # RUN: yaml2obj %s > %t -# RUN: llvm-objcopy -strip-sections -only-section=.test %t %t2 +# RUN: llvm-objcopy --strip-sections --only-section=.test %t %t2 # RUN: od -Ax -t x1 %t2 | FileCheck %s -# RUN: od -Ax -t c %t2 | FileCheck %s -check-prefix=TEXT +# RUN: od -Ax -t c %t2 | FileCheck %s --check-prefix=TEXT !ELF FileHeader: diff --git a/llvm/test/tools/llvm-objcopy/ELF/strip-sections.test b/llvm/test/tools/llvm-objcopy/ELF/strip-sections.test index fd8e224d27c..2dee6e2808d 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/strip-sections.test +++ b/llvm/test/tools/llvm-objcopy/ELF/strip-sections.test @@ -1,6 +1,6 @@ # RUN: yaml2obj %s > %t # RUN: llvm-objcopy --strip-sections %t %t2 -# RUN: llvm-readobj -file-headers -program-headers %t2 | FileCheck %s +# RUN: llvm-readobj --file-headers --program-headers %t2 | FileCheck %s # RUN: od -t x1 -j 4096 %t2 | FileCheck %s --check-prefix=DATA !ELF diff --git a/llvm/test/tools/llvm-objcopy/ELF/strip-symbol.test b/llvm/test/tools/llvm-objcopy/ELF/strip-symbol.test index 1b5a6819895..ab5fee2c271 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/strip-symbol.test +++ b/llvm/test/tools/llvm-objcopy/ELF/strip-symbol.test @@ -1,6 +1,6 @@ # RUN: yaml2obj %s > %t # RUN: llvm-objcopy --strip-symbol baz -N bar %t %t2 -# RUN: llvm-readobj -symbols -sections %t2 | FileCheck %s +# RUN: llvm-readobj --symbols --sections %t2 | FileCheck %s !ELF FileHeader: diff --git a/llvm/test/tools/llvm-objcopy/ELF/strip-unneeded.test b/llvm/test/tools/llvm-objcopy/ELF/strip-unneeded.test index 8f96035e095..6d5682f2861 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/strip-unneeded.test +++ b/llvm/test/tools/llvm-objcopy/ELF/strip-unneeded.test @@ -3,7 +3,7 @@ # RUN: llvm-objcopy --strip-unneeded %t %t2 # Verify that llvm-objcopy has not modified the input. # RUN: cmp %t %t1 -# RUN: llvm-readobj -symbols %t2 | FileCheck %s +# RUN: llvm-readobj --symbols %t2 | FileCheck %s # Verify that llvm-strip modifies the symbol table the same way. # RUN: llvm-strip --strip-unneeded %t diff --git a/llvm/test/tools/llvm-objcopy/ELF/symbol-copy.test b/llvm/test/tools/llvm-objcopy/ELF/symbol-copy.test index 3e346701fb9..43328680adf 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/symbol-copy.test +++ b/llvm/test/tools/llvm-objcopy/ELF/symbol-copy.test @@ -1,6 +1,6 @@ # RUN: yaml2obj %s > %t # RUN: llvm-objcopy %t %t2 -# RUN: llvm-readobj -symbols %t2 | FileCheck %s +# RUN: llvm-readobj --symbols %t2 | FileCheck %s !ELF FileHeader: diff --git a/llvm/test/tools/llvm-objcopy/ELF/symtab-link.test b/llvm/test/tools/llvm-objcopy/ELF/symtab-link.test index 7ed895e1c62..7693bfc37ec 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/symtab-link.test +++ b/llvm/test/tools/llvm-objcopy/ELF/symtab-link.test @@ -1,9 +1,9 @@ # RUN: yaml2obj %s > %t # RUN: llvm-objcopy %t %t2 -# RUN: llvm-readobj -sections %t2 | FileCheck %s +# RUN: llvm-readobj --sections %t2 | FileCheck %s # RUN: cp %t %t3 # RUN: llvm-strip --strip-debug %t3 -# RUN: llvm-readobj -sections %t3 | FileCheck %s +# RUN: llvm-readobj --sections %t3 | FileCheck %s !ELF FileHeader: diff --git a/llvm/test/tools/llvm-objcopy/ELF/two-seg-remove-end.test b/llvm/test/tools/llvm-objcopy/ELF/two-seg-remove-end.test index f78a96410c1..20c2689ec88 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/two-seg-remove-end.test +++ b/llvm/test/tools/llvm-objcopy/ELF/two-seg-remove-end.test @@ -1,7 +1,7 @@ # RUN: yaml2obj %s -o %t # RUN: llvm-objcopy -R .text4 -O binary %t %t2 # RUN: od -Ax -v -t x1 %t2 | FileCheck %s -# RUN: wc -c %t2 | FileCheck %s -check-prefix=SIZE +# RUN: wc -c %t2 | FileCheck %s --check-prefix=SIZE !ELF FileHeader: diff --git a/llvm/test/tools/llvm-objcopy/ELF/two-seg-remove-first.test b/llvm/test/tools/llvm-objcopy/ELF/two-seg-remove-first.test index 7d0ffefbb81..a541fc69155 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/two-seg-remove-first.test +++ b/llvm/test/tools/llvm-objcopy/ELF/two-seg-remove-first.test @@ -1,7 +1,7 @@ # RUN: yaml2obj %s -o %t # RUN: llvm-objcopy -R .text -O binary %t %t2 # RUN: od -Ax -v -t x1 %t2 | FileCheck %s -# RUN: wc -c %t2 | FileCheck %s -check-prefix=SIZE +# RUN: wc -c %t2 | FileCheck %s --check-prefix=SIZE !ELF FileHeader: diff --git a/llvm/test/tools/llvm-objcopy/ELF/two-seg-remove-third-sec.test b/llvm/test/tools/llvm-objcopy/ELF/two-seg-remove-third-sec.test index bedd4aac6ae..254273d55e7 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/two-seg-remove-third-sec.test +++ b/llvm/test/tools/llvm-objcopy/ELF/two-seg-remove-third-sec.test @@ -1,7 +1,7 @@ # RUN: yaml2obj %s -o %t # RUN: llvm-objcopy -R .text3 -O binary %t %t2 # RUN: od -Ax -v -t x1 %t2 | FileCheck %s -# RUN: wc -c %t2 | FileCheck %s -check-prefix=SIZE +# RUN: wc -c %t2 | FileCheck %s --check-prefix=SIZE !ELF FileHeader: diff --git a/llvm/test/tools/llvm-objcopy/ELF/weaken-all.test b/llvm/test/tools/llvm-objcopy/ELF/weaken-all.test index c9a7e5a258f..6107d370adc 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/weaken-all.test +++ b/llvm/test/tools/llvm-objcopy/ELF/weaken-all.test @@ -1,6 +1,6 @@ # RUN: yaml2obj %s > %t # RUN: llvm-objcopy --weaken %t %t2 -# RUN: llvm-readobj -symbols %t2 | FileCheck %s +# RUN: llvm-readobj --symbols %t2 | FileCheck %s !ELF FileHeader: diff --git a/llvm/test/tools/llvm-objcopy/ELF/weaken.test b/llvm/test/tools/llvm-objcopy/ELF/weaken.test index b833ff62a21..6f12b8336ab 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/weaken.test +++ b/llvm/test/tools/llvm-objcopy/ELF/weaken.test @@ -1,6 +1,6 @@ # RUN: yaml2obj %s > %t # RUN: llvm-objcopy --weaken-symbol Global -W Local -W Weak %t %t2 -# RUN: llvm-readobj -symbols %t2 | FileCheck %s +# RUN: llvm-readobj --symbols %t2 | FileCheck %s !ELF FileHeader: |