[llvm] r220968 - Unify and update link-messages.ll and redefinition.ll. NFC.

[Rafael Espindola]

Author: rafael
Date: Fri Oct 31 11:52:30 2014
New Revision: 220968

URL: http://llvm.org/viewvc/llvm-project?rev=220968&view=rev
Log:
Unify and update link-messages.ll and redefinition.ll. NFC.

Added:
    llvm/trunk/test/Linker/Inputs/redefinition.ll
Removed:
    llvm/trunk/test/Linker/link-messages.ll
Modified:
    llvm/trunk/test/Linker/redefinition.ll

Added: llvm/trunk/test/Linker/Inputs/redefinition.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/Inputs/redefinition.ll?rev=220968&view=auto
==============================================================================
--- llvm/trunk/test/Linker/Inputs/redefinition.ll (added)
+++ llvm/trunk/test/Linker/Inputs/redefinition.ll Fri Oct 31 11:52:30 2014
@@ -0,0 +1 @@
+define void @foo(i32 %x) { ret void }

Removed: llvm/trunk/test/Linker/link-messages.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/link-messages.ll?rev=220967&view=auto
==============================================================================
--- llvm/trunk/test/Linker/link-messages.ll (original)
+++ llvm/trunk/test/Linker/link-messages.ll (removed)
@@ -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
-}

Modified: llvm/trunk/test/Linker/redefinition.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/redefinition.ll?rev=220968&r1=220967&r2=220968&view=diff
==============================================================================
--- llvm/trunk/test/Linker/redefinition.ll (original)
+++ llvm/trunk/test/Linker/redefinition.ll Fri Oct 31 11:52:30 2014
@@ -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 }