diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | test/Linker/2008-03-07-DroppedSection_a.ll | 2 | ||||
| -rw-r--r-- | test/Linker/2008-03-07-DroppedSection_b.ll | 2 | ||||
| -rw-r--r-- | test/Linker/link-archive.ll | 16 | ||||
| -rw-r--r-- | test/Linker/link-messages.ll | 7 | ||||
| -rw-r--r-- | test/lit.cfg | 4 |
6 files changed, 8 insertions, 25 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 8cebb7c747..37af1414be 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -75,7 +75,7 @@ add_dependencies(check.deps UnitTests BugpointPasses LLVMHello llc lli llvm-ar llvm-as llvm-dis llvm-extract llvm-dwarfdump - llvm-ld llvm-link llvm-mc llvm-nm llvm-objdump llvm-readobj + llvm-link llvm-mc llvm-nm llvm-objdump llvm-readobj macho-dump opt FileCheck count not json-bench) set_target_properties(check.deps PROPERTIES FOLDER "Tests") diff --git a/test/Linker/2008-03-07-DroppedSection_a.ll b/test/Linker/2008-03-07-DroppedSection_a.ll index 4458971eba..ec9d5c26ed 100644 --- a/test/Linker/2008-03-07-DroppedSection_a.ll +++ b/test/Linker/2008-03-07-DroppedSection_a.ll @@ -1,6 +1,6 @@ ; RUN: llvm-as < %s > %t.bc ; RUN: llvm-as < %p/2008-03-07-DroppedSection_b.ll > %t2.bc -; RUN: llvm-ld -r -disable-opt %t.bc %t2.bc -o %t3.bc +; RUN: llvm-link %t.bc %t2.bc -o %t3.bc ; RUN: llvm-dis < %t3.bc | grep ".data.init_task" ; ModuleID = 't.bc' diff --git a/test/Linker/2008-03-07-DroppedSection_b.ll b/test/Linker/2008-03-07-DroppedSection_b.ll index 884bf0a274..63b64f6aa1 100644 --- a/test/Linker/2008-03-07-DroppedSection_b.ll +++ b/test/Linker/2008-03-07-DroppedSection_b.ll @@ -1,6 +1,6 @@ ; RUN: llvm-as < %s > %t.bc ; RUN: llvm-as < %p/2008-03-07-DroppedSection_a.ll > %t2.bc -; RUN: llvm-ld -r -disable-opt %t.bc %t2.bc -o %t3.bc +; RUN: llvm-link %t.bc %t2.bc -o %t3.bc ; RUN: llvm-dis < %t3.bc | grep ".data.init_task" ; ModuleID = 'u.bc' diff --git a/test/Linker/link-archive.ll b/test/Linker/link-archive.ll deleted file mode 100644 index 9251b4e597..0000000000 --- a/test/Linker/link-archive.ll +++ /dev/null @@ -1,16 +0,0 @@ -; Test linking of a bc file to an archive via llvm-ld. -; PR1434 -; RUN: rm -f %t.bar.a %t.foo.a -; RUN: llvm-as %s -o %t.bar.bc -; RUN: echo {define i32* @foo(i32 %x) \{ ret i32* @baz \} \ -; RUN: @baz = external global i32 } | llvm-as -o %t.foo.bc -; RUN: llvm-ar rcf %t.foo.a %t.foo.bc -; RUN: llvm-ar rcf %t.bar.a %t.bar.bc -; RUN: llvm-ld -disable-opt %t.bar.bc %t.foo.a -o %t.bc -; RUN: llvm-ld -disable-opt %t.foo.bc %t.bar.a -o %t.bc -declare i32* @foo(...) -define i32* @bar() { - %ret = call i32* (...)* @foo( i32 123 ) - ret i32* %ret -} -@baz = global i32 0 diff --git a/test/Linker/link-messages.ll b/test/Linker/link-messages.ll index 920782d15b..1faae186dd 100644 --- a/test/Linker/link-messages.ll +++ b/test/Linker/link-messages.ll @@ -2,10 +2,9 @@ ; that error is printed out. ; RUN: llvm-as %s -o %t.one.bc ; RUN: llvm-as %s -o %t.two.bc -; RUN: not llvm-ld -disable-opt -link-as-library %t.one.bc %t.two.bc \ -; RUN: -o %t.bc 2>%t.err -; RUN: grep "symbol multiply defined" %t.err +; RUN: not llvm-link %t.one.bc %t.two.bc -o %t.bc |& FileCheck %s +; CHECK: symbol multiply defined define i32 @bar() { - ret i32 0 + ret i32 0 } diff --git a/test/lit.cfg b/test/lit.cfg index d74bc7bcb5..2383d8fe79 100644 --- a/test/lit.cfg +++ b/test/lit.cfg @@ -187,12 +187,12 @@ for pattern in [r"\bbugpoint\b(?!-)", r"(?<!/|-)\bclang\b(?!-)", r"\bllvm-bcanalyzer\b", r"\bllvm-config\b", r"\bllvm-cov\b", r"\bllvm-diff\b", r"\bllvm-dis\b", r"\bllvm-dwarfdump\b", - r"\bllvm-extract\b", r"\bllvm-ld\b", + r"\bllvm-extract\b", r"\bllvm-link\b", r"\bllvm-mc\b", r"\bllvm-nm\b", r"\bllvm-objdump\b", r"\bllvm-prof\b", r"\bllvm-ranlib\b", r"\bllvm-rtdyld\b", r"\bllvm-shlib\b", - r"\bllvm-size\b", r"\bllvm-stub\b", + r"\bllvm-size\b", # Don't match '-llvmc'. r"(?<!-)\bllvmc\b", r"\blto\b", # Don't match '.opt', '-opt', |