[llvm-objcopy] Changed command line parsing errors
Summary: Tidied up errors during command line parsing to be more consistent with the rest of llvm-objcopy errors.
Reviewers: jhenderson, rupprecht, espindola, alexshap
Reviewed By: jhenderson, rupprecht
Subscribers: emaste, arichardson, MaskRay, llvm-commits, jakehehrlich
Tags: #llvm
Differential Revision: https://reviews.llvm.org/D62973
llvm-svn: 363350
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 c24413a..932584c 100644
--- a/llvm/test/tools/llvm-objcopy/ELF/bad-output-format.test
+++ b/llvm/test/tools/llvm-objcopy/ELF/bad-output-format.test
@@ -15,5 +15,5 @@
Type: ET_EXEC
Machine: EM_386
-# BAD-OUTPUT-FORMAT: Invalid output format: 'xyz'
-# BAD-OUTPUT-FORMAT-BSD: Invalid output format: 'xyz-freebsd'
+# BAD-OUTPUT-FORMAT: invalid output format: 'xyz'
+# BAD-OUTPUT-FORMAT-BSD: invalid output format: 'xyz-freebsd'
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 4b7736e..08cc22c 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 aac9bb3..6fd3f0b 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 both --compress-debug-sections and --decompress-debug-sections
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 8aa8ab4..ae801dc 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/help-message.test b/llvm/test/tools/llvm-objcopy/ELF/help-message.test
index b0e9cf6..2f199a3 100644
--- a/llvm/test/tools/llvm-objcopy/ELF/help-message.test
+++ b/llvm/test/tools/llvm-objcopy/ELF/help-message.test
@@ -16,4 +16,4 @@
# OBJCOPY-USAGE: USAGE: llvm-objcopy
# STRIP-USAGE: USAGE: llvm-strip
# UNKNOWN-ARG: unknown argument '{{-+}}abcabc'
-# NO-INPUT-FILES: No input file specified
+# NO-INPUT-FILES: no input file specified
diff --git a/llvm/test/tools/llvm-objcopy/ELF/redefine-symbol.test b/llvm/test/tools/llvm-objcopy/ELF/redefine-symbol.test
index 78dd853..e6d52f8 100644
--- a/llvm/test/tools/llvm-objcopy/ELF/redefine-symbol.test
+++ b/llvm/test/tools/llvm-objcopy/ELF/redefine-symbol.test
@@ -88,8 +88,8 @@
#CHECK-NEXT: Section: .text
#CHECK-NEXT: }
-#BAD-FORMAT: Bad format for --redefine-sym
-#MULTIPLE-REDEFINITION: Multiple redefinition of symbol foo
+#BAD-FORMAT: bad format for --redefine-sym
+#MULTIPLE-REDEFINITION: multiple redefinition of symbol 'foo'
#MISSING-SYM-NAME: error: {{.*}}.rename.txt:2: missing new symbol name
#NO-FILE: error: '{{.*}}.rename-none.txt': {{[Nn]}}o such file or directory
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 206e8b4..0dbdbcc 100644
--- a/llvm/test/tools/llvm-objcopy/ELF/rename-section-flag.test
+++ b/llvm/test/tools/llvm-objcopy/ELF/rename-section-flag.test
@@ -95,4 +95,4 @@
# 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/rename-section.test b/llvm/test/tools/llvm-objcopy/ELF/rename-section.test
index feaec44..3829b5b 100644
--- a/llvm/test/tools/llvm-objcopy/ELF/rename-section.test
+++ b/llvm/test/tools/llvm-objcopy/ELF/rename-section.test
@@ -26,5 +26,5 @@
# CHECK: Name: .strtab
# CHECK: Name: .shstrtab
-#BAD-FORMAT: Bad format for --rename-section: missing '='
-#MULTIPLE-RENAMES: Multiple renames of section .foo
+#BAD-FORMAT: bad format for --rename-section: missing '='
+#MULTIPLE-RENAMES: multiple renames of section '.foo'
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 b312d31..b1f3db4 100644
--- a/llvm/test/tools/llvm-objcopy/ELF/set-section-flags.test
+++ b/llvm/test/tools/llvm-objcopy/ELF/set-section-flags.test
@@ -117,7 +117,7 @@
# WRITE-NEXT: SHF_WRITE (0x1)
# CHECK-NEXT: ]
-# BAD-FORMAT: Bad format for --set-section-flags: missing '='
-# MULTIPLE-SETS: --set-section-flags set multiple times for section .foo
+# 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 f2b6e56..b22974a 100644
--- a/llvm/test/tools/llvm-objcopy/ELF/strip-multiple-files.test
+++ b/llvm/test/tools/llvm-objcopy/ELF/strip-multiple-files.test
@@ -71,4 +71,4 @@
# 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