diff options
author | Dmitri Gribenko <gribozavr@gmail.com> | 2019-06-03 16:21:37 +0000 |
---|---|---|
committer | Dmitri Gribenko <gribozavr@gmail.com> | 2019-06-03 16:21:37 +0000 |
commit | 857de979a7e43f26973351931b93a3879a09ec5a (patch) | |
tree | 86b92cc246e83d6b219952bd74d98c4ef79155d7 /llvm/test/tools/llvm-ar | |
parent | 009d08f313c46915930ca617946033a487933b73 (diff) | |
download | bcm5719-llvm-857de979a7e43f26973351931b93a3879a09ec5a.tar.gz bcm5719-llvm-857de979a7e43f26973351931b93a3879a09ec5a.zip |
Revert "[llvm-ar] Fix relative thin archive path handling"
This reverts commit r362407. It broke compilation of
llvm/lib/Object/ArchiveWriter.cpp:
error: type 'llvm::sys::path::const_iterator' does not provide a call
operator
llvm-svn: 362413
Diffstat (limited to 'llvm/test/tools/llvm-ar')
-rw-r--r-- | llvm/test/tools/llvm-ar/reduce-thin-path.test | 10 | ||||
-rw-r--r-- | llvm/test/tools/llvm-ar/thin-archive.test | 45 |
2 files changed, 0 insertions, 55 deletions
diff --git a/llvm/test/tools/llvm-ar/reduce-thin-path.test b/llvm/test/tools/llvm-ar/reduce-thin-path.test deleted file mode 100644 index aea6101ce9b..00000000000 --- a/llvm/test/tools/llvm-ar/reduce-thin-path.test +++ /dev/null @@ -1,10 +0,0 @@ -RUN: rm -rf %t && mkdir -p %t/foo/bar/ -RUN: mkdir -p %t/baz/ -RUN: yaml2obj %S/Inputs/elf.yaml -o %t/elf.o - -RUN: cd %t && llvm-ar rTc %t/baz/internal.ar elf.o -RUN: cd %t/foo && llvm-ar rTc %t/foo/bar/external.ar ../baz/internal.ar - -RUN: FileCheck -input-file=%t/foo/bar/external.ar %s - -CHECK: {{^}}../../elf.o/ diff --git a/llvm/test/tools/llvm-ar/thin-archive.test b/llvm/test/tools/llvm-ar/thin-archive.test deleted file mode 100644 index 8d9543b6869..00000000000 --- a/llvm/test/tools/llvm-ar/thin-archive.test +++ /dev/null @@ -1,45 +0,0 @@ -RUN: rm -rf %t && mkdir -p %t/foo/bar/ - -RUN: yaml2obj %S/Inputs/elf.yaml -o %t/foo/elf.o -RUN: cp %t/foo/elf.o %t/foo/bar/elf.o -RUN: cp %t/foo/bar/elf.o %t/delete.o - -Test that modules can be added with absolute paths when the archive is created using an absolute path - -RUN: llvm-ar rTc %t/absolute-1.ar %t/foo/elf.o %t/delete.o %t/foo/bar/elf.o -RUN: llvm-ar dT %t/absolute-1.ar delete.o - -RUN: FileCheck -input-file=%t/absolute-1.ar --check-prefixes=THIN,CHECK %s -DPATH=%/t/ -RUN: llvm-ar t %t/absolute-1.ar | FileCheck %s -DPATH=%/t/ - -Test that modules can be added with absolute paths when the archive is created using a relative path - -RUN: llvm-ar rTc Output/%basename_t.tmp/absolute-2.ar %t/foo/elf.o %t/delete.o %t/foo/bar/elf.o -RUN: llvm-ar dT Output/%basename_t.tmp/absolute-2.ar %t/delete.o - -RUN: FileCheck -input-file=%t/absolute-2.ar --check-prefixes=THIN,CHECK %s -DPATH=%/t/ -RUN: llvm-ar t %t/absolute-2.ar | FileCheck %s -DPATH=%/t/ - -These tests must be run in %t/foo. cd %t is included on each line to make debugging this test case easier. - -Test that modules can be added with relative paths when the archive is created using a relative path - -RUN: cd %t/foo && llvm-ar rTc ../relative-1.ar elf.o ../delete.o bar/elf.o -RUN: cd %t/foo && llvm-ar dT ../relative-1.ar delete.o - -RUN: FileCheck -input-file=%t/relative-1.ar --check-prefixes=THIN,CHECK %s -DPATH= -RUN: llvm-ar t %t/relative-1.ar | FileCheck %s -DPATH=%/t/ - -Test that modules can be added with relative paths when the archive is created using a absolute path - -RUN: cd %t/foo && llvm-ar rTc %t/relative-2.ar elf.o ../delete.o bar/elf.o -RUN: cd %t/foo && llvm-ar dT %t/relative-2.ar delete.o - -RUN: FileCheck -input-file=%t/relative-2.ar --check-prefixes=THIN,CHECK %s -DPATH= -RUN: llvm-ar t %t/relative-2.ar | FileCheck %s -DPATH=%/t/ - -THIN: !<thin> - -CHECK-NOT: delete.o -CHECK: {{^}}[[PATH]]foo/elf.o -CHECK: {{^}}[[PATH]]foo/bar/elf.o |