<div dir="ltr">I get an order problem with the test on our internal testing infrastructure. Putting a "sort" in fixes it (submitted fix in r184535).<div style><br></div><div style>Thanks,</div><div style>/Manuel</div>
</div><div class="gmail_extra"><br><br><div class="gmail_quote">On Thu, Jun 20, 2013 at 8:30 PM, Rafael Espindola <span dir="ltr"><<a href="mailto:rafael.espindola@gmail.com" target="_blank">rafael.espindola@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: rafael<br>
Date: Thu Jun 20 13:30:37 2013<br>
New Revision: 184448<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=184448&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=184448&view=rev</a><br>
Log:<br>
Use only the filename when deciding if a file is a duplicate.<br>
<br>
Matches gnu ar behavior.<br>
<br>
Modified:<br>
    llvm/trunk/test/Archive/directory.ll<br>
    llvm/trunk/tools/llvm-ar/llvm-ar.cpp<br>
<br>
Modified: llvm/trunk/test/Archive/directory.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Archive/directory.ll?rev=184448&r1=184447&r2=184448&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Archive/directory.ll?rev=184448&r1=184447&r2=184448&view=diff</a><br>

==============================================================================<br>
--- llvm/trunk/test/Archive/directory.ll (original)<br>
+++ llvm/trunk/test/Archive/directory.ll Thu Jun 20 13:30:37 2013<br>
@@ -4,7 +4,9 @@<br>
 ;RUN: rm -f %T/test.a<br>
 ;RUN: touch %T/a-very-long-file-name<br>
 ;RUN: llvm-ar r %T/test.a %s %T/a-very-long-file-name<br>
+;RUN: llvm-ar r %T/test.a %T/a-very-long-file-name<br>
 ;RUN: llvm-ar t %T/test.a | FileCheck -check-prefix=MEMBERS %s<br>
 ;MEMBERS-NOT: /<br>
 ;MEMBERS: a-very-long-file-name<br>
 ;MEMBERS: directory.ll<br>
+;MEMBERS-NOT: a-very-long-file-name<br>
<br>
Modified: llvm/trunk/tools/llvm-ar/llvm-ar.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-ar/llvm-ar.cpp?rev=184448&r1=184447&r2=184448&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-ar/llvm-ar.cpp?rev=184448&r1=184447&r2=184448&view=diff</a><br>

==============================================================================<br>
--- llvm/trunk/tools/llvm-ar/llvm-ar.cpp (original)<br>
+++ llvm/trunk/tools/llvm-ar/llvm-ar.cpp Thu Jun 20 13:30:37 2013<br>
@@ -563,7 +563,7 @@ doReplaceOrInsert(std::string* ErrMsg) {<br>
     std::set<std::string>::iterator found = remaining.end();<br>
     for (std::set<std::string>::iterator RI = remaining.begin(),<br>
          RE = remaining.end(); RI != RE; ++RI ) {<br>
-      std::string compare(*RI);<br>
+      std::string compare(sys::path::filename(*RI));<br>
       if (TruncateNames && compare.length() > 15) {<br>
         const char* nm = compare.c_str();<br>
         unsigned len = compare.length();<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>