<div dir="ltr">I've reverted this in r186232.<div><br></div><div>Rafael, it is really unacceptable to commit, break the tree, and not even respond for over 2 hours, especially when the failure happens across platforms, etc. Please try to be more careful.</div>
</div><div class="gmail_extra"><br><br><div class="gmail_quote">On Fri, Jul 12, 2013 at 3:45 PM, Quentin Colombet <span dir="ltr"><<a href="mailto:qcolombet@apple.com" target="_blank">qcolombet@apple.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div style="word-wrap:break-word">Hi Rafael,<div><br></div><div>This breaks a buildbot:</div><div><a href="http://lab.llvm.org:8013/builders/clang-x86_64-darwin11-nobootstrap-RAincremental/builds/4327" target="_blank">http://lab.llvm.org:8013/builders/clang-x86_64-darwin11-nobootstrap-RAincremental/builds/4327</a></div>
<div><pre style="font-family:'Courier New',courier,monotype;font-size:medium"><span>******************** TEST 'LLVM :: Object/archive-format.test' FAILED ********************
Script:
--
mkdir -p /Users/buildslave/zorg/buildbot/smooshlab/slave-0.8/build.clang-x86_64-darwin11-nobootstrap-RAincremental/clang-build/test/Object/Output/archive-format.test.tmp
cd /Users/buildslave/zorg/buildbot/smooshlab/slave-0.8/build.clang-x86_64-darwin11-nobootstrap-RAincremental/clang-build/test/Object/Output/archive-format.test.tmp
echo bar > 0123456789abcde
echo zed > 0123456789abcdef
rm -f test.a
/Users/buildslave/zorg/buildbot/smooshlab/slave-0.8/build.clang-x86_64-darwin11-nobootstrap-RAincremental/clang-build/Release+Asserts/bin/llvm-ar rc test.a 0123456789abcde 0123456789abcdef
cat test.a | /Users/buildslave/zorg/buildbot/smooshlab/slave-0.8/build.clang-x86_64-darwin11-nobootstrap-RAincremental/clang-build/Release+Asserts/bin/FileCheck -strict-whitespace /Users/buildslave/zorg/buildbot/smooshlab/slave-0.8/build.clang-x86_64-darwin11-nobootstrap-RAincremental/llvm/test/Object/archive-format.test
--
Exit Code: 1
Command Output (stderr):
--
/Users/buildslave/zorg/buildbot/smooshlab/slave-0.8/build.clang-x86_64-darwin11-nobootstrap-RAincremental/llvm/test/Object/archive-format.test:19:13: error: expected string not found in input
CHECK-NEXT: 0123456789abcde/{{.*}} 1000 1000 100664 4 `
^
<stdin>:4:1: note: scanning from here
0123456789abcde/1373668379 501 20 100644 4 `
^
--
********************</span></pre><span class="HOEnZb"><font color="#888888"><div><br></div><div><br></div><div>
<div style="text-indent:0px;letter-spacing:normal;font-variant:normal;text-align:-webkit-auto;font-style:normal;font-weight:normal;line-height:normal;text-transform:none;white-space:normal;font-family:Helvetica;word-wrap:break-word;word-spacing:0px">
-Quentin</div>
</div></font></span><div><div class="h5">
<br><div><div>On Jul 12, 2013, at 3:22 PM, Rafael Espindola <<a href="mailto:rafael.espindola@gmail.com" target="_blank">rafael.espindola@gmail.com</a>> wrote:</div><br><blockquote type="cite"><div style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;letter-spacing:normal;line-height:normal;text-align:start;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px">
Author: rafael<br>Date: Fri Jul 12 17:22:34 2013<br>New Revision: 186216<br><br>URL:<span> </span><a href="http://llvm.org/viewvc/llvm-project?rev=186216&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=186216&view=rev</a><br>
Log:<br>Fix a off by one error about which members need to use the string table.<br><br>Added:<br> llvm/trunk/test/Object/archive-format.test<br>Modified:<br> llvm/trunk/tools/llvm-ar/llvm-ar.cpp<br><br>Added: llvm/trunk/test/Object/archive-format.test<br>
URL:<span> </span><a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Object/archive-format.test?rev=186216&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Object/archive-format.test?rev=186216&view=auto</a><br>
==============================================================================<br>--- llvm/trunk/test/Object/archive-format.test (added)<br>+++ llvm/trunk/test/Object/archive-format.test Fri Jul 12 17:22:34 2013<br>@@ -0,0 +1,22 @@<br>
+Test the exact archive format. In particular, test which file names use the<br>+string table or not.<br>+<br>+REQUIRES: shell<br>+<br>+RUN: mkdir -p %t<br>+RUN: cd %t<br>+<br>+RUN: echo bar > 0123456789abcde<br>+RUN: echo zed > 0123456789abcdef<br>
+<br>+RUN: rm -f test.a<br>+RUN: llvm-ar rc test.a 0123456789abcde 0123456789abcdef<br>+RUN: cat test.a | FileCheck -strict-whitespace %s<br>+<br>+CHECK: !<arch><br>+CHECK-NEXT: // 18 `<br>
+CHECK-NEXT: 0123456789abcdef/<br>+CHECK-NEXT: 0123456789abcde/{{.*}} 1000 1000 100664 4 `<br>+CHECK-NEXT: bar<br>+CHECK-NEXT: /0 {{.*}} 1000 1000 100664 4 `<br>+CHECK-NEXT: zed<br><br>
Modified: llvm/trunk/tools/llvm-ar/llvm-ar.cpp<br>URL:<span> </span><a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-ar/llvm-ar.cpp?rev=186216&r1=186215&r2=186216&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-ar/llvm-ar.cpp?rev=186216&r1=186215&r2=186216&view=diff</a><br>
==============================================================================<br>--- llvm/trunk/tools/llvm-ar/llvm-ar.cpp (original)<br>+++ llvm/trunk/tools/llvm-ar/llvm-ar.cpp Fri Jul 12 17:22:34 2013<br>@@ -419,7 +419,7 @@ StringRef NewArchiveIterator::getNew() c<br>
template <typename T><br>void addMember(std::vector<NewArchiveIterator> &Members,<br> std::string &StringTable, T I, StringRef Name) {<br>- if (Name.size() < 15) {<br>+ if (Name.size() < 16) {<br>
NewArchiveIterator NI(I, Twine(Name) + "/");<br> Members.push_back(NI);<br> } else {<br><br><br>_______________________________________________<br>llvm-commits mailing list<br><a href="mailto:llvm-commits@cs.uiuc.edu" target="_blank">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></div></blockquote></div><br></div></div></div></div><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>
<br></blockquote></div><br></div>