diff options
author | Jordan Rupprecht <rupprecht@google.com> | 2019-02-21 17:05:19 +0000 |
---|---|---|
committer | Jordan Rupprecht <rupprecht@google.com> | 2019-02-21 17:05:19 +0000 |
commit | ad29d29130a62f71bc0b00e8743f5fb6e1e41258 (patch) | |
tree | 5b4d99389cd313ff69493e4730a4e1aaabb2898b /llvm/test/tools | |
parent | 1ed3a0467c93817f669ece91bf008e3997e98230 (diff) | |
download | bcm5719-llvm-ad29d29130a62f71bc0b00e8743f5fb6e1e41258.tar.gz bcm5719-llvm-ad29d29130a62f71bc0b00e8743f5fb6e1e41258.zip |
[llvm-objcopy][NFC] More error cleanup
Summary:
This removes calls to `error()`/`reportError()` in the main driver (llvm-objcopy.cpp) as well as the associated argv-parsing (CopyConfig.cpp). `logAllUnhandledErrors()` is now the main way to print errors.
There are still a few uses from within the per-arch drivers, so we can't delete them yet... but almost!
Reviewers: jhenderson, alexshap, espindola
Reviewed By: jhenderson
Subscribers: emaste, arichardson, jakehehrlich, jdoerfert, llvm-commits
Tags: #llvm
Differential Revision: https://reviews.llvm.org/D58316
llvm-svn: 354600
Diffstat (limited to 'llvm/test/tools')
9 files changed, 11 insertions, 11 deletions
diff --git a/llvm/test/tools/llvm-objcopy/ELF/bad-output-format.test b/llvm/test/tools/llvm-objcopy/ELF/bad-output-format.test index e01d955111b..f190a16a2b5 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/bad-output-format.test +++ b/llvm/test/tools/llvm-objcopy/ELF/bad-output-format.test @@ -10,4 +10,4 @@ FileHeader: Type: ET_EXEC Machine: EM_386 -# BAD-OUTPUT-FORMAT: Invalid output format: 'xyz'. +# BAD-OUTPUT-FORMAT: Invalid output format: 'xyz' diff --git a/llvm/test/tools/llvm-objcopy/ELF/binary-input-error.test b/llvm/test/tools/llvm-objcopy/ELF/binary-input-error.test index 820e569ad7b..4b7736e1900 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/binary-input-error.test +++ b/llvm/test/tools/llvm-objcopy/ELF/binary-input-error.test @@ -6,5 +6,5 @@ # RUN: not llvm-objcopy -I binary -B xyz %t.txt %t.o 2>&1 \ # RUN: | FileCheck %s --check-prefix=BAD-BINARY-ARCH -# MISSING-BINARY-ARCH: Specified binary input without specifiying an architecture. -# BAD-BINARY-ARCH: Invalid architecture: 'xyz'. +# MISSING-BINARY-ARCH: Specified binary input without specifiying an architecture +# BAD-BINARY-ARCH: Invalid architecture: 'xyz' diff --git a/llvm/test/tools/llvm-objcopy/ELF/compress-and-decompress-debug-sections-error.test b/llvm/test/tools/llvm-objcopy/ELF/compress-and-decompress-debug-sections-error.test index 0866e2009e9..aac9bb3042f 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/compress-and-decompress-debug-sections-error.test +++ b/llvm/test/tools/llvm-objcopy/ELF/compress-and-decompress-debug-sections-error.test @@ -3,5 +3,5 @@ # RUN: yaml2obj %p/Inputs/compress-debug-sections.yaml -o %t.o # RUN: not llvm-objcopy --compress-debug-sections=zlib --decompress-debug-sections %t.o 2>&1 | FileCheck %s -# CHECK: Cannot specify --compress-debug-sections at the same time as --decompress-debug-sections at the same time. +# CHECK: Cannot specify --compress-debug-sections at the same time as --decompress-debug-sections at the same time diff --git a/llvm/test/tools/llvm-objcopy/ELF/compress-debug-sections-invalid-format.test b/llvm/test/tools/llvm-objcopy/ELF/compress-debug-sections-invalid-format.test index 854dfe26560..8aa8ab4f293 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/compress-debug-sections-invalid-format.test +++ b/llvm/test/tools/llvm-objcopy/ELF/compress-debug-sections-invalid-format.test @@ -1,5 +1,5 @@ # RUN: yaml2obj %p/Inputs/compress-debug-sections.yaml -o %t.o # RUN: not llvm-objcopy --compress-debug-sections=zlib-fake %t.o 2>&1 | FileCheck %s -# CHECK: Invalid or unsupported --compress-debug-sections format: zlib-fake. +# CHECK: Invalid or unsupported --compress-debug-sections format: zlib-fake diff --git a/llvm/test/tools/llvm-objcopy/ELF/input-output-target.test b/llvm/test/tools/llvm-objcopy/ELF/input-output-target.test index 7a7df9fd503..0661aca7bc9 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/input-output-target.test +++ b/llvm/test/tools/llvm-objcopy/ELF/input-output-target.test @@ -19,4 +19,4 @@ # RUN: %t.txt %t.4.txt 2>&1 \ # RUN: | FileCheck %s --check-prefix=BAD-FLAG -# BAD-FLAG: --target cannot be used with --input-target or --output-target. +# BAD-FLAG: --target cannot be used with --input-target or --output-target 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 75f35af4b30..3215f4abd35 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/rename-section-flag.test +++ b/llvm/test/tools/llvm-objcopy/ELF/rename-section-flag.test @@ -57,4 +57,4 @@ Sections: # WRITE-NEXT: SHF_WRITE (0x1) # CHECK-NEXT: ] -# BAD-FLAG: Unrecognized section flag 'xyzzy'. Flags supported for GNU compatibility: alloc, load, noload, readonly, debug, code, data, rom, share, contents, merge, strings. +# BAD-FLAG: Unrecognized section flag 'xyzzy'. Flags supported for GNU compatibility: alloc, load, noload, readonly, debug, code, data, rom, share, contents, merge, strings diff --git a/llvm/test/tools/llvm-objcopy/ELF/set-section-flags-and-rename.test b/llvm/test/tools/llvm-objcopy/ELF/set-section-flags-and-rename.test index 88f7243f4ca..15ea3aeec16 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/set-section-flags-and-rename.test +++ b/llvm/test/tools/llvm-objcopy/ELF/set-section-flags-and-rename.test @@ -10,5 +10,5 @@ FileHeader: Type: ET_REL Machine: EM_X86_64 -# SET-FOO: --set-section-flags=.foo conflicts with --rename-section=.foo=.bar. -# SET-BAR: --set-section-flags=.bar conflicts with --rename-section=.foo=.bar. +# SET-FOO: --set-section-flags=.foo conflicts with --rename-section=.foo=.bar +# SET-BAR: --set-section-flags=.bar conflicts with --rename-section=.foo=.bar diff --git a/llvm/test/tools/llvm-objcopy/ELF/set-section-flags.test b/llvm/test/tools/llvm-objcopy/ELF/set-section-flags.test index 6fde33e0749..3af3f1b8b13 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/set-section-flags.test +++ b/llvm/test/tools/llvm-objcopy/ELF/set-section-flags.test @@ -65,4 +65,4 @@ Sections: # BAD-FORMAT: Bad format for --set-section-flags: missing '=' # MULTIPLE-SETS: --set-section-flags set multiple times for section .foo -# BAD-FLAG: Unrecognized section flag 'xyzzy'. Flags supported for GNU compatibility: alloc, load, noload, readonly, debug, code, data, rom, share, contents, merge, strings. +# BAD-FLAG: Unrecognized section flag 'xyzzy'. Flags supported for GNU compatibility: alloc, load, noload, readonly, debug, code, data, rom, share, contents, merge, strings 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 9aef8728443..dcbd57e1f3d 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/strip-multiple-files.test +++ b/llvm/test/tools/llvm-objcopy/ELF/strip-multiple-files.test @@ -72,4 +72,4 @@ Symbols: # CHECK-NEXT: } # CHECK-NEXT: ] -# BAD-O-FLAG: Multiple input files cannot be used in combination with -o. +# BAD-O-FLAG: Multiple input files cannot be used in combination with -o |