Sat Dec 30 22:03:31 PST 2006

Changes in directory llvm/test/Regression/Linker:

2002-07-17-GlobalFail.ll updated: 1.3 -> 1.4
2002-07-17-LinkTest2.ll updated: 1.4 -> 1.5
2002-08-20-ConstantExpr.ll updated: 1.4 -> 1.5
2003-04-26-NullPtrLinkProblem.ll updated: 1.4 -> 1.5
2003-05-15-TypeProblem.ll updated: 1.3 -> 1.4
2003-06-02-TypeResolveProblem.ll updated: 1.3 -> 1.4
2003-06-02-TypeResolveProblem2.ll updated: 1.3 -> 1.4
2003-08-20-OpaqueTypeResolve.ll updated: 1.3 -> 1.4
2003-08-23-GlobalVarLinking.ll updated: 1.4 -> 1.5
2003-08-23-RecursiveOpaqueTypeResolve.ll updated: 1.4 -> 1.5
2003-10-21-ConflictingTypesTolerance.ll updated: 1.1 -> 1.2
2003-10-27-LinkOncePromote.ll updated: 1.2 -> 1.3
2004-02-17-WeakStrongLinkage.ll updated: 1.1 -> 1.2
2005-02-12-ConstantGlobals-2.ll updated: 1.1 -> 1.2
2005-02-12-ConstantGlobals.ll updated: 1.2 -> 1.3
2005-12-06-AppendingZeroLengthArrays.ll updated: 1.1 -> 1.2
2006-01-19-ConstantPacked.ll updated: 1.1 -> 1.2
2006-06-15-GlobalVarAlignment.ll updated: 1.1 -> 1.2
AppendingLinkage2.ll updated: 1.3 -> 1.4
ConstantGlobals1.ll updated: 1.2 -> 1.3
ConstantGlobals2.ll updated: 1.2 -> 1.3
ConstantGlobals3.ll updated: 1.2 -> 1.3
LinkOnce.ll updated: 1.3 -> 1.4
weakextern.ll updated: 1.2 -> 1.3
---
Log message:

For PR950: http://llvm.org/PR950 :
Update the test suite to accommodate the change from signed integer types
to signless integer types. The changes were of only a few kinds:

1. Make sure llvm-upgrade is run on the source which does the bulk of the
   changes automatically.

2. Change things like "grep 'int'" to "grep 'i32'"

3. In several tests bitcasting caused the same name to be reused in the
   same type plane. These had to be manually fixed. The fix was (generally)
   to leave the bitcast and provide the instruction with a new name. This
   should not affect the semantics of the test. In a few cases, the 
   bitcasts were known to be superfluous and irrelevant to the test case
   so they were removed.

4. One test case uses a bytecode file which needed to be updated to the
   latest bytecode format.



---
Diffs of the changes:  (+47 -47)

 2002-07-17-GlobalFail.ll                 |    2 +-
 2002-07-17-LinkTest2.ll                  |    2 +-
 2002-08-20-ConstantExpr.ll               |    2 +-
 2003-04-26-NullPtrLinkProblem.ll         |    2 +-
 2003-05-15-TypeProblem.ll                |    4 ++--
 2003-06-02-TypeResolveProblem.ll         |    4 ++--
 2003-06-02-TypeResolveProblem2.ll        |    4 ++--
 2003-08-20-OpaqueTypeResolve.ll          |    4 ++--
 2003-08-23-GlobalVarLinking.ll           |    4 ++--
 2003-08-23-RecursiveOpaqueTypeResolve.ll |    4 ++--
 2003-10-21-ConflictingTypesTolerance.ll  |    4 ++--
 2003-10-27-LinkOncePromote.ll            |    4 ++--
 2004-02-17-WeakStrongLinkage.ll          |    4 ++--
 2005-02-12-ConstantGlobals-2.ll          |    6 +++---
 2005-02-12-ConstantGlobals.ll            |    6 +++---
 2005-12-06-AppendingZeroLengthArrays.ll  |    4 ++--
 2006-01-19-ConstantPacked.ll             |    2 +-
 2006-06-15-GlobalVarAlignment.ll         |    4 ++--
 AppendingLinkage2.ll                     |    4 ++--
 ConstantGlobals1.ll                      |    4 ++--
 ConstantGlobals2.ll                      |    4 ++--
 ConstantGlobals3.ll                      |    2 +-
 LinkOnce.ll                              |    4 ++--
 weakextern.ll                            |   10 +++++-----
 24 files changed, 47 insertions(+), 47 deletions(-)


Index: llvm/test/Regression/Linker/2002-07-17-GlobalFail.ll
diff -u llvm/test/Regression/Linker/2002-07-17-GlobalFail.ll:1.3 llvm/test/Regression/Linker/2002-07-17-GlobalFail.ll:1.4

--- llvm/test/Regression/Linker/2002-07-17-GlobalFail.ll:1.3	Mon Sep 15 15:04:28 2003
+++ llvm/test/Regression/Linker/2002-07-17-GlobalFail.ll	Sun Dec 31 00:01:59 2006
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s > %t.bc
+; RUN: llvm-upgrade < %s | llvm-as > %t.bc
 ; RUN: echo | llvm-as > %t.tmp.bc
 ; RUN: llvm-link %t.tmp.bc %t.bc
 


Index: llvm/test/Regression/Linker/2002-07-17-LinkTest2.ll
diff -u llvm/test/Regression/Linker/2002-07-17-LinkTest2.ll:1.4 llvm/test/Regression/Linker/2002-07-17-LinkTest2.ll:1.5
--- llvm/test/Regression/Linker/2002-07-17-LinkTest2.ll:1.4	Mon Sep 15 15:04:28 2003
+++ llvm/test/Regression/Linker/2002-07-17-LinkTest2.ll	Sun Dec 31 00:01:59 2006
@@ -1,7 +1,7 @@
 ; This fails linking when it is linked with an empty file as the first object file
 
 ; RUN: llvm-as > %t1.bc < /dev/null
-; RUN: llvm-as < %s > %t2.bc
+; RUN: llvm-upgrade < %s | llvm-as > %t2.bc
 ; RUN: llvm-link %t[12].bc
 
 %work = global int (int, int)* %zip


Index: llvm/test/Regression/Linker/2002-08-20-ConstantExpr.ll
diff -u llvm/test/Regression/Linker/2002-08-20-ConstantExpr.ll:1.4 llvm/test/Regression/Linker/2002-08-20-ConstantExpr.ll:1.5
--- llvm/test/Regression/Linker/2002-08-20-ConstantExpr.ll:1.4	Mon Sep 15 15:04:28 2003
+++ llvm/test/Regression/Linker/2002-08-20-ConstantExpr.ll	Sun Dec 31 00:01:59 2006
@@ -1,7 +1,7 @@
 ; This fails linking when it is linked with an empty file as the first object file
 
 ; RUN: llvm-as > %t.LinkTest.bc < /dev/null
-; RUN: llvm-as < %s > %t.bc
+; RUN: llvm-upgrade < %s | llvm-as > %t.bc
 ; RUN: llvm-link %t.LinkTest.bc %t.bc
 
 %work = global int 4


Index: llvm/test/Regression/Linker/2003-04-26-NullPtrLinkProblem.ll
diff -u llvm/test/Regression/Linker/2003-04-26-NullPtrLinkProblem.ll:1.4 llvm/test/Regression/Linker/2003-04-26-NullPtrLinkProblem.ll:1.5
--- llvm/test/Regression/Linker/2003-04-26-NullPtrLinkProblem.ll:1.4	Mon Dec 18 20:10:04 2006
+++ llvm/test/Regression/Linker/2003-04-26-NullPtrLinkProblem.ll	Sun Dec 31 00:01:59 2006
@@ -1,7 +1,7 @@
 ; 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-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
 


Index: llvm/test/Regression/Linker/2003-05-15-TypeProblem.ll
diff -u llvm/test/Regression/Linker/2003-05-15-TypeProblem.ll:1.3 llvm/test/Regression/Linker/2003-05-15-TypeProblem.ll:1.4
--- llvm/test/Regression/Linker/2003-05-15-TypeProblem.ll:1.3	Mon Sep 15 15:04:28 2003
+++ llvm/test/Regression/Linker/2003-05-15-TypeProblem.ll	Sun Dec 31 00:01:59 2006
@@ -1,8 +1,8 @@
 ; 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-as > %t.2.bc
-; RUN: llvm-as < %s > %t.1.bc
+; RUN: echo "%S = type { %T*} %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
 
 %S = type { %T* }


Index: llvm/test/Regression/Linker/2003-06-02-TypeResolveProblem.ll
diff -u llvm/test/Regression/Linker/2003-06-02-TypeResolveProblem.ll:1.3 llvm/test/Regression/Linker/2003-06-02-TypeResolveProblem.ll:1.4
--- llvm/test/Regression/Linker/2003-06-02-TypeResolveProblem.ll:1.3	Mon Sep 15 15:04:28 2003
+++ llvm/test/Regression/Linker/2003-06-02-TypeResolveProblem.ll	Sun Dec 31 00:01:59 2006
@@ -1,5 +1,5 @@
-; RUN: echo "%T = type opaque" | llvm-as > %t.2.bc
-; RUN: llvm-as < %s > %t.1.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
 
 %T = type opaque


Index: llvm/test/Regression/Linker/2003-06-02-TypeResolveProblem2.ll
diff -u llvm/test/Regression/Linker/2003-06-02-TypeResolveProblem2.ll:1.3 llvm/test/Regression/Linker/2003-06-02-TypeResolveProblem2.ll:1.4
--- llvm/test/Regression/Linker/2003-06-02-TypeResolveProblem2.ll:1.3	Mon Sep 15 15:04:28 2003
+++ llvm/test/Regression/Linker/2003-06-02-TypeResolveProblem2.ll	Sun Dec 31 00:01:59 2006
@@ -1,5 +1,5 @@
-; RUN: echo "%T = type int" | llvm-as > %t.1.bc
-; RUN: llvm-as < %s > %t.2.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
 
 %T = type opaque


Index: llvm/test/Regression/Linker/2003-08-20-OpaqueTypeResolve.ll
diff -u llvm/test/Regression/Linker/2003-08-20-OpaqueTypeResolve.ll:1.3 llvm/test/Regression/Linker/2003-08-20-OpaqueTypeResolve.ll:1.4
--- llvm/test/Regression/Linker/2003-08-20-OpaqueTypeResolve.ll:1.3	Fri Sep 26 15:20:44 2003
+++ llvm/test/Regression/Linker/2003-08-20-OpaqueTypeResolve.ll	Sun Dec 31 00:01:59 2006
@@ -1,6 +1,6 @@
 
-; RUN: llvm-as < %s > %t.out1.bc
-; RUN: echo "%S = type { int, int* }" | llvm-as > %t.out2.bc
+; 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
 
 %T = type opaque


Index: llvm/test/Regression/Linker/2003-08-23-GlobalVarLinking.ll
diff -u llvm/test/Regression/Linker/2003-08-23-GlobalVarLinking.ll:1.4 llvm/test/Regression/Linker/2003-08-23-GlobalVarLinking.ll:1.5
--- llvm/test/Regression/Linker/2003-08-23-GlobalVarLinking.ll:1.4	Fri Sep 26 15:20:44 2003
+++ llvm/test/Regression/Linker/2003-08-23-GlobalVarLinking.ll	Sun Dec 31 00:01:59 2006
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s > %t.out1.bc
-; RUN: echo "%S = external global { int, opaque* } declare void %F(opaque*)" | llvm-as > %t.out2.bc
+; 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
 
 ; After linking this testcase, there should be no opaque types left.  The two


Index: llvm/test/Regression/Linker/2003-08-23-RecursiveOpaqueTypeResolve.ll
diff -u llvm/test/Regression/Linker/2003-08-23-RecursiveOpaqueTypeResolve.ll:1.4 llvm/test/Regression/Linker/2003-08-23-RecursiveOpaqueTypeResolve.ll:1.5
--- llvm/test/Regression/Linker/2003-08-23-RecursiveOpaqueTypeResolve.ll:1.4	Fri Sep 26 15:20:44 2003
+++ llvm/test/Regression/Linker/2003-08-23-RecursiveOpaqueTypeResolve.ll	Sun Dec 31 00:01:59 2006
@@ -1,8 +1,8 @@
 ; It's a bad idea to go recursively traipsing through types without a safety 
 ; net.
 
-; RUN: llvm-as < %s > %t.out1.bc
-; RUN: echo "%S = type { %S*, int* }" | llvm-as > %t.out2.bc
+; 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
 
 %S = type { %S*, opaque* }


Index: llvm/test/Regression/Linker/2003-10-21-ConflictingTypesTolerance.ll
diff -u llvm/test/Regression/Linker/2003-10-21-ConflictingTypesTolerance.ll:1.1 llvm/test/Regression/Linker/2003-10-21-ConflictingTypesTolerance.ll:1.2
--- llvm/test/Regression/Linker/2003-10-21-ConflictingTypesTolerance.ll:1.1	Tue Oct 21 17:46:22 2003
+++ llvm/test/Regression/Linker/2003-10-21-ConflictingTypesTolerance.ll	Sun Dec 31 00:01:59 2006
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s > %t.out1.bc
-; RUN: echo "%S = type [8 x int] external global %S " | llvm-as > %t.out2.bc
+; 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 '{'
 
 %S = type { int }


Index: llvm/test/Regression/Linker/2003-10-27-LinkOncePromote.ll
diff -u llvm/test/Regression/Linker/2003-10-27-LinkOncePromote.ll:1.2 llvm/test/Regression/Linker/2003-10-27-LinkOncePromote.ll:1.3
--- llvm/test/Regression/Linker/2003-10-27-LinkOncePromote.ll:1.2	Mon Oct 27 10:30:29 2003
+++ llvm/test/Regression/Linker/2003-10-27-LinkOncePromote.ll	Sun Dec 31 00:01:59 2006
@@ -1,8 +1,8 @@
 ; The linker should merge link-once globals into strong external globals,
 ; just like it does for weak symbols!
 
-; RUN: echo "%X = global int 7" | llvm-as > %t.2.bc
-; RUN: llvm-as < %s > %t.1.bc
+; 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
 
 %X = linkonce global int 7


Index: llvm/test/Regression/Linker/2004-02-17-WeakStrongLinkage.ll
diff -u llvm/test/Regression/Linker/2004-02-17-WeakStrongLinkage.ll:1.1 llvm/test/Regression/Linker/2004-02-17-WeakStrongLinkage.ll:1.2
--- llvm/test/Regression/Linker/2004-02-17-WeakStrongLinkage.ll:1.1	Tue Feb 17 15:58:29 2004
+++ llvm/test/Regression/Linker/2004-02-17-WeakStrongLinkage.ll	Sun Dec 31 00:01:59 2006
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s > %t.out2.bc
-; RUN: echo "%me = global int* null" | llvm-as > %t.out1.bc
+; 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
 
 %me = weak global int * null


Index: llvm/test/Regression/Linker/2005-02-12-ConstantGlobals-2.ll
diff -u llvm/test/Regression/Linker/2005-02-12-ConstantGlobals-2.ll:1.1 llvm/test/Regression/Linker/2005-02-12-ConstantGlobals-2.ll:1.2
--- llvm/test/Regression/Linker/2005-02-12-ConstantGlobals-2.ll:1.1	Sat Feb 12 13:19:36 2005
+++ llvm/test/Regression/Linker/2005-02-12-ConstantGlobals-2.ll	Sun Dec 31 00:01:59 2006
@@ -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-as > %t.2.bc
-; RUN: llvm-as < %s > %t.1.bc
-; RUN: llvm-link %t.[12].bc | llvm-dis | grep 'global int 7'
+; 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'
 
 %X = global int 7


Index: llvm/test/Regression/Linker/2005-02-12-ConstantGlobals.ll
diff -u llvm/test/Regression/Linker/2005-02-12-ConstantGlobals.ll:1.2 llvm/test/Regression/Linker/2005-02-12-ConstantGlobals.ll:1.3
--- llvm/test/Regression/Linker/2005-02-12-ConstantGlobals.ll:1.2	Sat Feb 12 13:19:36 2005
+++ llvm/test/Regression/Linker/2005-02-12-ConstantGlobals.ll	Sun Dec 31 00:01:59 2006
@@ -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-as > %t.2.bc
-; RUN: llvm-as < %s > %t.1.bc
-; RUN: llvm-link %t.[12].bc | llvm-dis | grep 'global int 7'
+; 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 | llvm-dis | grep 'global i32 7'
 
 %X = external constant int


Index: llvm/test/Regression/Linker/2005-12-06-AppendingZeroLengthArrays.ll
diff -u llvm/test/Regression/Linker/2005-12-06-AppendingZeroLengthArrays.ll:1.1 llvm/test/Regression/Linker/2005-12-06-AppendingZeroLengthArrays.ll:1.2
--- llvm/test/Regression/Linker/2005-12-06-AppendingZeroLengthArrays.ll:1.1	Tue Dec  6 11:29:54 2005
+++ llvm/test/Regression/Linker/2005-12-06-AppendingZeroLengthArrays.ll	Sun Dec 31 00:01:59 2006
@@ -1,5 +1,5 @@
-; RUN: echo "%G = appending global [0 x int] zeroinitializer" | llvm-as > %t.out2.bc
-; RUN: llvm-as < %s > %t.out1.bc
+; RUN: echo "%G = appending global [0 x int] zeroinitializer" | llvm-upgrade | 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 ='
 
 ; When linked, the globals should be merged, and the result should still 


Index: llvm/test/Regression/Linker/2006-01-19-ConstantPacked.ll
diff -u llvm/test/Regression/Linker/2006-01-19-ConstantPacked.ll:1.1 llvm/test/Regression/Linker/2006-01-19-ConstantPacked.ll:1.2
--- llvm/test/Regression/Linker/2006-01-19-ConstantPacked.ll:1.1	Thu Jan 19 19:31:58 2006
+++ llvm/test/Regression/Linker/2006-01-19-ConstantPacked.ll	Sun Dec 31 00:01:59 2006
@@ -1,4 +1,4 @@
-; RUN: llvm-as %s -f -o %s.bc ; llvm-link -f -o %s.linked %s.bc
+; RUN: llvm-upgrade < %s | llvm-as -f -o %s.bc ; llvm-link -f -o %s.linked %s.bc
 
 target endian = big
 target pointersize = 32


Index: llvm/test/Regression/Linker/2006-06-15-GlobalVarAlignment.ll
diff -u llvm/test/Regression/Linker/2006-06-15-GlobalVarAlignment.ll:1.1 llvm/test/Regression/Linker/2006-06-15-GlobalVarAlignment.ll:1.2
--- llvm/test/Regression/Linker/2006-06-15-GlobalVarAlignment.ll:1.1	Thu Jun 15 20:20:58 2006
+++ llvm/test/Regression/Linker/2006-06-15-GlobalVarAlignment.ll	Sun Dec 31 00:01:59 2006
@@ -1,7 +1,7 @@
 ; The linker should choose the largest alignment when linking.
 
-; RUN: echo "%X = global int 7, align 8" | llvm-as > %t.2.bc
-; RUN: llvm-as < %s > %t.1.bc
+; 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'
 
 %X = weak global int 7, align 4


Index: llvm/test/Regression/Linker/AppendingLinkage2.ll
diff -u llvm/test/Regression/Linker/AppendingLinkage2.ll:1.3 llvm/test/Regression/Linker/AppendingLinkage2.ll:1.4
--- llvm/test/Regression/Linker/AppendingLinkage2.ll:1.3	Mon Sep 15 15:04:28 2003
+++ llvm/test/Regression/Linker/AppendingLinkage2.ll	Sun Dec 31 00:01:59 2006
@@ -1,7 +1,7 @@
 ; Test that appending linkage works correctly when arrays are the same size.
 
-; RUN: echo "%X = appending global [1x int] [int 8]" | llvm-as > %t.2.bc
-; RUN: llvm-as < %s > %t.1.bc
+; RUN: echo "%X = appending global [1x int] [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 | grep 7 | grep 8
 
 %X = appending global [1 x int] [int 7]


Index: llvm/test/Regression/Linker/ConstantGlobals1.ll
diff -u llvm/test/Regression/Linker/ConstantGlobals1.ll:1.2 llvm/test/Regression/Linker/ConstantGlobals1.ll:1.3
--- llvm/test/Regression/Linker/ConstantGlobals1.ll:1.2	Sat Dec  2 14:40:30 2006
+++ llvm/test/Regression/Linker/ConstantGlobals1.ll	Sun Dec 31 00:01:59 2006
@@ -1,7 +1,7 @@
 ; Test that appending linkage works correctly when arrays are the same size.
 
-; RUN: echo "%X = constant [1x int] [int 8]" | llvm-as > %t.2.bc
-; RUN: llvm-upgrade %s | llvm-as > %t.1.bc
+; RUN: echo "%X = constant [1x int] [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 | grep constant
 
 %X = uninitialized global [1 x int]


Index: llvm/test/Regression/Linker/ConstantGlobals2.ll
diff -u llvm/test/Regression/Linker/ConstantGlobals2.ll:1.2 llvm/test/Regression/Linker/ConstantGlobals2.ll:1.3
--- llvm/test/Regression/Linker/ConstantGlobals2.ll:1.2	Sat Dec  2 14:40:30 2006
+++ llvm/test/Regression/Linker/ConstantGlobals2.ll	Sun Dec 31 00:01:59 2006
@@ -1,7 +1,7 @@
 ; Test that appending linkage works correctly when arrays are the same size.
 
-; RUN: echo "%X = external global [1x int]" | llvm-as > %t.2.bc
-; RUN: llvm-upgrade %s | llvm-as > %t.1.bc
+; RUN: echo "%X = external global [1x int]" | 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
 
 %X = constant [1 x int] [ int 12 ]


Index: llvm/test/Regression/Linker/ConstantGlobals3.ll
diff -u llvm/test/Regression/Linker/ConstantGlobals3.ll:1.2 llvm/test/Regression/Linker/ConstantGlobals3.ll:1.3
--- llvm/test/Regression/Linker/ConstantGlobals3.ll:1.2	Sat Dec  2 14:40:30 2006
+++ llvm/test/Regression/Linker/ConstantGlobals3.ll	Sun Dec 31 00:01:59 2006
@@ -1,6 +1,6 @@
 ; Test that appending linkage works correctly when arrays are the same size.
 
-; RUN: echo "%X = external constant [1x int]" | llvm-as > %t.2.bc
+; RUN: echo "%X = external constant [1x 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 constant
 


Index: llvm/test/Regression/Linker/LinkOnce.ll
diff -u llvm/test/Regression/Linker/LinkOnce.ll:1.3 llvm/test/Regression/Linker/LinkOnce.ll:1.4
--- llvm/test/Regression/Linker/LinkOnce.ll:1.3	Mon Sep 15 15:04:28 2003
+++ llvm/test/Regression/Linker/LinkOnce.ll	Sun Dec 31 00:01:59 2006
@@ -1,8 +1,8 @@
 ; This fails because the linker renames the non-opaque type not the opaque 
 ; one...
 
-; RUN: echo "%X = linkonce global int 8" | llvm-as > %t.2.bc
-; RUN: llvm-as < %s > %t.1.bc
+; 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
 
 %X = linkonce global int 7


Index: llvm/test/Regression/Linker/weakextern.ll
diff -u llvm/test/Regression/Linker/weakextern.ll:1.2 llvm/test/Regression/Linker/weakextern.ll:1.3
--- llvm/test/Regression/Linker/weakextern.ll:1.2	Tue Dec 19 13:29:50 2006
+++ llvm/test/Regression/Linker/weakextern.ll	Sun Dec 31 00:01:59 2006
@@ -1,9 +1,9 @@
-; RUN: llvm-as < %s > %t.bc
-; RUN: llvm-as < `dirname %s`/testlink1.ll > %t2.bc
+; RUN: llvm-upgrade < %s | llvm-as > %t.bc
+; RUN: llvm-upgrade < `dirname %s`/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 int" &&
-; RUN: llvm-dis < %t1.bc |grep "Inte = global int"
+; 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




