diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2013-07-13 04:14:13 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2013-07-13 04:14:13 +0000 |
| commit | c9516518946a09090c00f951679255628794f41a (patch) | |
| tree | c679dde142ebdd7bb626e4c1047ba50a1b1031ad | |
| parent | 75681bb302e524460edb7c8c5c6e98792b5027a2 (diff) | |
| download | llvm-c9516518946a09090c00f951679255628794f41a.tar.gz llvm-c9516518946a09090c00f951679255628794f41a.tar.bz2 llvm-c9516518946a09090c00f951679255628794f41a.tar.xz | |
Add r186216 back, but make the test tolerant of different uids and gids.
original message:
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@186238 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, 23 insertions, 1 deletions
diff --git a/test/Object/archive-format.test b/test/Object/archive-format.test new file mode 100644 index 0000000000..5537175f9c --- /dev/null +++ b/test/Object/archive-format.test @@ -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/{{.*}} {{.*}} {{.*}} {{.*}} 4 ` +CHECK-NEXT: bar +CHECK-NEXT: /0 {{.*}} {{.*}} {{.*}} {{.*}} 4 ` +CHECK-NEXT: zed diff --git a/tools/llvm-ar/llvm-ar.cpp b/tools/llvm-ar/llvm-ar.cpp index ab2a2f18ec..5f47654b24 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() < 15) { + if (Name.size() < 16) { NewArchiveIterator NI(I, Twine(Name) + "/"); Members.push_back(NI); } else { |