[llvm-commits] [llvm] r81860 - /llvm/trunk/test/Linker/
Dan Gohman
gohman at apple.com
Tue Sep 15 08:38:31 PDT 2009
Author: djg
Date: Tue Sep 15 10:38:31 2009
New Revision: 81860
URL: http://llvm.org/viewvc/llvm-project?rev=81860&view=rev
Log:
Use llvm-link -S instead of using llvm-dis.
Modified:
llvm/trunk/test/Linker/2003-01-30-LinkerRename.ll
llvm/trunk/test/Linker/2003-01-30-LinkerTypeRename.ll
llvm/trunk/test/Linker/2003-04-23-LinkOnceLost.ll
llvm/trunk/test/Linker/2003-05-31-LinkerRename.ll
llvm/trunk/test/Linker/2003-08-23-GlobalVarLinking.ll
llvm/trunk/test/Linker/2003-10-21-ConflictingTypesTolerance.ll
llvm/trunk/test/Linker/2004-12-03-DisagreeingType.ll
llvm/trunk/test/Linker/2005-02-12-ConstantGlobals-2.ll
llvm/trunk/test/Linker/2005-02-12-ConstantGlobals.ll
llvm/trunk/test/Linker/2005-12-06-AppendingZeroLengthArrays.ll
llvm/trunk/test/Linker/2006-06-15-GlobalVarAlignment.ll
llvm/trunk/test/Linker/2008-06-13-LinkOnceRedefinition.ll
llvm/trunk/test/Linker/2008-06-26-AddressSpace.ll
llvm/trunk/test/Linker/AppendingLinkage.ll
llvm/trunk/test/Linker/AppendingLinkage2.ll
llvm/trunk/test/Linker/ConstantGlobals1.ll
llvm/trunk/test/Linker/ConstantGlobals2.ll
llvm/trunk/test/Linker/ConstantGlobals3.ll
llvm/trunk/test/Linker/LinkOnce.ll
llvm/trunk/test/Linker/link-global-to-func.ll
llvm/trunk/test/Linker/linknamedmdnode.ll
Modified: llvm/trunk/test/Linker/2003-01-30-LinkerRename.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/2003-01-30-LinkerRename.ll?rev=81860&r1=81859&r2=81860&view=diff
==============================================================================
--- llvm/trunk/test/Linker/2003-01-30-LinkerRename.ll (original)
+++ llvm/trunk/test/Linker/2003-01-30-LinkerRename.ll Tue Sep 15 10:38:31 2009
@@ -3,7 +3,7 @@
; RUN: echo {define internal i32 @foo() \{ ret i32 7 \} } | llvm-as > %t.1.bc
; RUN: llvm-as %s -o %t.2.bc
-; RUN: llvm-link %t.1.bc %t.2.bc | llvm-dis | grep @foo() | grep -v internal
+; RUN: llvm-link %t.1.bc %t.2.bc -S | grep @foo() | grep -v internal
define i32 @foo() { ret i32 0 }
Modified: llvm/trunk/test/Linker/2003-01-30-LinkerTypeRename.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/2003-01-30-LinkerTypeRename.ll?rev=81860&r1=81859&r2=81860&view=diff
==============================================================================
--- llvm/trunk/test/Linker/2003-01-30-LinkerTypeRename.ll (original)
+++ llvm/trunk/test/Linker/2003-01-30-LinkerTypeRename.ll Tue Sep 15 10:38:31 2009
@@ -3,7 +3,7 @@
; RUN: echo {%Ty = type opaque @GV = external global %Ty*} | llvm-as > %t.1.bc
; RUN: llvm-as < %s > %t.2.bc
-; RUN: llvm-link %t.1.bc %t.2.bc | llvm-dis | grep {%Ty } | not grep opaque
+; RUN: llvm-link %t.1.bc %t.2.bc -S | grep {%Ty } | not grep opaque
%Ty = type i32
Modified: llvm/trunk/test/Linker/2003-04-23-LinkOnceLost.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/2003-04-23-LinkOnceLost.ll?rev=81860&r1=81859&r2=81860&view=diff
==============================================================================
--- llvm/trunk/test/Linker/2003-04-23-LinkOnceLost.ll (original)
+++ llvm/trunk/test/Linker/2003-04-23-LinkOnceLost.ll Tue Sep 15 10:38:31 2009
@@ -4,7 +4,7 @@
; RUN: echo { define linkonce void @foo() \{ ret void \} } | \
; RUN: llvm-as -o %t.2.bc
; RUN: llvm-as %s -o %t.1.bc
-; RUN: llvm-link %t.1.bc %t.2.bc | llvm-dis | grep foo | grep linkonce
+; RUN: llvm-link %t.1.bc %t.2.bc -S | grep foo | grep linkonce
declare void @foo()
Modified: llvm/trunk/test/Linker/2003-05-31-LinkerRename.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/2003-05-31-LinkerRename.ll?rev=81860&r1=81859&r2=81860&view=diff
==============================================================================
--- llvm/trunk/test/Linker/2003-05-31-LinkerRename.ll (original)
+++ llvm/trunk/test/Linker/2003-05-31-LinkerRename.ll Tue Sep 15 10:38:31 2009
@@ -6,7 +6,7 @@
; RUN: echo { define internal i32 @foo() \{ ret i32 7 \} } | llvm-as > %t.1.bc
; RUN: llvm-as < %s > %t.2.bc
-; RUN: llvm-link %t.1.bc %t.2.bc | llvm-dis | grep internal | not grep @foo(
+; RUN: llvm-link %t.1.bc %t.2.bc -S | grep internal | not grep @foo(
declare i32 @foo()
Modified: llvm/trunk/test/Linker/2003-08-23-GlobalVarLinking.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/2003-08-23-GlobalVarLinking.ll?rev=81860&r1=81859&r2=81860&view=diff
==============================================================================
--- llvm/trunk/test/Linker/2003-08-23-GlobalVarLinking.ll (original)
+++ llvm/trunk/test/Linker/2003-08-23-GlobalVarLinking.ll Tue Sep 15 10:38:31 2009
@@ -1,7 +1,7 @@
; RUN: llvm-as < %s > %t.out1.bc
; RUN: echo {@S = external global \{ i32, opaque* \} declare void @F(opaque*)}\
; RUN: | llvm-as > %t.out2.bc
-; RUN: llvm-link %t.out1.bc %t.out2.bc | llvm-dis | not grep opaque
+; RUN: llvm-link %t.out1.bc %t.out2.bc -S | not grep opaque
; After linking this testcase, there should be no opaque types left. The two
; S's should cause the opaque type to be resolved to 'int'.
Modified: llvm/trunk/test/Linker/2003-10-21-ConflictingTypesTolerance.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/2003-10-21-ConflictingTypesTolerance.ll?rev=81860&r1=81859&r2=81860&view=diff
==============================================================================
--- llvm/trunk/test/Linker/2003-10-21-ConflictingTypesTolerance.ll (original)
+++ llvm/trunk/test/Linker/2003-10-21-ConflictingTypesTolerance.ll Tue Sep 15 10:38:31 2009
@@ -1,6 +1,6 @@
; RUN: llvm-as < %s > %t.out1.bc
; RUN: echo { %M = type \[8 x i32\] external global %M } | llvm-as > %t.out2.bc
-; RUN: llvm-link %t.out1.bc %t.out2.bc | llvm-dis | grep %M | grep \\{
+; RUN: llvm-link %t.out1.bc %t.out2.bc -S | grep %M | grep \\{
%M = type { i32 }
Modified: llvm/trunk/test/Linker/2004-12-03-DisagreeingType.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/2004-12-03-DisagreeingType.ll?rev=81860&r1=81859&r2=81860&view=diff
==============================================================================
--- llvm/trunk/test/Linker/2004-12-03-DisagreeingType.ll (original)
+++ llvm/trunk/test/Linker/2004-12-03-DisagreeingType.ll Tue Sep 15 10:38:31 2009
@@ -1,7 +1,7 @@
; RUN: echo {@G = weak global \{\{\{\{double\}\}\}\} zeroinitializer } | \
; RUN: llvm-as > %t.out2.bc
; RUN: llvm-as < %s > %t.out1.bc
-; RUN: llvm-link %t.out1.bc %t.out2.bc | llvm-dis | not grep {\\}}
+; RUN: llvm-link %t.out1.bc %t.out2.bc -S | not grep {\\}}
; When linked, the global above should be eliminated, being merged with the
; global below.
Modified: llvm/trunk/test/Linker/2005-02-12-ConstantGlobals-2.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/2005-02-12-ConstantGlobals-2.ll?rev=81860&r1=81859&r2=81860&view=diff
==============================================================================
--- llvm/trunk/test/Linker/2005-02-12-ConstantGlobals-2.ll (original)
+++ llvm/trunk/test/Linker/2005-02-12-ConstantGlobals-2.ll Tue Sep 15 10:38:31 2009
@@ -3,6 +3,6 @@
; RUN: echo {@X = external constant i32} | llvm-as > %t.2.bc
; RUN: llvm-as < %s > %t.1.bc
-; RUN: llvm-link %t.1.bc %t.2.bc | llvm-dis | grep {global i32 7}
+; RUN: llvm-link %t.1.bc %t.2.bc -S | grep {global i32 7}
@X = global i32 7
Modified: llvm/trunk/test/Linker/2005-02-12-ConstantGlobals.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/2005-02-12-ConstantGlobals.ll?rev=81860&r1=81859&r2=81860&view=diff
==============================================================================
--- llvm/trunk/test/Linker/2005-02-12-ConstantGlobals.ll (original)
+++ llvm/trunk/test/Linker/2005-02-12-ConstantGlobals.ll Tue Sep 15 10:38:31 2009
@@ -3,6 +3,6 @@
; RUN: echo {@X = global i32 7} | llvm-as > %t.2.bc
; RUN: llvm-as < %s > %t.1.bc
-; RUN: llvm-link %t.1.bc %t.2.bc | llvm-dis | grep {global i32 7}
+; RUN: llvm-link %t.1.bc %t.2.bc -S | grep {global i32 7}
@X = external constant i32 ; <i32*> [#uses=0]
Modified: llvm/trunk/test/Linker/2005-12-06-AppendingZeroLengthArrays.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/2005-12-06-AppendingZeroLengthArrays.ll?rev=81860&r1=81859&r2=81860&view=diff
==============================================================================
--- llvm/trunk/test/Linker/2005-12-06-AppendingZeroLengthArrays.ll (original)
+++ llvm/trunk/test/Linker/2005-12-06-AppendingZeroLengthArrays.ll Tue Sep 15 10:38:31 2009
@@ -1,7 +1,7 @@
; RUN: echo { @G = appending global \[0 x i32\] zeroinitializer } | \
; RUN: llvm-as > %t.out2.bc
; RUN: llvm-as < %s > %t.out1.bc
-; RUN: llvm-link %t.out1.bc %t.out2.bc | llvm-dis | grep {@G =}
+; RUN: llvm-link %t.out1.bc %t.out2.bc -S | grep {@G =}
; When linked, the globals should be merged, and the result should still
; be named '@G'.
Modified: llvm/trunk/test/Linker/2006-06-15-GlobalVarAlignment.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/2006-06-15-GlobalVarAlignment.ll?rev=81860&r1=81859&r2=81860&view=diff
==============================================================================
--- llvm/trunk/test/Linker/2006-06-15-GlobalVarAlignment.ll (original)
+++ llvm/trunk/test/Linker/2006-06-15-GlobalVarAlignment.ll Tue Sep 15 10:38:31 2009
@@ -2,6 +2,6 @@
; RUN: echo {@X = global i32 7, align 8} | llvm-as > %t.2.bc
; RUN: llvm-as < %s > %t.1.bc
-; RUN: llvm-link %t.1.bc %t.2.bc | llvm-dis | grep {align 8}
+; RUN: llvm-link %t.1.bc %t.2.bc -S | grep {align 8}
@X = weak global i32 7, align 4
Modified: llvm/trunk/test/Linker/2008-06-13-LinkOnceRedefinition.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/2008-06-13-LinkOnceRedefinition.ll?rev=81860&r1=81859&r2=81860&view=diff
==============================================================================
--- llvm/trunk/test/Linker/2008-06-13-LinkOnceRedefinition.ll (original)
+++ llvm/trunk/test/Linker/2008-06-13-LinkOnceRedefinition.ll Tue Sep 15 10:38:31 2009
@@ -3,6 +3,6 @@
; RUN: llvm-as %s -o %t.foo1.bc
; RUN: llvm-as %s -o %t.foo2.bc
; RUN: echo {define linkonce void @foo(i32 %x) { ret void }} | llvm-as -o %t.foo3.bc
-; RUN: llvm-link %t.foo1.bc %t.foo2.bc | llvm-dis
-; RUN: llvm-link %t.foo1.bc %t.foo3.bc | llvm-dis
+; RUN: llvm-link %t.foo1.bc %t.foo2.bc -S
+; RUN: llvm-link %t.foo1.bc %t.foo3.bc -S
define linkonce void @foo() { ret void }
Modified: llvm/trunk/test/Linker/2008-06-26-AddressSpace.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/2008-06-26-AddressSpace.ll?rev=81860&r1=81859&r2=81860&view=diff
==============================================================================
--- llvm/trunk/test/Linker/2008-06-26-AddressSpace.ll (original)
+++ llvm/trunk/test/Linker/2008-06-26-AddressSpace.ll Tue Sep 15 10:38:31 2009
@@ -2,8 +2,8 @@
; in different modules.
; RUN: llvm-as %s -o %t.foo1.bc
; RUN: echo | llvm-as -o %t.foo2.bc
-; RUN: llvm-link %t.foo2.bc %t.foo1.bc | llvm-dis | grep {addrspace(2)}
-; RUN: llvm-link %t.foo1.bc %t.foo2.bc | llvm-dis | grep {addrspace(2)}
+; RUN: llvm-link %t.foo2.bc %t.foo1.bc -S | grep {addrspace(2)}
+; RUN: llvm-link %t.foo1.bc %t.foo2.bc -S | grep {addrspace(2)}
; rdar://6038021
@G = addrspace(2) global i32 256
Modified: llvm/trunk/test/Linker/AppendingLinkage.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/AppendingLinkage.ll?rev=81860&r1=81859&r2=81860&view=diff
==============================================================================
--- llvm/trunk/test/Linker/AppendingLinkage.ll (original)
+++ llvm/trunk/test/Linker/AppendingLinkage.ll Tue Sep 15 10:38:31 2009
@@ -3,7 +3,7 @@
; RUN: echo {@X = appending global \[1 x i32\] \[i32 8\] } | \
; RUN: llvm-as > %t.2.bc
; RUN: llvm-as < %s > %t.1.bc
-; RUN: llvm-link %t.1.bc %t.2.bc | llvm-dis | grep 7 | grep 4 | grep 8
+; RUN: llvm-link %t.1.bc %t.2.bc -S | grep 7 | grep 4 | grep 8
@X = appending global [2 x i32] [ i32 7, i32 4 ] ; <[2 x i32]*> [#uses=2]
@Y = global i32* getelementptr ([2 x i32]* @X, i64 0, i64 0) ; <i32**> [#uses=0]
Modified: llvm/trunk/test/Linker/AppendingLinkage2.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/AppendingLinkage2.ll?rev=81860&r1=81859&r2=81860&view=diff
==============================================================================
--- llvm/trunk/test/Linker/AppendingLinkage2.ll (original)
+++ llvm/trunk/test/Linker/AppendingLinkage2.ll Tue Sep 15 10:38:31 2009
@@ -3,6 +3,6 @@
; RUN: echo {@X = appending global \[1 x i32\] \[i32 8\] } | \
; RUN: llvm-as > %t.2.bc
; RUN: llvm-as < %s > %t.1.bc
-; RUN: llvm-link %t.1.bc %t.2.bc | llvm-dis | grep 7 | grep 8
+; RUN: llvm-link %t.1.bc %t.2.bc -S | grep 7 | grep 8
@X = appending global [1 x i32] [ i32 7 ] ; <[1 x i32]*> [#uses=0]
Modified: llvm/trunk/test/Linker/ConstantGlobals1.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/ConstantGlobals1.ll?rev=81860&r1=81859&r2=81860&view=diff
==============================================================================
--- llvm/trunk/test/Linker/ConstantGlobals1.ll (original)
+++ llvm/trunk/test/Linker/ConstantGlobals1.ll Tue Sep 15 10:38:31 2009
@@ -3,7 +3,7 @@
; RUN: echo {@X = constant \[1 x i32\] \[i32 8\] } | \
; RUN: llvm-as > %t.2.bc
; RUN: llvm-as < %s > %t.1.bc
-; RUN: llvm-link %t.1.bc %t.2.bc | llvm-dis | grep constant
+; RUN: llvm-link %t.1.bc %t.2.bc -S | grep constant
@X = external global [1 x i32] ; <[1 x i32]*> [#uses=0]
Modified: llvm/trunk/test/Linker/ConstantGlobals2.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/ConstantGlobals2.ll?rev=81860&r1=81859&r2=81860&view=diff
==============================================================================
--- llvm/trunk/test/Linker/ConstantGlobals2.ll (original)
+++ llvm/trunk/test/Linker/ConstantGlobals2.ll Tue Sep 15 10:38:31 2009
@@ -3,7 +3,7 @@
; RUN: echo {@X = external global \[1 x i32\] } | \
; RUN: llvm-as > %t.2.bc
; RUN: llvm-as < %s > %t.1.bc
-; RUN: llvm-link %t.1.bc %t.2.bc | llvm-dis | grep constant
+; RUN: llvm-link %t.1.bc %t.2.bc -S | grep constant
@X = constant [1 x i32] [ i32 12 ] ; <[1 x i32]*> [#uses=0]
Modified: llvm/trunk/test/Linker/ConstantGlobals3.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/ConstantGlobals3.ll?rev=81860&r1=81859&r2=81860&view=diff
==============================================================================
--- llvm/trunk/test/Linker/ConstantGlobals3.ll (original)
+++ llvm/trunk/test/Linker/ConstantGlobals3.ll Tue Sep 15 10:38:31 2009
@@ -3,6 +3,6 @@
; RUN: echo {@X = external constant \[1 x i32\] } | \
; RUN: llvm-as > %t.2.bc
; RUN: llvm-as < %s > %t.1.bc
-; RUN: llvm-link %t.1.bc %t.2.bc | llvm-dis | grep constant
+; RUN: llvm-link %t.1.bc %t.2.bc -S | grep constant
@X = external global [1 x i32] ; <[1 x i32]*> [#uses=0]
Modified: llvm/trunk/test/Linker/LinkOnce.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/LinkOnce.ll?rev=81860&r1=81859&r2=81860&view=diff
==============================================================================
--- llvm/trunk/test/Linker/LinkOnce.ll (original)
+++ llvm/trunk/test/Linker/LinkOnce.ll Tue Sep 15 10:38:31 2009
@@ -3,6 +3,6 @@
; RUN: echo "@X = linkonce global i32 8" | llvm-as > %t.2.bc
; RUN: llvm-as < %s > %t.1.bc
-; RUN: llvm-link %t.1.bc %t.2.bc | llvm-dis
+; RUN: llvm-link %t.1.bc %t.2.bc -S
@X = linkonce global i32 7 ; <i32*> [#uses=0]
Modified: llvm/trunk/test/Linker/link-global-to-func.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/link-global-to-func.ll?rev=81860&r1=81859&r2=81860&view=diff
==============================================================================
--- llvm/trunk/test/Linker/link-global-to-func.ll (original)
+++ llvm/trunk/test/Linker/link-global-to-func.ll Tue Sep 15 10:38:31 2009
@@ -1,7 +1,7 @@
; RUN: llvm-as %s -o %t1.bc
; RUN: echo {declare void @__eprintf(i8*, i8*, i32, i8*) noreturn define void @foo() { tail call void @__eprintf( i8* undef, i8* undef, i32 4, i8* null ) noreturn nounwind unreachable }} | llvm-as -o %t2.bc
-; RUN: llvm-link %t2.bc %t1.bc -o - | llvm-dis | grep __eprintf
-; RUN: llvm-link %t1.bc %t2.bc -o - | llvm-dis | grep __eprintf
+; RUN: llvm-link %t2.bc %t1.bc -S | grep __eprintf
+; RUN: llvm-link %t1.bc %t2.bc -S | grep __eprintf
; rdar://6072702
Modified: llvm/trunk/test/Linker/linknamedmdnode.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/linknamedmdnode.ll?rev=81860&r1=81859&r2=81860&view=diff
==============================================================================
--- llvm/trunk/test/Linker/linknamedmdnode.ll (original)
+++ llvm/trunk/test/Linker/linknamedmdnode.ll Tue Sep 15 10:38:31 2009
@@ -1,6 +1,6 @@
; RUN: llvm-as < %s > %t.bc
; RUN: llvm-as < %p/linknamedmdnode2.ll > %t2.bc
-; RUN: llvm-link %t.bc %t2.bc | llvm-dis | grep "!llvm.stuff = !{!0, !1}"
+; RUN: llvm-link %t.bc %t2.bc -S | grep "!llvm.stuff = !{!0, !1}"
!0 = metadata !{i32 42}
!llvm.stuff = !{!0}
More information about the llvm-commits
mailing list