<div dir="ltr">
<div>Hello<span><span name="Shoaib Meenai via llvm-commits"> Shoaib,
Sameer,</span></span></div><div><span><span name="Shoaib Meenai via llvm-commits"><br></span></span></div><div><span><span name="Shoaib Meenai via llvm-commits">This commit broke test on the lld freebsd builder:<br></span></span></div><div><span><span name="Shoaib Meenai via llvm-commits">
<a href="http://lab.llvm.org:8011/builders/lld-x86_64-freebsd">http://lab.llvm.org:8011/builders/lld-x86_64-freebsd</a></span></span></div><div><span><span name="Shoaib Meenai via llvm-commits">
. . .
</span></span></div><div><span><span name="Shoaib Meenai via llvm-commits">
</span></span><pre><span class="gmail-stdout">******************** TEST 'LLVM :: tools/llvm-ar/error-opening-directory.test' FAILED ********************
Script:
--
: 'RUN: at line 1'; rm -rf /usr/home/buildbot/as-bldslv5/lld-x86_64-freebsd/build/test/tools/llvm-ar/Output/error-opening-directory.test.tmp && mkdir -p /usr/home/buildbot/as-bldslv5/lld-x86_64-freebsd/build/test/tools/llvm-ar/Output/error-opening-directory.test.tmp
: 'RUN: at line 4'; mkdir -p /usr/home/buildbot/as-bldslv5/lld-x86_64-freebsd/build/test/tools/llvm-ar/Output/error-opening-directory.test.tmp/tmpDir
: 'RUN: at line 5'; not /home/buildbot/as-bldslv5/lld-x86_64-freebsd/build/bin/llvm-ar p /usr/home/buildbot/as-bldslv5/lld-x86_64-freebsd/build/test/tools/llvm-ar/Output/error-opening-directory.test.tmp/tmpDir 2>&1 | /home/buildbot/as-bldslv5/lld-x86_64-freebsd/build/bin/FileCheck /usr/home/buildbot/as-bldslv5/lld-x86_64-freebsd/llvm-project/llvm/test/tools/llvm-ar/error-opening-directory.test --check-prefix=IS-DIR -DARCHIVE=/usr/home/buildbot/as-bldslv5/lld-x86_64-freebsd/build/test/tools/llvm-ar/Output/error-opening-directory.test.tmp/tmpDir
--
Exit Code: 1<br>. . . <br></span></pre>
</div><div></div><div>The builder was off line and did not send notifications on this.<br> Please have a look ASAP?<br></div><div><span><span name="Shoaib Meenai via llvm-commits">
</span></span>
</div><div><br></div><div>The first red - 399b12700b41cd58484c23639e61cace819229f6 <a href="http://lab.llvm.org:8011/builders/lld-x86_64-freebsd/builds/39421" target="_blank">http://lab.llvm.org:8011/builders/lld-x86_64-freebsd/builds/39421</a></div><div>Differential Revision: <a href="https://reviews.llvm.org/D80838" target="_blank">https://reviews.llvm.org/D80838</a></div><div><br></div><div>The second red - 99e1b0dc8fbdd35426ac39a98c05718cd482f48a <a href="http://lab.llvm.org:8011/builders/lld-x86_64-freebsd/builds/39414" target="_blank">http://lab.llvm.org:8011/builders/lld-x86_64-freebsd/builds/39414</a></div><div>Differential Revision: <a href="https://reviews.llvm.org/D80846" target="_blank">https://reviews.llvm.org/D80846</a><br></div><div><br></div><div>The last green - b56bf30d3cc15896956061fdbeb6d078b63ec91f - <a href="http://lab.llvm.org:8011/builders/lld-x86_64-freebsd/builds/39411" target="_blank">http://lab.llvm.org:8011/builders/lld-x86_64-freebsd/builds/39411</a></div><div><br></div><div>Thanks</div><div><br></div><div>Galina</div>
</div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Fri, Jun 5, 2020 at 10:39 AM Shoaib Meenai via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><br>
Author: Sameer Arora<br>
Date: 2020-06-05T10:37:26-07:00<br>
New Revision: 99e1b0dc8fbdd35426ac39a98c05718cd482f48a<br>
<br>
URL: <a href="https://github.com/llvm/llvm-project/commit/99e1b0dc8fbdd35426ac39a98c05718cd482f48a" rel="noreferrer" target="_blank">https://github.com/llvm/llvm-project/commit/99e1b0dc8fbdd35426ac39a98c05718cd482f48a</a><br>
DIFF: <a href="https://github.com/llvm/llvm-project/commit/99e1b0dc8fbdd35426ac39a98c05718cd482f48a.diff" rel="noreferrer" target="_blank">https://github.com/llvm/llvm-project/commit/99e1b0dc8fbdd35426ac39a98c05718cd482f48a.diff</a><br>
<br>
LOG: [llvm-ar] Update error messages and tests as per latest preferred style<br>
<br>
It updates two error messages under `performOperation` in the file<br>
llvm-ar.cpp. Furthermore, it also updates tests that print out these<br>
error messages: `llvm/test/Object/ar-create.test` and<br>
`llvm/test/tools/llvm-ar/print.test`.<br>
<br>
Reviewed By: jhenderson, MaskRay<br>
<br>
Differential Revision: <a href="https://reviews.llvm.org/D80846" rel="noreferrer" target="_blank">https://reviews.llvm.org/D80846</a><br>
<br>
Added: <br>
<br>
<br>
Modified: <br>
llvm/test/Object/ar-create.test<br>
llvm/test/tools/llvm-ar/error-opening-directory.test<br>
llvm/test/tools/llvm-ar/error-opening-permission.test<br>
llvm/test/tools/llvm-ar/print.test<br>
llvm/tools/llvm-ar/llvm-ar.cpp<br>
<br>
Removed: <br>
<br>
<br>
<br>
################################################################################<br>
diff --git a/llvm/test/Object/ar-create.test b/llvm/test/Object/ar-create.test<br>
index 4b08c97317a8..07c9ba437359 100644<br>
--- a/llvm/test/Object/ar-create.test<br>
+++ b/llvm/test/Object/ar-create.test<br>
@@ -13,5 +13,5 @@ RUN: rm -f %t.foo.a<br>
RUN: llvm-ar r %t.foo.a %t 2>&1 | FileCheck --check-prefix=CREATE %s<br>
RUN: rm -f %t.foo.a<br>
<br>
-CHECK: llvm-ar{{(.exe|.EXE)?}}: error: error loading '{{[^']+}}.foo.a':<br>
+CHECK: llvm-ar{{(.exe|.EXE)?}}: error: unable to load '{{[^']+}}.foo.a':<br>
CREATE: creating {{.*}}.foo.a<br>
<br>
diff --git a/llvm/test/tools/llvm-ar/error-opening-directory.test b/llvm/test/tools/llvm-ar/error-opening-directory.test<br>
index 63d0c653c37a..10cee214183e 100644<br>
--- a/llvm/test/tools/llvm-ar/error-opening-directory.test<br>
+++ b/llvm/test/tools/llvm-ar/error-opening-directory.test<br>
@@ -5,4 +5,4 @@<br>
# RUN: not llvm-ar p %t/tmpDir 2>&1 | \<br>
# RUN: FileCheck %s --check-prefix=IS-DIR -DARCHIVE=%t/tmpDir<br>
<br>
-# IS-DIR: error: error opening '[[ARCHIVE]]': {{[iI]}}s a directory<br>
+# IS-DIR: error: unable to open '[[ARCHIVE]]': {{[iI]}}s a directory<br>
<br>
diff --git a/llvm/test/tools/llvm-ar/error-opening-permission.test b/llvm/test/tools/llvm-ar/error-opening-permission.test<br>
index e78e76cd9513..00f80c0a1848 100644<br>
--- a/llvm/test/tools/llvm-ar/error-opening-permission.test<br>
+++ b/llvm/test/tools/llvm-ar/error-opening-permission.test<br>
@@ -11,4 +11,4 @@<br>
# RUN: not llvm-ar p %t/permission.b 2>&1 | \<br>
# RUN: FileCheck %s --check-prefix=NO-PERMISSION -DARCHIVE=%t/permission.b<br>
<br>
-# NO-PERMISSION: error: error opening '[[ARCHIVE]]': {{[pP]}}ermission denied<br>
+# NO-PERMISSION: error: unable to open '[[ARCHIVE]]': {{[pP]}}ermission denied<br>
<br>
diff --git a/llvm/test/tools/llvm-ar/print.test b/llvm/test/tools/llvm-ar/print.test<br>
index 847040f419b4..247a3d44022f 100644<br>
--- a/llvm/test/tools/llvm-ar/print.test<br>
+++ b/llvm/test/tools/llvm-ar/print.test<br>
@@ -75,7 +75,7 @@<br>
# RUN: not llvm-ar p %t/missing.a 2>&1 \<br>
# RUN: | FileCheck %s --check-prefix=MISSING-ARCHIVE -DARCHIVE=%t/missing.a<br>
<br>
-# MISSING-ARCHIVE: error: error loading '[[ARCHIVE]]': {{[nN]}}o such file or directory<br>
+# MISSING-ARCHIVE: error: unable to load '[[ARCHIVE]]': {{[nN]}}o such file or directory<br>
<br>
## Member does not exist:<br>
# RUN: not llvm-ar p %t/archive.a %t-missing.txt 2>&1 \<br>
<br>
diff --git a/llvm/tools/llvm-ar/llvm-ar.cpp b/llvm/tools/llvm-ar/llvm-ar.cpp<br>
index 652219568db1..d699d4323f0a 100644<br>
--- a/llvm/tools/llvm-ar/llvm-ar.cpp<br>
+++ b/llvm/tools/llvm-ar/llvm-ar.cpp<br>
@@ -520,7 +520,7 @@ static std::string normalizePath(StringRef Path) {<br>
<br>
static bool comparePaths(StringRef Path1, StringRef Path2) {<br>
// When on Windows this function calls CompareStringOrdinal<br>
-// as Windows file paths are case-insensitive. <br>
+// as Windows file paths are case-insensitive.<br>
// CompareStringOrdinal compares two Unicode strings for<br>
// binary equivalence and allows for case insensitivity.<br>
#ifdef _WIN32<br>
@@ -999,7 +999,7 @@ static int performOperation(ArchiveOperation Operation,<br>
MemoryBuffer::getFile(ArchiveName, -1, false);<br>
std::error_code EC = Buf.getError();<br>
if (EC && EC != errc::no_such_file_or_directory)<br>
- fail("error opening '" + ArchiveName + "': " + EC.message());<br>
+ fail("unable to open '" + ArchiveName + "': " + EC.message());<br>
<br>
if (!EC) {<br>
Error Err = Error::success();<br>
@@ -1014,7 +1014,7 @@ static int performOperation(ArchiveOperation Operation,<br>
assert(EC == errc::no_such_file_or_directory);<br>
<br>
if (!shouldCreateArchive(Operation)) {<br>
- failIfError(EC, Twine("error loading '") + ArchiveName + "'");<br>
+ failIfError(EC, Twine("unable to load '") + ArchiveName + "'");<br>
} else {<br>
if (!Create) {<br>
// Produce a warning if we should and we're creating the archive<br>
@@ -1100,9 +1100,9 @@ static void runMRIScript() {<br>
fail("unknown command: " + CommandStr);<br>
}<br>
}<br>
- <br>
+<br>
ParsingMRIScript = false;<br>
- <br>
+<br>
// Nothing to do if not saved.<br>
if (Saved)<br>
performOperation(ReplaceOrInsert, &NewMembers);<br>
<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a><br>
<a href="https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div>