[PATCH] D80846: [llvm-ar] Update error messages and tests as per latest preferred style

[Sameer Arora via Phabricator via llvm-commits]

sameerarora101 updated this revision to Diff 267973.
sameerarora101 added a comment.

Rebasing on new D80838 <https://reviews.llvm.org/D80838>.


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D80846/new/

https://reviews.llvm.org/D80846

Files:
  llvm/test/Object/ar-create.test
  llvm/test/tools/llvm-ar/error-opening-archive.test
  llvm/test/tools/llvm-ar/print.test
  llvm/tools/llvm-ar/llvm-ar.cpp


Index: llvm/tools/llvm-ar/llvm-ar.cpp
===================================================================
--- llvm/tools/llvm-ar/llvm-ar.cpp
+++ llvm/tools/llvm-ar/llvm-ar.cpp
@@ -520,7 +520,7 @@
 
 static bool comparePaths(StringRef Path1, StringRef Path2) {
 // When on Windows this function calls CompareStringOrdinal
-// as Windows file paths are case-insensitive. 
+// as Windows file paths are case-insensitive.
 // CompareStringOrdinal compares two Unicode strings for
 // binary equivalence and allows for case insensitivity.
 #ifdef _WIN32
@@ -999,7 +999,7 @@
       MemoryBuffer::getFile(ArchiveName, -1, false);
   std::error_code EC = Buf.getError();
   if (EC && EC != errc::no_such_file_or_directory)
-    fail("error opening '" + ArchiveName + "': " + EC.message());
+    fail("unable to open '" + ArchiveName + "': " + EC.message());
 
   if (!EC) {
     Error Err = Error::success();
@@ -1014,7 +1014,7 @@
   assert(EC == errc::no_such_file_or_directory);
 
   if (!shouldCreateArchive(Operation)) {
-    failIfError(EC, Twine("error loading '") + ArchiveName + "'");
+    failIfError(EC, Twine("unable to load '") + ArchiveName + "'");
   } else {
     if (!Create) {
       // Produce a warning if we should and we're creating the archive
@@ -1100,9 +1100,9 @@
       fail("unknown command: " + CommandStr);
     }
   }
-  
+
   ParsingMRIScript = false;
-  
+
   // Nothing to do if not saved.
   if (Saved)
     performOperation(ReplaceOrInsert, &NewMembers);
Index: llvm/test/tools/llvm-ar/print.test
===================================================================
--- llvm/test/tools/llvm-ar/print.test
+++ llvm/test/tools/llvm-ar/print.test
@@ -75,7 +75,7 @@
 # RUN: not llvm-ar p %t/missing.a 2>&1 \
 # RUN:   | FileCheck %s --check-prefix=MISSING-ARCHIVE -DARCHIVE=%t/missing.a
 
-# MISSING-ARCHIVE: error: error loading '[[ARCHIVE]]': {{[nN]}}o such file or directory
+# MISSING-ARCHIVE: error: unable to load '[[ARCHIVE]]': {{[nN]}}o such file or directory
 
 ## Member does not exist:
 # RUN: not llvm-ar p %t/archive.a %t-missing.txt 2>&1 \
Index: llvm/test/tools/llvm-ar/error-opening-archive.test
===================================================================
--- llvm/test/tools/llvm-ar/error-opening-archive.test
+++ llvm/test/tools/llvm-ar/error-opening-archive.test
@@ -9,11 +9,11 @@
 # RUN: not llvm-ar p %t/permission.b 2>&1 \
 # RUN:   | FileCheck %s --check-prefix=NO-PERMISSION -DARCHIVE=%t/permission.b
 
-# NO-PERMISSION: error: error opening '[[ARCHIVE]]': Permission denied
+# NO-PERMISSION: error: unable to open '[[ARCHIVE]]': Permission denied
 
 ## Passing in a directory:
 # RUN: mkdir -p %t/tmpDir
 # RUN: not llvm-ar p %t/tmpDir 2>&1 \
 # RUN:    | FileCheck %s --check-prefix=IS-DIR -DARCHIVE=%t/tmpDir
 
-# IS-DIR: error: error opening '[[ARCHIVE]]': {{[iI]}}s a directory
+# IS-DIR: error: unable to open '[[ARCHIVE]]': {{[iI]}}s a directory
Index: llvm/test/Object/ar-create.test
===================================================================
--- llvm/test/Object/ar-create.test
+++ llvm/test/Object/ar-create.test
@@ -13,5 +13,5 @@
 RUN: llvm-ar r %t.foo.a %t 2>&1 | FileCheck --check-prefix=CREATE %s
 RUN: rm -f %t.foo.a
 
-CHECK: llvm-ar{{(.exe|.EXE)?}}: error: error loading '{{[^']+}}.foo.a':
+CHECK: llvm-ar{{(.exe|.EXE)?}}: error: unable to load '{{[^']+}}.foo.a':
 CREATE: creating {{.*}}.foo.a


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D80846.267973.patch
Type: text/x-patch
Size: 3374 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200602/b61aa05d/attachment.bin>