Changes in directory llvm/test/Linker:
2002-07-17-LinkTest2.ll updated: 1.5 -> 1.6 2003-01-30-LinkerRename.ll updated: 1.5 -> 1.6 2003-01-30-LinkerTypeRename.ll updated: 1.4 -> 1.5 2003-04-21-Linkage.ll updated: 1.4 -> 1.5 2003-04-23-LinkOnceLost.ll updated: 1.4 -> 1.5 2003-04-26-NullPtrLinkProblem.ll updated: 1.5 -> 1.6 2003-05-15-TypeProblem.ll updated: 1.4 -> 1.5 2003-05-31-LinkerRename.ll updated: 1.5 -> 1.6 2003-06-02-TypeResolveProblem.ll updated: 1.4 -> 1.5 2003-06-02-TypeResolveProblem2.ll updated: 1.4 -> 1.5 2003-08-20-OpaqueTypeResolve.ll updated: 1.4 -> 1.5 2003-08-23-GlobalVarLinking.ll updated: 1.5 -> 1.6 2003-08-23-RecursiveOpaqueTypeResolve.ll updated: 1.5 -> 1.6 2003-08-24-InheritPtrSize.ll updated: 1.3 -> 1.4 2003-08-28-TypeResolvesGlobal.ll updated: 1.4 -> 1.5 2003-08-28-TypeResolvesGlobal2.ll updated: 1.4 -> 1.5 2003-08-28-TypeResolvesGlobal3.ll updated: 1.4 -> 1.5 2003-10-21-ConflictingTypesTolerance.ll updated: 1.2 -> 1.3 2003-10-27-LinkOncePromote.ll updated: 1.3 -> 1.4 2003-11-18-TypeResolution.ll updated: 1.3 -> 1.4 2004-02-17-WeakStrongLinkage.ll updated: 1.2 -> 1.3 2004-05-07-TypeResolution1.ll updated: 1.2 -> 1.3 2004-12-03-DisagreeingType.ll updated: 1.1 -> 1.2 2005-02-12-ConstantGlobals-2.ll updated: 1.2 -> 1.3 2005-02-12-ConstantGlobals.ll updated: 1.3 -> 1.4 2005-12-06-AppendingZeroLengthArrays.ll updated: 1.5 -> 1.6 2006-01-19-ConstantPacked.ll updated: 1.2 -> 1.3 2006-06-15-GlobalVarAlignment.ll updated: 1.2 -> 1.3 AppendingLinkage.ll updated: 1.5 -> 1.6 AppendingLinkage2.ll updated: 1.4 -> 1.5 ConstantGlobals1.ll updated: 1.3 -> 1.4 ConstantGlobals2.ll updated: 1.3 -> 1.4 ConstantGlobals3.ll updated: 1.3 -> 1.4 LinkOnce.ll updated: 1.4 -> 1.5 dg.exp updated: 1.4 -> 1.5 redefinition.ll updated: 1.1 -> 1.2 testlink1.ll updated: 1.14 -> 1.15 weakextern.ll updated: 1.6 -> 1.7 --- Log message: For PR1319: http://llvm.org/PR1319 : Upgrade to new test harness --- Diffs of the changes: (+108 -104) 2002-07-17-LinkTest2.ll | 2 +- 2003-01-30-LinkerRename.ll | 10 ++++------ 2003-01-30-LinkerTypeRename.ll | 6 +++--- 2003-04-21-Linkage.ll | 19 +++++++++---------- 2003-04-23-LinkOnceLost.ll | 11 ++++++----- 2003-04-26-NullPtrLinkProblem.ll | 4 ++-- 2003-05-15-TypeProblem.ll | 4 ++-- 2003-05-31-LinkerRename.ll | 22 +++++++++++----------- 2003-06-02-TypeResolveProblem.ll | 4 ++-- 2003-06-02-TypeResolveProblem2.ll | 4 ++-- 2003-08-20-OpaqueTypeResolve.ll | 5 ++--- 2003-08-23-GlobalVarLinking.ll | 5 +++-- 2003-08-23-RecursiveOpaqueTypeResolve.ll | 2 +- 2003-08-24-InheritPtrSize.ll | 8 ++++---- 2003-08-28-TypeResolvesGlobal.ll | 2 +- 2003-08-28-TypeResolvesGlobal2.ll | 2 +- 2003-08-28-TypeResolvesGlobal3.ll | 2 +- 2003-10-21-ConflictingTypesTolerance.ll | 4 ++-- 2003-10-27-LinkOncePromote.ll | 2 +- 2003-11-18-TypeResolution.ll | 2 +- 2004-02-17-WeakStrongLinkage.ll | 2 +- 2004-05-07-TypeResolution1.ll | 2 +- 2004-12-03-DisagreeingType.ll | 7 ++++--- 2005-02-12-ConstantGlobals-2.ll | 8 ++++---- 2005-02-12-ConstantGlobals.ll | 6 +++--- 2005-12-06-AppendingZeroLengthArrays.ll | 4 ++-- 2006-01-19-ConstantPacked.ll | 3 ++- 2006-06-15-GlobalVarAlignment.ll | 8 ++++---- AppendingLinkage.ll | 6 +++--- AppendingLinkage2.ll | 5 +++-- ConstantGlobals1.ll | 5 +++-- ConstantGlobals2.ll | 5 +++-- ConstantGlobals3.ll | 5 +++-- LinkOnce.ll | 2 +- dg.exp | 4 ++-- redefinition.ll | 10 +++++----- testlink1.ll | 2 +- weakextern.ll | 8 ++++---- 38 files changed, 108 insertions(+), 104 deletions(-) Index: llvm/test/Linker/2002-07-17-LinkTest2.ll diff -u llvm/test/Linker/2002-07-17-LinkTest2.ll:1.5 llvm/test/Linker/2002-07-17-LinkTest2.ll:1.6 --- llvm/test/Linker/2002-07-17-LinkTest2.ll:1.5 Sun Dec 31 00:01:59 2006 +++ llvm/test/Linker/2002-07-17-LinkTest2.ll Sun Apr 15 13:11:57 2007 @@ -2,7 +2,7 @@ ; RUN: llvm-as > %t1.bc < /dev/null ; RUN: llvm-upgrade < %s | llvm-as > %t2.bc -; RUN: llvm-link %t[12].bc +; RUN: llvm-link %t1.bc %t2.bc %work = global int (int, int)* %zip Index: llvm/test/Linker/2003-01-30-LinkerRename.ll diff -u llvm/test/Linker/2003-01-30-LinkerRename.ll:1.5 llvm/test/Linker/2003-01-30-LinkerRename.ll:1.6 --- llvm/test/Linker/2003-01-30-LinkerRename.ll:1.5 Fri Jan 26 02:25:06 2007 +++ llvm/test/Linker/2003-01-30-LinkerRename.ll Sun Apr 15 13:11:57 2007 @@ -1,11 +1,9 @@ ; This fails because the linker renames the external symbol not the internal ; one... -; RUN: echo "implementation internal int %foo() { ret int 7 }" | llvm-upgrade |\ -; RUN: llvm-as > %t.1.bc -; RUN: llvm-upgrade < %s | llvm-as -o %t.2.bc -f -; RUN: llvm-link %t.[12].bc | llvm-dis | grep '@foo()' | grep -v internal +; RUN: echo {define internal i32 @foo() \{ ret i32 7 \} } | llvm-as > %t.1.bc +; RUN: llvm-as < %s -o %t.2.bc -f +; RUN: llvm-link %t.1.bc %t.2.bc | llvm-dis | grep @foo() | grep -v internal -implementation -int %foo() { ret int 0 } +define i32 @foo() { ret i32 0 } Index: llvm/test/Linker/2003-01-30-LinkerTypeRename.ll diff -u llvm/test/Linker/2003-01-30-LinkerTypeRename.ll:1.4 llvm/test/Linker/2003-01-30-LinkerTypeRename.ll:1.5 --- llvm/test/Linker/2003-01-30-LinkerTypeRename.ll:1.4 Thu May 27 02:32:25 2004 +++ llvm/test/Linker/2003-01-30-LinkerTypeRename.ll Sun Apr 15 13:11:57 2007 @@ -1,9 +1,9 @@ ; This fails because the linker renames the non-opaque type not the opaque ; one... -; RUN: echo "%Ty = type opaque %GV = external global %Ty*" | llvm-as > %t.1.bc +; 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.[12].bc | llvm-dis | grep '%Ty ' | not grep opaque +; RUN: llvm-link %t.1.bc %t.2.bc | llvm-dis | grep {%Ty } | not grep opaque -%Ty = type int +%Ty = type i32 Index: llvm/test/Linker/2003-04-21-Linkage.ll diff -u llvm/test/Linker/2003-04-21-Linkage.ll:1.4 llvm/test/Linker/2003-04-21-Linkage.ll:1.5 --- llvm/test/Linker/2003-04-21-Linkage.ll:1.4 Fri Dec 29 14:01:32 2006 +++ llvm/test/Linker/2003-04-21-Linkage.ll Sun Apr 15 13:11:57 2007 @@ -1,15 +1,14 @@ -; RUN: echo "%X = linkonce global int 5 implementation linkonce int %foo() { ret int 7 }" | llvm-upgrade | llvm-as > %t.1.bc -; RUN: llvm-upgrade < %s | llvm-as -o %t.2.bc -f -; RUN: llvm-link %t.[12].bc -%X = external global int +; RUN: echo [EMAIL PROTECTED] = linkonce global i32 5 \ +; RUN: define linkonce i32 @foo() \{ ret i32 7 \} } | llvm-as > %t.1.bc +; RUN: llvm-as < %s -o %t.2.bc -f +; RUN: llvm-link %t.1.bc %t.2.bc [EMAIL PROTECTED] = external global i32 -implementation +declare i32 @foo() -declare int %foo() - -void %bar() { - load int* %X - call int %foo() +define void @bar() { + load i32* @X + call i32 @foo() ret void } Index: llvm/test/Linker/2003-04-23-LinkOnceLost.ll diff -u llvm/test/Linker/2003-04-23-LinkOnceLost.ll:1.4 llvm/test/Linker/2003-04-23-LinkOnceLost.ll:1.5 --- llvm/test/Linker/2003-04-23-LinkOnceLost.ll:1.4 Fri Dec 29 14:01:32 2006 +++ llvm/test/Linker/2003-04-23-LinkOnceLost.ll Sun Apr 15 13:11:57 2007 @@ -1,9 +1,10 @@ ; This fails because the linker renames the non-opaque type not the opaque ; one... -; RUN: echo "implementation linkonce void %foo() { ret void } " | llvm-upgrade|\ -; RUN: llvm-as -o %t.2.bc -f -; RUN: llvm-upgrade < %s | llvm-as -o %t.1.bc -f -; RUN: llvm-link %t.[12].bc | llvm-dis | grep foo | grep linkonce +; RUN: echo { define linkonce void @foo() \{ ret void \} } | \ +; RUN: llvm-as -o %t.2.bc -f +; RUN: llvm-as < %s -o %t.1.bc -f +; RUN: llvm-link %t.1.bc %t.2.bc | llvm-dis | grep foo | grep linkonce + +declare void @foo() -declare void %foo() Index: llvm/test/Linker/2003-04-26-NullPtrLinkProblem.ll diff -u llvm/test/Linker/2003-04-26-NullPtrLinkProblem.ll:1.5 llvm/test/Linker/2003-04-26-NullPtrLinkProblem.ll:1.6 --- llvm/test/Linker/2003-04-26-NullPtrLinkProblem.ll:1.5 Sun Dec 31 00:01:59 2006 +++ llvm/test/Linker/2003-04-26-NullPtrLinkProblem.ll Sun Apr 15 13:11:57 2007 @@ -1,9 +1,9 @@ ; This one fails because the LLVM runtime is allowing two null pointers of ; the same type to be created! -; RUN: echo "%T = type int" | llvm-upgrade | llvm-as > %t.2.bc +; RUN: echo {%T = type int} | llvm-upgrade | llvm-as > %t.2.bc ; RUN: llvm-upgrade < %s | llvm-as -f > %t.1.bc -; RUN: llvm-link %t.[12].bc +; RUN: llvm-link %t.1.bc %t.2.bc %T = type opaque Index: llvm/test/Linker/2003-05-15-TypeProblem.ll diff -u llvm/test/Linker/2003-05-15-TypeProblem.ll:1.4 llvm/test/Linker/2003-05-15-TypeProblem.ll:1.5 --- llvm/test/Linker/2003-05-15-TypeProblem.ll:1.4 Sun Dec 31 00:01:59 2006 +++ llvm/test/Linker/2003-05-15-TypeProblem.ll Sun Apr 15 13:11:57 2007 @@ -1,9 +1,9 @@ ; This one fails because the LLVM runtime is allowing two null pointers of ; the same type to be created! -; RUN: echo "%S = type { %T*} %T = type opaque" | llvm-upgrade | llvm-as > %t.2.bc +; RUN: echo {%S = type \{ %T*\} %T = type opaque} | llvm-as > %t.2.bc ; RUN: llvm-upgrade < %s | llvm-as > %t.1.bc -; RUN: llvm-link %t.[12].bc +; RUN: llvm-link %t.1.bc %t.2.bc %S = type { %T* } %T = type int Index: llvm/test/Linker/2003-05-31-LinkerRename.ll diff -u llvm/test/Linker/2003-05-31-LinkerRename.ll:1.5 llvm/test/Linker/2003-05-31-LinkerRename.ll:1.6 --- llvm/test/Linker/2003-05-31-LinkerRename.ll:1.5 Mon Sep 15 15:04:28 2003 +++ llvm/test/Linker/2003-05-31-LinkerRename.ll Sun Apr 15 13:11:57 2007 @@ -1,17 +1,17 @@ -; The funcresolve pass will (intentionally) llvm-link an _internal_ function body with an -; external declaration. Because of this, if we LINK an internal function body into -; a program that already has an external declaration for the function name, we must -; rename the internal function to something that does not conflict. +; The funcresolve pass will (intentionally) llvm-link an _internal_ function +; body with an external declaration. Because of this, if we LINK an internal +; function body into a program that already has an external declaration for +; the function name, we must rename the internal function to something that +; does not conflict. -; RUN: echo "implementation internal int %foo() { ret int 7 }" | llvm-as > %t.1.bc +; 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.[12].bc | llvm-dis | grep 'internal' | not grep '%foo(' +; RUN: llvm-link %t.1.bc %t.2.bc | llvm-dis | grep internal | not grep %foo( -implementation -declare int %foo() +declare i32 @foo() -int %test() { - %X = call int %foo() - ret int %X +define i32 @test() { + %X = call i32 @foo() + ret i32 %X } Index: llvm/test/Linker/2003-06-02-TypeResolveProblem.ll diff -u llvm/test/Linker/2003-06-02-TypeResolveProblem.ll:1.4 llvm/test/Linker/2003-06-02-TypeResolveProblem.ll:1.5 --- llvm/test/Linker/2003-06-02-TypeResolveProblem.ll:1.4 Sun Dec 31 00:01:59 2006 +++ llvm/test/Linker/2003-06-02-TypeResolveProblem.ll Sun Apr 15 13:11:57 2007 @@ -1,6 +1,6 @@ -; RUN: echo "%T = type opaque" | llvm-upgrade | llvm-as > %t.2.bc +; RUN: echo {%T = type opaque} | llvm-upgrade | llvm-as > %t.2.bc ; RUN: llvm-upgrade < %s | llvm-as > %t.1.bc -; RUN: llvm-link %t.[12].bc +; RUN: llvm-link %t.1.bc %t.2.bc %T = type opaque %a = constant { %T* } { %T* null } Index: llvm/test/Linker/2003-06-02-TypeResolveProblem2.ll diff -u llvm/test/Linker/2003-06-02-TypeResolveProblem2.ll:1.4 llvm/test/Linker/2003-06-02-TypeResolveProblem2.ll:1.5 --- llvm/test/Linker/2003-06-02-TypeResolveProblem2.ll:1.4 Sun Dec 31 00:01:59 2006 +++ llvm/test/Linker/2003-06-02-TypeResolveProblem2.ll Sun Apr 15 13:11:57 2007 @@ -1,6 +1,6 @@ -; RUN: echo "%T = type int" | llvm-upgrade | llvm-as > %t.1.bc +; RUN: echo {%T = type int} | llvm-upgrade | llvm-as > %t.1.bc ; RUN: llvm-upgrade < %s | llvm-as > %t.2.bc -; RUN: llvm-link %t.[12].bc +; RUN: llvm-link %t.1.bc %t.2.bc %T = type opaque Index: llvm/test/Linker/2003-08-20-OpaqueTypeResolve.ll diff -u llvm/test/Linker/2003-08-20-OpaqueTypeResolve.ll:1.4 llvm/test/Linker/2003-08-20-OpaqueTypeResolve.ll:1.5 --- llvm/test/Linker/2003-08-20-OpaqueTypeResolve.ll:1.4 Sun Dec 31 00:01:59 2006 +++ llvm/test/Linker/2003-08-20-OpaqueTypeResolve.ll Sun Apr 15 13:11:57 2007 @@ -1,7 +1,6 @@ - ; RUN: llvm-upgrade < %s | llvm-as > %t.out1.bc -; RUN: echo "%S = type { int, int* }" | llvm-upgrade | llvm-as > %t.out2.bc -; RUN: llvm-link %t.out[12].bc +; RUN: echo {%S = type \{ int, int* \} } | llvm-upgrade | llvm-as > %t.out2.bc +; RUN: llvm-link %t.out1.bc %t.out2.bc %T = type opaque %S = type { int, %T* } Index: llvm/test/Linker/2003-08-23-GlobalVarLinking.ll diff -u llvm/test/Linker/2003-08-23-GlobalVarLinking.ll:1.5 llvm/test/Linker/2003-08-23-GlobalVarLinking.ll:1.6 --- llvm/test/Linker/2003-08-23-GlobalVarLinking.ll:1.5 Sun Dec 31 00:01:59 2006 +++ llvm/test/Linker/2003-08-23-GlobalVarLinking.ll Sun Apr 15 13:11:57 2007 @@ -1,6 +1,7 @@ ; RUN: llvm-upgrade < %s | llvm-as > %t.out1.bc -; RUN: echo "%S = external global { int, opaque* } declare void %F(opaque*)" | llvm-upgrade | llvm-as > %t.out2.bc -; RUN: llvm-link %t.out[12].bc | llvm-dis | not grep opaque +; RUN: echo {%S = external global \{ int, opaque* \} declare void %F(opaque*)}\ +; RUN: | llvm-upgrade | llvm-as > %t.out2.bc +; RUN: llvm-link %t.out1.bc %t.out2.bc | llvm-dis | 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'. Index: llvm/test/Linker/2003-08-23-RecursiveOpaqueTypeResolve.ll diff -u llvm/test/Linker/2003-08-23-RecursiveOpaqueTypeResolve.ll:1.5 llvm/test/Linker/2003-08-23-RecursiveOpaqueTypeResolve.ll:1.6 --- llvm/test/Linker/2003-08-23-RecursiveOpaqueTypeResolve.ll:1.5 Sun Dec 31 00:01:59 2006 +++ llvm/test/Linker/2003-08-23-RecursiveOpaqueTypeResolve.ll Sun Apr 15 13:11:57 2007 @@ -3,6 +3,6 @@ ; RUN: llvm-upgrade < %s | llvm-as > %t.out1.bc ; RUN: echo "%S = type { %S*, int* }" | llvm-upgrade | llvm-as > %t.out2.bc -; RUN: llvm-link %t.out[12].bc +; RUN: llvm-link %t.out1.bc %t.out2.bc %S = type { %S*, opaque* } Index: llvm/test/Linker/2003-08-24-InheritPtrSize.ll diff -u llvm/test/Linker/2003-08-24-InheritPtrSize.ll:1.3 llvm/test/Linker/2003-08-24-InheritPtrSize.ll:1.4 --- llvm/test/Linker/2003-08-24-InheritPtrSize.ll:1.3 Fri Sep 26 15:20:44 2003 +++ llvm/test/Linker/2003-08-24-InheritPtrSize.ll Sun Apr 15 13:11:57 2007 @@ -1,9 +1,9 @@ -; Linking these a module with a specified pointer size to one without a +; Linking a module with a specified pointer size to one without a ; specified pointer size should not cause a warning! ; RUN: llvm-as < %s > %t.out1.bc -; RUN: echo "" | llvm-as > %t.out2.bc -; RUN: llvm-link %t.out[12].bc 2>&1 | not grep WARNING +; RUN: echo {} | llvm-as > %t.out2.bc +; RUN: llvm-link %t.out1.bc %t.out2.bc |& not grep warning -target pointersize = 64 +target datalayout = "e-p:64:64" Index: llvm/test/Linker/2003-08-28-TypeResolvesGlobal.ll diff -u llvm/test/Linker/2003-08-28-TypeResolvesGlobal.ll:1.4 llvm/test/Linker/2003-08-28-TypeResolvesGlobal.ll:1.5 --- llvm/test/Linker/2003-08-28-TypeResolvesGlobal.ll:1.4 Fri Dec 29 14:01:32 2006 +++ llvm/test/Linker/2003-08-28-TypeResolvesGlobal.ll Sun Apr 15 13:11:57 2007 @@ -1,6 +1,6 @@ ; RUN: llvm-upgrade < %s | llvm-as > %t.out1.bc ; RUN: echo "%S = type int" | llvm-upgrade | llvm-as > %t.out2.bc -; RUN: llvm-link %t.out[21].bc +; RUN: llvm-link %t.out2.bc %t.out1.bc %S = type opaque Index: llvm/test/Linker/2003-08-28-TypeResolvesGlobal2.ll diff -u llvm/test/Linker/2003-08-28-TypeResolvesGlobal2.ll:1.4 llvm/test/Linker/2003-08-28-TypeResolvesGlobal2.ll:1.5 --- llvm/test/Linker/2003-08-28-TypeResolvesGlobal2.ll:1.4 Fri Dec 29 14:01:32 2006 +++ llvm/test/Linker/2003-08-28-TypeResolvesGlobal2.ll Sun Apr 15 13:11:57 2007 @@ -1,6 +1,6 @@ ; RUN: llvm-upgrade < %s | llvm-as > %t.out1.bc ; RUN: echo "%S = type int" | llvm-upgrade | llvm-as > %t.out2.bc -; RUN: llvm-link %t.out[21].bc +; RUN: llvm-link %t.out2.bc %t.out1.bc %S = type opaque Index: llvm/test/Linker/2003-08-28-TypeResolvesGlobal3.ll diff -u llvm/test/Linker/2003-08-28-TypeResolvesGlobal3.ll:1.4 llvm/test/Linker/2003-08-28-TypeResolvesGlobal3.ll:1.5 --- llvm/test/Linker/2003-08-28-TypeResolvesGlobal3.ll:1.4 Fri Dec 29 14:01:32 2006 +++ llvm/test/Linker/2003-08-28-TypeResolvesGlobal3.ll Sun Apr 15 13:11:57 2007 @@ -1,6 +1,6 @@ ; RUN: llvm-upgrade < %s | llvm-as > %t.out1.bc ; RUN: echo "%S = type int" | llvm-upgrade | llvm-as > %t.out2.bc -; RUN: llvm-link %t.out[21].bc +; RUN: llvm-link %t.out2.bc %t.out1.bc %S = type opaque Index: llvm/test/Linker/2003-10-21-ConflictingTypesTolerance.ll diff -u llvm/test/Linker/2003-10-21-ConflictingTypesTolerance.ll:1.2 llvm/test/Linker/2003-10-21-ConflictingTypesTolerance.ll:1.3 --- llvm/test/Linker/2003-10-21-ConflictingTypesTolerance.ll:1.2 Sun Dec 31 00:01:59 2006 +++ llvm/test/Linker/2003-10-21-ConflictingTypesTolerance.ll Sun Apr 15 13:11:57 2007 @@ -1,6 +1,6 @@ ; RUN: llvm-upgrade < %s | llvm-as > %t.out1.bc -; RUN: echo "%S = type [8 x int] external global %S " | llvm-upgrade | llvm-as > %t.out2.bc -; RUN: llvm-link %t.out[12].bc | llvm-dis | grep %S | grep '{' +; RUN: echo { %S = type \[8 x i32\] external global %S } | llvm-as > %t.out2.bc +; RUN: llvm-link %t.out1.bc %t.out2.bc | llvm-dis | grep %S | grep \{ %S = type { int } Index: llvm/test/Linker/2003-10-27-LinkOncePromote.ll diff -u llvm/test/Linker/2003-10-27-LinkOncePromote.ll:1.3 llvm/test/Linker/2003-10-27-LinkOncePromote.ll:1.4 --- llvm/test/Linker/2003-10-27-LinkOncePromote.ll:1.3 Sun Dec 31 00:01:59 2006 +++ llvm/test/Linker/2003-10-27-LinkOncePromote.ll Sun Apr 15 13:11:57 2007 @@ -3,6 +3,6 @@ ; RUN: echo "%X = global int 7" | llvm-upgrade | llvm-as > %t.2.bc ; RUN: llvm-upgrade < %s | llvm-as > %t.1.bc -; RUN: llvm-link %t.[12].bc +; RUN: llvm-link %t.1.bc %t.2.bc %X = linkonce global int 7 Index: llvm/test/Linker/2003-11-18-TypeResolution.ll diff -u llvm/test/Linker/2003-11-18-TypeResolution.ll:1.3 llvm/test/Linker/2003-11-18-TypeResolution.ll:1.4 --- llvm/test/Linker/2003-11-18-TypeResolution.ll:1.3 Fri Jan 26 02:25:06 2007 +++ llvm/test/Linker/2003-11-18-TypeResolution.ll Sun Apr 15 13:11:57 2007 @@ -6,7 +6,7 @@ ; RUN: llvm-upgrade %s | llvm-as > %t.out2.bc ; RUN: echo "%T1 = type opaque @GVar = external global %T1*" | llvm-as > %t.out1.bc -; RUN: llvm-link %t.out[12].bc +; RUN: llvm-link %t.out1.bc %t.out2.bc %T1 = type opaque %T2 = type int Index: llvm/test/Linker/2004-02-17-WeakStrongLinkage.ll diff -u llvm/test/Linker/2004-02-17-WeakStrongLinkage.ll:1.2 llvm/test/Linker/2004-02-17-WeakStrongLinkage.ll:1.3 --- llvm/test/Linker/2004-02-17-WeakStrongLinkage.ll:1.2 Sun Dec 31 00:01:59 2006 +++ llvm/test/Linker/2004-02-17-WeakStrongLinkage.ll Sun Apr 15 13:11:57 2007 @@ -1,6 +1,6 @@ ; RUN: llvm-upgrade < %s | llvm-as > %t.out2.bc ; RUN: echo "%me = global int* null" | llvm-upgrade | llvm-as > %t.out1.bc -; RUN: llvm-link %t.out[12].bc -o /dev/null -f +; RUN: llvm-link %t.out1.bc %t.out2.bc -o /dev/null -f %me = weak global int * null Index: llvm/test/Linker/2004-05-07-TypeResolution1.ll diff -u llvm/test/Linker/2004-05-07-TypeResolution1.ll:1.2 llvm/test/Linker/2004-05-07-TypeResolution1.ll:1.3 --- llvm/test/Linker/2004-05-07-TypeResolution1.ll:1.2 Fri Dec 29 14:01:32 2006 +++ llvm/test/Linker/2004-05-07-TypeResolution1.ll Sun Apr 15 13:11:57 2007 @@ -1,5 +1,5 @@ ; RUN: llvm-upgrade < %s | llvm-as -f -o %t1.bc -; RUN: llvm-upgrade < `dirname %s`/2004-05-07-TypeResolution2.ll | \ +; RUN: llvm-upgrade < %p/2004-05-07-TypeResolution2.ll | \ ; RUN: llvm-as -o %t2.bc -f ; RUN: llvm-link -f -o %t3.bc %t1.bc %t2.bc Index: llvm/test/Linker/2004-12-03-DisagreeingType.ll diff -u llvm/test/Linker/2004-12-03-DisagreeingType.ll:1.1 llvm/test/Linker/2004-12-03-DisagreeingType.ll:1.2 --- llvm/test/Linker/2004-12-03-DisagreeingType.ll:1.1 Sat Jan 1 20:46:29 2005 +++ llvm/test/Linker/2004-12-03-DisagreeingType.ll Sun Apr 15 13:11:57 2007 @@ -1,8 +1,9 @@ -; RUN: echo "%G = weak global {{{{double}}}} zeroinitializer" | llvm-as > %t.out2.bc +; RUN: echo [EMAIL PROTECTED] = weak global \{\{\{\{double\}\}\}\} zeroinitializer } | \ +; RUN: llvm-as > %t.out2.bc ; RUN: llvm-as < %s > %t.out1.bc -; RUN: llvm-link %t.out[12].bc | llvm-dis | not grep '\}' +; RUN: llvm-link %t.out1.bc %t.out2.bc | llvm-dis | not grep {\}} ; When linked, the global above should be eliminated, being merged with the ; global below. -%G = global double 1.0 [EMAIL PROTECTED] = global double 1.0 Index: llvm/test/Linker/2005-02-12-ConstantGlobals-2.ll diff -u llvm/test/Linker/2005-02-12-ConstantGlobals-2.ll:1.2 llvm/test/Linker/2005-02-12-ConstantGlobals-2.ll:1.3 --- llvm/test/Linker/2005-02-12-ConstantGlobals-2.ll:1.2 Sun Dec 31 00:01:59 2006 +++ llvm/test/Linker/2005-02-12-ConstantGlobals-2.ll Sun Apr 15 13:11:57 2007 @@ -1,8 +1,8 @@ ; Test that a prototype can be marked const, and the definition is allowed ; to be nonconst. -; RUN: echo "%X = external constant int" | llvm-upgrade | llvm-as > %t.2.bc -; RUN: llvm-upgrade < %s | llvm-as > %t.1.bc -; RUN: llvm-link %t.[12].bc | llvm-dis | grep 'global i32 7' +; RUN: echo [EMAIL PROTECTED] = 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} -%X = global int 7 [EMAIL PROTECTED] = global i32 7 Index: llvm/test/Linker/2005-02-12-ConstantGlobals.ll diff -u llvm/test/Linker/2005-02-12-ConstantGlobals.ll:1.3 llvm/test/Linker/2005-02-12-ConstantGlobals.ll:1.4 --- llvm/test/Linker/2005-02-12-ConstantGlobals.ll:1.3 Sun Dec 31 00:01:59 2006 +++ llvm/test/Linker/2005-02-12-ConstantGlobals.ll Sun Apr 15 13:11:57 2007 @@ -1,8 +1,8 @@ ; Test that a prototype can be marked const, and the definition is allowed ; to be nonconst. -; RUN: echo "%X = global int 7" | llvm-upgrade | llvm-as > %t.2.bc +; RUN: echo [EMAIL PROTECTED] = global i32 7} | llvm-as > %t.2.bc ; RUN: llvm-upgrade < %s | llvm-as > %t.1.bc -; RUN: llvm-link %t.[12].bc | llvm-dis | grep 'global i32 7' +; RUN: llvm-link %t.1.bc %t.2.bc | llvm-dis | grep {global i32 7} -%X = external constant int [EMAIL PROTECTED] = external constant i32 Index: llvm/test/Linker/2005-12-06-AppendingZeroLengthArrays.ll diff -u llvm/test/Linker/2005-12-06-AppendingZeroLengthArrays.ll:1.5 llvm/test/Linker/2005-12-06-AppendingZeroLengthArrays.ll:1.6 --- llvm/test/Linker/2005-12-06-AppendingZeroLengthArrays.ll:1.5 Fri Jan 26 02:25:06 2007 +++ llvm/test/Linker/2005-12-06-AppendingZeroLengthArrays.ll Sun Apr 15 13:11:57 2007 @@ -1,7 +1,7 @@ -; RUN: echo "@G = appending global [0 x i32] zeroinitializer" | \ +; RUN: echo { @G = appending global \[0 x i32\] zeroinitializer } | \ ; RUN: llvm-as > %t.out2.bc ; RUN: llvm-upgrade < %s | llvm-as > %t.out1.bc -; RUN: llvm-link %t.out[12].bc | llvm-dis | grep '@G =' +; RUN: llvm-link %t.out1.bc %t.out2.bc | llvm-dis | grep [EMAIL PROTECTED] =} ; When linked, the globals should be merged, and the result should still ; be named '@G'. Index: llvm/test/Linker/2006-01-19-ConstantPacked.ll diff -u llvm/test/Linker/2006-01-19-ConstantPacked.ll:1.2 llvm/test/Linker/2006-01-19-ConstantPacked.ll:1.3 --- llvm/test/Linker/2006-01-19-ConstantPacked.ll:1.2 Sun Dec 31 00:01:59 2006 +++ llvm/test/Linker/2006-01-19-ConstantPacked.ll Sun Apr 15 13:11:57 2007 @@ -1,4 +1,5 @@ -; RUN: llvm-upgrade < %s | llvm-as -f -o %s.bc ; llvm-link -f -o %s.linked %s.bc +; RUN: llvm-upgrade < %s | llvm-as -f -o %s.bc +; RUN: llvm-link -f -o %s.linked %s.bc target endian = big target pointersize = 32 Index: llvm/test/Linker/2006-06-15-GlobalVarAlignment.ll diff -u llvm/test/Linker/2006-06-15-GlobalVarAlignment.ll:1.2 llvm/test/Linker/2006-06-15-GlobalVarAlignment.ll:1.3 --- llvm/test/Linker/2006-06-15-GlobalVarAlignment.ll:1.2 Sun Dec 31 00:01:59 2006 +++ llvm/test/Linker/2006-06-15-GlobalVarAlignment.ll Sun Apr 15 13:11:57 2007 @@ -1,7 +1,7 @@ ; The linker should choose the largest alignment when linking. -; RUN: echo "%X = global int 7, align 8" | llvm-upgrade | llvm-as > %t.2.bc -; RUN: llvm-upgrade < %s | llvm-as > %t.1.bc -; RUN: llvm-link %t.[12].bc | llvm-dis | grep 'align 8' +; RUN: echo [EMAIL PROTECTED] = 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} -%X = weak global int 7, align 4 [EMAIL PROTECTED] = weak global i32 7, align 4 Index: llvm/test/Linker/AppendingLinkage.ll diff -u llvm/test/Linker/AppendingLinkage.ll:1.5 llvm/test/Linker/AppendingLinkage.ll:1.6 --- llvm/test/Linker/AppendingLinkage.ll:1.5 Fri Dec 29 14:01:32 2006 +++ llvm/test/Linker/AppendingLinkage.ll Sun Apr 15 13:11:57 2007 @@ -1,9 +1,9 @@ ; Test that appending linkage works correctly. -; RUN: echo "%X = appending global [1x int] [int 8]" | llvm-upgrade | \ -; RUN: llvm-as > %t.2.bc +; RUN: echo {%X = appending global \[1 x int\] \[int 8\] } | \ +; RUN: llvm-upgrade | llvm-as > %t.2.bc ; RUN: llvm-upgrade < %s | llvm-as > %t.1.bc -; RUN: llvm-link %t.[12].bc | llvm-dis | grep 7 | grep 4 | grep 8 +; RUN: llvm-link %t.1.bc %t.2.bc | llvm-dis | grep 7 | grep 4 | grep 8 %X = appending global [2 x int] [int 7, int 4] Index: llvm/test/Linker/AppendingLinkage2.ll diff -u llvm/test/Linker/AppendingLinkage2.ll:1.4 llvm/test/Linker/AppendingLinkage2.ll:1.5 --- llvm/test/Linker/AppendingLinkage2.ll:1.4 Sun Dec 31 00:01:59 2006 +++ llvm/test/Linker/AppendingLinkage2.ll Sun Apr 15 13:11:57 2007 @@ -1,7 +1,8 @@ ; Test that appending linkage works correctly when arrays are the same size. -; RUN: echo "%X = appending global [1x int] [int 8]" | llvm-upgrade | llvm-as > %t.2.bc +; RUN: echo {%X = appending global \[1 x int\] \[int 8\] } | \ +; RUN: llvm-upgrade | llvm-as > %t.2.bc ; RUN: llvm-upgrade < %s | llvm-as > %t.1.bc -; RUN: llvm-link %t.[12].bc | llvm-dis | grep 7 | grep 8 +; RUN: llvm-link %t.1.bc %t.2.bc | llvm-dis | grep 7 | grep 8 %X = appending global [1 x int] [int 7] Index: llvm/test/Linker/ConstantGlobals1.ll diff -u llvm/test/Linker/ConstantGlobals1.ll:1.3 llvm/test/Linker/ConstantGlobals1.ll:1.4 --- llvm/test/Linker/ConstantGlobals1.ll:1.3 Sun Dec 31 00:01:59 2006 +++ llvm/test/Linker/ConstantGlobals1.ll Sun Apr 15 13:11:57 2007 @@ -1,7 +1,8 @@ ; Test that appending linkage works correctly when arrays are the same size. -; RUN: echo "%X = constant [1x int] [int 8]" | llvm-upgrade | llvm-as > %t.2.bc +; RUN: echo {%X = constant \[1 x int\] \[int 8\] } | \ +; RUN: llvm-upgrade | llvm-as > %t.2.bc ; RUN: llvm-upgrade < %s | llvm-as > %t.1.bc -; RUN: llvm-link %t.[12].bc | llvm-dis | grep constant +; RUN: llvm-link %t.1.bc %t.2.bc | llvm-dis | grep constant %X = uninitialized global [1 x int] Index: llvm/test/Linker/ConstantGlobals2.ll diff -u llvm/test/Linker/ConstantGlobals2.ll:1.3 llvm/test/Linker/ConstantGlobals2.ll:1.4 --- llvm/test/Linker/ConstantGlobals2.ll:1.3 Sun Dec 31 00:01:59 2006 +++ llvm/test/Linker/ConstantGlobals2.ll Sun Apr 15 13:11:57 2007 @@ -1,7 +1,8 @@ ; Test that appending linkage works correctly when arrays are the same size. -; RUN: echo "%X = external global [1x int]" | llvm-upgrade | llvm-as > %t.2.bc +; RUN: echo {%X = external global \[1 x int\] } | \ +; RUN: llvm-upgrade | llvm-as > %t.2.bc ; RUN: llvm-upgrade %s -o - | llvm-as > %t.1.bc -; RUN: llvm-link %t.[12].bc | llvm-dis | grep constant +; RUN: llvm-link %t.1.bc %t.2.bc | llvm-dis | grep constant %X = constant [1 x int] [ int 12 ] Index: llvm/test/Linker/ConstantGlobals3.ll diff -u llvm/test/Linker/ConstantGlobals3.ll:1.3 llvm/test/Linker/ConstantGlobals3.ll:1.4 --- llvm/test/Linker/ConstantGlobals3.ll:1.3 Sun Dec 31 00:01:59 2006 +++ llvm/test/Linker/ConstantGlobals3.ll Sun Apr 15 13:11:57 2007 @@ -1,7 +1,8 @@ ; Test that appending linkage works correctly when arrays are the same size. -; RUN: echo "%X = external constant [1x int]" | llvm-upgrade | llvm-as > %t.2.bc +; RUN: echo {%X = external constant \[1 x int\] } | \ +; RUN: llvm-upgrade | llvm-as > %t.2.bc ; RUN: llvm-upgrade %s | llvm-as > %t.1.bc -; RUN: llvm-link %t.[12].bc | llvm-dis | grep constant +; RUN: llvm-link %t.1.bc %t.2.bc | llvm-dis | grep constant %X = uninitialized global [1 x int] Index: llvm/test/Linker/LinkOnce.ll diff -u llvm/test/Linker/LinkOnce.ll:1.4 llvm/test/Linker/LinkOnce.ll:1.5 --- llvm/test/Linker/LinkOnce.ll:1.4 Sun Dec 31 00:01:59 2006 +++ llvm/test/Linker/LinkOnce.ll Sun Apr 15 13:11:57 2007 @@ -3,6 +3,6 @@ ; RUN: echo "%X = linkonce global int 8" | llvm-upgrade | llvm-as > %t.2.bc ; RUN: llvm-upgrade < %s | llvm-as > %t.1.bc -; RUN: llvm-link %t.[12].bc | llvm-dis +; RUN: llvm-link %t.1.bc %t.2.bc | llvm-dis %X = linkonce global int 7 Index: llvm/test/Linker/dg.exp diff -u llvm/test/Linker/dg.exp:1.4 llvm/test/Linker/dg.exp:1.5 --- llvm/test/Linker/dg.exp:1.4 Wed Apr 11 14:56:58 2007 +++ llvm/test/Linker/dg.exp Sun Apr 15 13:11:57 2007 @@ -1,3 +1,3 @@ -load_lib llvm-dg.exp +load_lib llvm.exp -llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] +RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] Index: llvm/test/Linker/redefinition.ll diff -u llvm/test/Linker/redefinition.ll:1.1 llvm/test/Linker/redefinition.ll:1.2 --- llvm/test/Linker/redefinition.ll:1.1 Mon Feb 5 14:47:21 2007 +++ llvm/test/Linker/redefinition.ll Sun Apr 15 13:11:57 2007 @@ -2,9 +2,9 @@ ; in different modules. ; RUN: llvm-as %s -o %t.foo1.bc -f ; RUN: llvm-as %s -o %t.foo2.bc -f -; RUN: echo "define void @foo(i32 %x) { ret void }" | llvm-as -o %t.foo3.bc -f -; RUN: llvm-link %t.foo1.bc %t.foo2.bc -o %t.bc 2>&1 | \ -; RUN: grep "Function is already defined" -; RUN: llvm-link %t.foo1.bc %t.foo3.bc -o %t.bc 2>&1 | \ -; RUN: grep "Function 'foo' defined as both" +; RUN: echo {define void @foo(i32 %x) { ret void }} | llvm-as -o %t.foo3.bc -f +; RUN: ignore llvm-link %t.foo1.bc %t.foo2.bc -o %t.bc |& \ +; RUN: grep {Function is already defined} +; RUN: ignore llvm-link %t.foo1.bc %t.foo3.bc -o %t.bc |& \ +; RUN: grep {Function 'foo' defined as both} define void @foo() { ret void } Index: llvm/test/Linker/testlink1.ll diff -u llvm/test/Linker/testlink1.ll:1.14 llvm/test/Linker/testlink1.ll:1.15 --- llvm/test/Linker/testlink1.ll:1.14 Fri Dec 29 14:01:32 2006 +++ llvm/test/Linker/testlink1.ll Sun Apr 15 13:11:57 2007 @@ -1,5 +1,5 @@ ; RUN: llvm-upgrade < %s | llvm-as > %t.bc -; RUN: llvm-upgrade < `dirname %s`/testlink2.ll | llvm-as > %t2.bc +; RUN: llvm-upgrade < %p/testlink2.ll | llvm-as > %t2.bc ; RUN: llvm-link %t.bc %t2.bc %MyVar = external global int Index: llvm/test/Linker/weakextern.ll diff -u llvm/test/Linker/weakextern.ll:1.6 llvm/test/Linker/weakextern.ll:1.7 --- llvm/test/Linker/weakextern.ll:1.6 Fri Jan 5 12:36:46 2007 +++ llvm/test/Linker/weakextern.ll Sun Apr 15 13:11:57 2007 @@ -1,9 +1,9 @@ ; RUN: llvm-upgrade < %s | llvm-as > %t.bc -; RUN: llvm-upgrade < `dirname %s`/testlink1.ll | llvm-as > %t2.bc +; RUN: llvm-upgrade < %p/testlink1.ll | llvm-as > %t2.bc ; RUN: llvm-link %t.bc %t.bc %t2.bc -o %t1.bc -f -; RUN: llvm-dis < %t1.bc | grep "kallsyms_names = extern_weak" && -; RUN: llvm-dis < %t1.bc | grep "MyVar = external global i32" && -; RUN: llvm-dis < %t1.bc | grep "Inte = global i32" +; RUN: llvm-dis < %t1.bc | grep {kallsyms_names = extern_weak} +; RUN: llvm-dis < %t1.bc | grep {MyVar = external global i32} +; RUN: llvm-dis < %t1.bc | grep {Inte = global i32} %kallsyms_names = extern_weak global [0 x ubyte] %MyVar = extern_weak global int _______________________________________________ llvm-commits mailing list [EMAIL PROTECTED] http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
