From 07c3753e140c1ee40997fd4cebb931abaf749c99 Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Fri, 31 Oct 2014 16:52:30 +0000 Subject: [PATCH] Unify and update link-messages.ll and redefinition.ll. NFC. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@220968 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/Linker/Inputs/redefinition.ll | 1 + test/Linker/link-messages.ll | 10 ---------- test/Linker/redefinition.ll | 11 ++++------- 3 files changed, 5 insertions(+), 17 deletions(-) create mode 100644 test/Linker/Inputs/redefinition.ll delete mode 100644 test/Linker/link-messages.ll diff --git a/test/Linker/Inputs/redefinition.ll b/test/Linker/Inputs/redefinition.ll new file mode 100644 index 00000000000..0f580e649d4 --- /dev/null +++ b/test/Linker/Inputs/redefinition.ll @@ -0,0 +1 @@ +define void @foo(i32 %x) { ret void } diff --git a/test/Linker/link-messages.ll b/test/Linker/link-messages.ll deleted file mode 100644 index 4e7ffbc97d6..00000000000 --- a/test/Linker/link-messages.ll +++ /dev/null @@ -1,10 +0,0 @@ -; Test that linking two files with the same definition causes an error and -; that error is printed out. -; RUN: llvm-as %s -o %t.one.bc -; RUN: llvm-as %s -o %t.two.bc -; RUN: not llvm-link %t.one.bc %t.two.bc -o %t.bc 2>&1 | FileCheck %s - -; CHECK: symbol multiply defined -define i32 @bar() { - ret i32 0 -} diff --git a/test/Linker/redefinition.ll b/test/Linker/redefinition.ll index 64a8c341fed..1177a7094e0 100644 --- a/test/Linker/redefinition.ll +++ b/test/Linker/redefinition.ll @@ -1,9 +1,6 @@ -; Test linking two functions with different prototypes and two globals +; Test linking two functions with different prototypes and two globals ; in different modules. -; RUN: llvm-as %s -o %t.foo1.bc -; RUN: llvm-as %s -o %t.foo2.bc -; RUN: echo "define void @foo(i32 %x) { ret void }" | llvm-as -o %t.foo3.bc -; RUN: not llvm-link %t.foo1.bc %t.foo2.bc -o %t.bc 2>&1 | FileCheck %s -; RUN: not llvm-link %t.foo1.bc %t.foo3.bc -o %t.bc 2>&1 | FileCheck %s -; CHECK: symbol multiply defined +; RUN: not llvm-link %s %s -o %t.bc 2>&1 | FileCheck %s +; RUN: not llvm-link %s %S/Inputs/redefinition.ll -o %t.bc 2>&1 | FileCheck %s +; CHECK: ERROR: Linking globals named 'foo': symbol multiply defined! define void @foo() { ret void } -- 2.11.0