[llvm] r186216 - Fix a off by one error about which members need to use the string table.

[Chandler Carruth]

I've reverted this in r186232.

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.


On Fri, Jul 12, 2013 at 3:45 PM, Quentin Colombet <qcolombet at apple.com>wrote:

> Hi Rafael,
>
> This breaks a buildbot:
>
> http://lab.llvm.org:8013/builders/clang-x86_64-darwin11-nobootstrap-RAincremental/builds/4327
>
> ******************** 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         `
> ^
> --
>
> ********************
>
>
>
> -Quentin
>
> On Jul 12, 2013, at 3:22 PM, Rafael Espindola <rafael.espindola at gmail.com>
> wrote:
>
> Author: rafael
> Date: Fri Jul 12 17:22:34 2013
> New Revision: 186216
>
> URL: http://llvm.org/viewvc/llvm-project?rev=186216&view=rev
> Log:
> Fix a off by one error about which members need to use the string table.
>
> Added:
>    llvm/trunk/test/Object/archive-format.test
> Modified:
>    llvm/trunk/tools/llvm-ar/llvm-ar.cpp
>
> Added: llvm/trunk/test/Object/archive-format.test
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Object/archive-format.test?rev=186216&view=auto
>
> ==============================================================================
> --- llvm/trunk/test/Object/archive-format.test (added)
> +++ llvm/trunk/test/Object/archive-format.test Fri Jul 12 17:22:34 2013
> @@ -0,0 +1,22 @@
> +Test the exact archive format. In particular, test which file names use
> the
> +string table or not.
> +
> +REQUIRES: shell
> +
> +RUN: mkdir -p %t
> +RUN: cd %t
> +
> +RUN: echo bar > 0123456789abcde
> +RUN: echo zed > 0123456789abcdef
> +
> +RUN: rm -f test.a
> +RUN: llvm-ar rc test.a 0123456789abcde 0123456789abcdef
> +RUN: cat test.a | FileCheck -strict-whitespace %s
> +
> +CHECK:      !<arch>
> +CHECK-NEXT: //                                              18        `
> +CHECK-NEXT: 0123456789abcdef/
> +CHECK-NEXT: 0123456789abcde/{{.*}}  1000  1000  100664  4         `
> +CHECK-NEXT: bar
> +CHECK-NEXT: /0              {{.*}}  1000  1000  100664  4         `
> +CHECK-NEXT: zed
>
> Modified: llvm/trunk/tools/llvm-ar/llvm-ar.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-ar/llvm-ar.cpp?rev=186216&r1=186215&r2=186216&view=diff
>
> ==============================================================================
> --- llvm/trunk/tools/llvm-ar/llvm-ar.cpp (original)
> +++ llvm/trunk/tools/llvm-ar/llvm-ar.cpp Fri Jul 12 17:22:34 2013
> @@ -419,7 +419,7 @@ StringRef NewArchiveIterator::getNew() c
> template <typename T>
> void addMember(std::vector<NewArchiveIterator> &Members,
>                std::string &StringTable, T I, StringRef Name) {
> -  if (Name.size() < 15) {
> +  if (Name.size() < 16) {
>     NewArchiveIterator NI(I, Twine(Name) + "/");
>     Members.push_back(NI);
>   } else {
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20130712/4ace5d06/attachment.html>