[llvm-nm] Tidy up error messages

[jhenderson]

Summary

This adds colons to separate the file name from the message, removes a duplicate space, and removes a trailing full stop from some messages. help bring the error messages into line with other tools, as well as making all llvm-nm message more self-consistent.

[Higuoxing]

LGTM. Thanks!

llvm/test/Object/macho-invalid.test

 
 RUN: not llvm-objdump --macho --private-headers --arch=all %p/Inputs/macho-invalid-fat.obj.elf-x86_64 2>&1 | FileCheck --check-prefix=INVALID-FAT-ELF %s
 INVALID-FAT-ELF: error: '{{.*}}/macho-invalid-fat.obj.elf-x86_64': Mach-O universal file for architecture x86_64 is not a Mach-O file or an archive file
 
 RUN: not llvm-objdump --macho --private-headers %p/Inputs/macho-invalid-segment-fileoff 2>&1 | FileCheck --check-prefix=INVALID-SEGMENT-FILEOFF %s
 INVALID-SEGMENT-FILEOFF: macho-invalid-segment-fileoff': truncated or malformed object (load command 0 fileoff field in LC_SEGMENT extends past the end of the file)
 
 RUN: not llvm-nm %p/Inputs/macho-invalid-segment-fileoff 2>&1 | FileCheck -check-prefix INVALID-SEGMENT-FILEOFF-NM %s
-INVALID-SEGMENT-FILEOFF-NM: macho-invalid-segment-fileoff truncated or malformed object (load command 0 fileoff field in LC_SEGMENT extends past the end of the file)
+INVALID-SEGMENT-FILEOFF-NM: macho-invalid-segment-fileoff: truncated or malformed object (load command 0 fileoff field in LC_SEGMENT extends past the end of the file)
 
 RUN: not llvm-size %p/Inputs/macho-invalid-segment-fileoff 2>&1 | FileCheck -DFILE=%p/Inputs/macho-invalid-segment-fileoff -check-prefix INVALID-SEGMENT-FILEOFF-SIZE %s
 INVALID-SEGMENT-FILEOFF-SIZE: error: '[[FILE]]': truncated or malformed object (load command 0 fileoff field in LC_SEGMENT extends past the end of the file)
 
 RUN: not llvm-objdump --macho --private-headers %p/Inputs/macho-invalid-segment-filesize 2>&1 | FileCheck --check-prefix=INVALID-SEGMENT-FILESIZE %s
 INVALID-SEGMENT-FILESIZE: macho-invalid-segment-filesize': truncated or malformed object (load command 0 fileoff field plus filesize field in LC_SEGMENT extends past the end of the file)
 
 RUN: not llvm-objdump --macho --private-headers %p/Inputs/macho-invalid-segment-vmsize 2>&1 | FileCheck --check-prefix=INVALID-SEGMENT-VMSIZE %s

llvm/test/Object/nm-archive.test

 Don't reject an empty archive.
 RUN: llvm-nm %p/Inputs/archive-test.a-empty
 
 This archive has an unaligned member and a unknown format member.
 GNU AR is able to parse the unaligned member and warns about the member with
 the unknown format. We should probably simply warn on both. For now we just
 produce an error for the unknown format.
 RUN: not llvm-nm %p/Inputs/corrupt-archive.a 2>&1 | FileCheck %s -check-prefix CORRUPT
-CORRUPT: corrupt-archive.a(trivial-object-test2.elf-x86-64) Insufficient alignment
+CORRUPT: corrupt-archive.a(trivial-object-test2.elf-x86-64): Insufficient alignment
 
 
 RUN: llvm-nm %p/Inputs/thin.a | FileCheck %s -check-prefix THIN
 
 THIN: IsNAN.o:
 THIN: 00000014 T _ZN4llvm5IsNANEd
 THIN: 00000000 T _ZN4llvm5IsNANEf
 THIN:          U __isnan
 THIN:          U __isnanf

llvm/test/Object/nm-shared-object.test

 # ELF-64: 0000000000000000 D tls_sym
 
 # RUN: not llvm-nm -D %p/Inputs/weak-global-symbol.macho-i386 2>&1 \
 # RUN:         | FileCheck %s -check-prefix ERROR
 
 # RUN: not llvm-nm -D %p/Inputs/trivial-object-test.coff-i386 2>&1 \
 # RUN:         | FileCheck %s -check-prefix ERROR
 
-# ERROR: File format has no dynamic symbol table.
+# ERROR: File format has no dynamic symbol table
 
 # RUN: yaml2obj %s -o %t.elf-i386
 # RUN: llvm-nm -D %t.elf-i386 2>&1 | FileCheck %s -check-prefix=NO-SYMBOLS
 
 # NO-SYMBOLS: no symbols
 
 --- !ELF
 FileHeader:
   Class:   ELFCLASS32
   Data:    ELFDATA2LSB
   Type:    ET_REL
   Machine: EM_386
 Symbols:
   - Name:    foo
     Binding: STB_GLOBAL

llvm/test/Object/nm-tapi-invalids.test

 RUN: not llvm-nm %p/Inputs/tapi-invalid-v1.tbd 2>&1\
 RUN:          | FileCheck %s -check-prefix V1 
 
 RUN: not llvm-nm %p/Inputs/tapi-invalid-v2.tbd 2>&1\
 RUN:          | FileCheck %s -check-prefix V2
 
 RUN: not llvm-nm %p/Inputs/tapi-invalid-v3.tbd 2>&1\
 RUN:          | FileCheck %s -check-prefix V3
 
 # Typo Check
-V1: tapi-invalid-v1.tbd malformed file
+V1: tapi-invalid-v1.tbd: malformed file
 V1-NEXT: tapi-invalid-v1.tbd:11:1: error: unknown key 'expors'
 
 # Missing required key
-V2: tapi-invalid-v2.tbd malformed file
+V2: tapi-invalid-v2.tbd: malformed file
 V2-NEXT: tapi-invalid-v2.tbd:2:1: error: missing required key 'archs'
 
 # v2 key in v3 specified file
-V3: tapi-invalid-v3.tbd malformed file
+V3: tapi-invalid-v3.tbd: malformed file
 V3-NEXT: tapi-invalid-v3.tbd:19:1: error: unknown key 'swift-version'

llvm/test/tools/llvm-nm/dynamic.test

 ## Case 4: check we report a warning when we are unable to get symbol flags.
 ## In this case the dynamic symbol table has a wrong sh_entsize and we can't read a symbol.
 
 # RUN: yaml2obj --docnum=4 -DENTSIZE=0xff %s -o %t4-broken-dynsym.o
 # RUN: not llvm-nm --dynamic %t4-broken-dynsym.o 2>&1 | \
 # RUN:   FileCheck %s -DFILE=%t4-broken-dynsym.o --check-prefix=VERSION-ERR4
 
 # VERSION-ERR4: warning: unable to read symbol versions: unable to read flags for symbol with index 1: section [index 4] has invalid sh_entsize: expected 24, but got 255
-# VERSION-ERR4: error: [[FILE]] section [index 4] has invalid sh_entsize: expected 24, but got 255
+# VERSION-ERR4: error: [[FILE]]: section [index 4] has invalid sh_entsize: expected 24, but got 255

llvm/test/tools/llvm-nm/invalid-input.test

 RUN: not llvm-nm %s 2>&1 | FileCheck %s -check-prefix=UNKNOWN_FILE_TYPE
-UNKNOWN_FILE_TYPE: {{.*}}invalid-input.test The file was not recognized as a valid object file
+UNKNOWN_FILE_TYPE: {{.*}}invalid-input.test: The file was not recognized as a valid object file

llvm/tools/llvm-nm/llvm-nm.cpp

 
 bool HadError = false;
 
 std::string ToolName;
 } // anonymous namespace
 
 static void error(Twine Message, Twine Path = Twine()) {
   HadError = true;
-  WithColor::error(errs(), ToolName) << Path << ": " << Message << ".\n";
+  WithColor::error(errs(), ToolName) << Path << ": " << Message << "\n";
 }
 
 static bool error(std::error_code EC, Twine Path = Twine()) {
   if (EC) {
     error(EC.message(), Path);
     return true;
   }
   return false;
static void error(llvm::Error E, StringRef FileName, const Archive::Child &C,
   // archive instead of "???" as the name.
   if (!NameOrErr) {
     consumeError(NameOrErr.takeError());
     errs() << "(" << "???" << ")";
   } else
     errs() << "(" << NameOrErr.get() << ")";
 
   if (!ArchitectureName.empty())
-    errs() << " (for architecture " << ArchitectureName << ") ";
+    errs() << " (for architecture " << ArchitectureName << ")";
 
   std::string Buf;
   raw_string_ostream OS(Buf);
   logAllUnhandledErrors(std::move(E), OS);
   OS.flush();
-  errs() << " " << Buf << "\n";
+  errs() << ": " << Buf << "\n";
 }
 
 // This version of error() prints the file name and which architecture slice it
 // is from, for example: "foo.o (for architecture i386)" after the ToolName
 // before the error message.  It sets HadError but returns allowing the code to
 // move on to other architecture slices.
 static void error(llvm::Error E, StringRef FileName,
                   StringRef ArchitectureName = StringRef()) {
   HadError = true;
   WithColor::error(errs(), ToolName) << FileName;
 
   if (!ArchitectureName.empty())
-    errs() << " (for architecture " << ArchitectureName << ") ";
+    errs() << " (for architecture " << ArchitectureName << ")";
 
   std::string Buf;
   raw_string_ostream OS(Buf);
   logAllUnhandledErrors(std::move(E), OS);
   OS.flush();
-  errs() << " " << Buf << "\n";
+  errs() << ": " << Buf << "\n";
 }
 
 namespace {
 struct NMSymbol {
   uint64_t Address;
   uint64_t Size;
   char TypeChar;
   std::string Name;