diff options
| author | Chandler Carruth <chandlerc@gmail.com> | 2013-07-13 00:42:56 +0000 |
|---|---|---|
| committer | Chandler Carruth <chandlerc@gmail.com> | 2013-07-13 00:42:56 +0000 |
| commit | 1dedabdfad8f3412256e706905b9b3b69aa2e17a (patch) | |
| tree | 6c6b606e2f929eeb8304751283081dc8c154f3d9 | |
| parent | 2bd429a98761fe93cffe4f9d62522e17ad9dda2d (diff) | |
| download | llvm-1dedabdfad8f3412256e706905b9b3b69aa2e17a.tar.gz llvm-1dedabdfad8f3412256e706905b9b3b69aa2e17a.tar.bz2 llvm-1dedabdfad8f3412256e706905b9b3b69aa2e17a.tar.xz | |
Revert commit r186216 -- it's breaking bots:
http://lab.llvm.org:8011/builders/clang-x86_64-debian-fast/builds/6897/steps/check-all/logs/LLVM%3A%3Aarchive-format.test
Original commit log:
Fix a off by one error about which members need to use the string
table.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@186232 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | test/Object/archive-format.test | 22 | ||||
| -rw-r--r-- | tools/llvm-ar/llvm-ar.cpp | 2 |
2 files changed, 1 insertions, 23 deletions
diff --git a/test/Object/archive-format.test b/test/Object/archive-format.test deleted file mode 100644 index 9ac2d63494..0000000000 --- a/test/Object/archive-format.test +++ /dev/null @@ -1,22 +0,0 @@ -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 diff --git a/tools/llvm-ar/llvm-ar.cpp b/tools/llvm-ar/llvm-ar.cpp index 5f47654b24..ab2a2f18ec 100644 --- a/tools/llvm-ar/llvm-ar.cpp +++ b/tools/llvm-ar/llvm-ar.cpp @@ -419,7 +419,7 @@ StringRef NewArchiveIterator::getNew() const { template <typename T> void addMember(std::vector<NewArchiveIterator> &Members, std::string &StringTable, T I, StringRef Name) { - if (Name.size() < 16) { + if (Name.size() < 15) { NewArchiveIterator NI(I, Twine(Name) + "/"); Members.push_back(NI); } else { |