summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReid Spencer <rspencer@reidspencer.com>2006-12-02 20:34:08 +0000
committerReid Spencer <rspencer@reidspencer.com>2006-12-02 20:34:08 +0000
commitd7c2c2f753ae80257798fd25a879ec17df953c5b (patch)
treec78dd40b1101360a07cdaca9c660ab5d7fd1879c
parent21fdb97a9142490ac534bdfa3cf254575b6c847b (diff)
downloadllvm-d7c2c2f753ae80257798fd25a879ec17df953c5b.tar.gz
llvm-d7c2c2f753ae80257798fd25a879ec17df953c5b.tar.bz2
llvm-d7c2c2f753ae80257798fd25a879ec17df953c5b.tar.xz
Use llvm-upgrade these tests as they all use old assembly.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@32130 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--test/Assembler/2002-01-24-BadSymbolTableAssert.ll12
-rw-r--r--test/Assembler/2002-01-24-ValueRefineAbsType.ll6
-rw-r--r--test/Assembler/2002-02-19-TypeParsing.ll2
-rw-r--r--test/Assembler/2002-03-08-NameCollision.ll7
-rw-r--r--test/Assembler/2002-03-08-NameCollision2.ll2
-rw-r--r--test/Assembler/2002-04-04-PureVirtMethCall.ll2
-rw-r--r--test/Assembler/2002-04-04-PureVirtMethCall2.ll2
-rw-r--r--test/Assembler/2002-04-05-TypeParsing.ll2
-rw-r--r--test/Assembler/2002-05-02-InvalidForwardRef.ll2
-rw-r--r--test/Assembler/2002-05-02-ParseError.ll5
-rw-r--r--test/Assembler/2002-08-15-CastAmbiguity.ll4
-rw-r--r--test/Assembler/2002-08-15-ConstantExprProblem.ll2
-rw-r--r--test/Assembler/2002-08-15-UnresolvedGlobalReference.ll2
-rw-r--r--test/Assembler/2002-08-22-DominanceProblem.ll2
-rw-r--r--test/Assembler/2002-10-08-LargeArrayPerformance.ll2
-rw-r--r--test/Assembler/2002-10-15-NameClash.ll2
-rw-r--r--test/Assembler/2002-12-15-GlobalResolve.ll5
-rw-r--r--test/Assembler/2003-01-30-UnsignedString.ll2
-rw-r--r--test/Assembler/2003-02-02-ConstGlobal.ll3
-rw-r--r--test/Assembler/2003-04-25-UnresolvedGlobalReference.ll2
-rw-r--r--test/Assembler/2003-05-15-AssemblerProblem.llx2
-rw-r--r--test/Assembler/2003-05-15-SwitchBug.ll4
-rw-r--r--test/Assembler/2003-05-21-ConstantShiftExpr.ll2
-rw-r--r--test/Assembler/2003-05-21-EmptyStructTest.ll2
-rw-r--r--test/Assembler/2003-05-21-MalformedShiftCrash.llx2
-rw-r--r--test/Assembler/2003-06-30-RecursiveTypeProblem.ll2
-rw-r--r--test/Assembler/2003-10-04-NotMergingGlobalConstants.ll3
-rw-r--r--test/Assembler/2004-02-27-SelfUseAssertError.ll2
-rw-r--r--test/Assembler/2004-04-04-GetElementPtrIndexTypes.ll5
-rw-r--r--test/Assembler/2004-11-28-InvalidTypeCrash.ll2
-rw-r--r--test/Assembler/2004-12-06-ConstantFloatRange.ll2
-rw-r--r--test/Assembler/2005-01-31-CallingAggregateFunction.ll2
-rw-r--r--test/Assembler/2005-12-21-ZeroInitVector.ll2
-rw-r--r--test/Assembler/2006-09-28-CrashOnInvalid.ll2
-rw-r--r--test/Assembler/ConstantExprFold.llx5
-rw-r--r--test/Assembler/select.ll2
36 files changed, 50 insertions, 59 deletions
diff --git a/test/Assembler/2002-01-24-BadSymbolTableAssert.ll b/test/Assembler/2002-01-24-BadSymbolTableAssert.ll
index 6dc0bc79a5..c2a31d1084 100644
--- a/test/Assembler/2002-01-24-BadSymbolTableAssert.ll
+++ b/test/Assembler/2002-01-24-BadSymbolTableAssert.ll
@@ -1,10 +1,10 @@
-; RUN: llvm-as < %s -o /dev/null -f
+; RUN: llvm-upgrade < %s | llvm-as -o /dev/null -f
-; This testcase failed due to a bad assertion in SymbolTable.cpp, removed in the 1.20 revision
-; Basically the symbol table assumed that if there was an abstract type in the symbol table,
-; [in this case for the entry %foo of type void(opaque)* ], that there should have also been
-; named types by now. This was obviously not the case here, and this is valid. Assertion
-; disabled.
+; This testcase failed due to a bad assertion in SymbolTable.cpp, removed in
+; the 1.20 revision. Basically the symbol table assumed that if there was an
+; abstract type in the symbol table, [in this case for the entry %foo of type
+; void(opaque)* ], that there should have also been named types by now. This
+; was obviously not the case here, and this is valid. Assertion disabled.
declare void "foo"(%bb)
%bb = type int
diff --git a/test/Assembler/2002-01-24-ValueRefineAbsType.ll b/test/Assembler/2002-01-24-ValueRefineAbsType.ll
index 1124254720..ed12c096f7 100644
--- a/test/Assembler/2002-01-24-ValueRefineAbsType.ll
+++ b/test/Assembler/2002-01-24-ValueRefineAbsType.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s -o /dev/null -f
+; RUN: llvm-upgrade < %s | llvm-as -o /dev/null -f
; This testcase used to fail due to a lack of this diff in Value.cpp:
; diff -r1.16 Value.cpp
@@ -13,8 +13,8 @@
; > if (OldTy == NewTy && !OldTy->isAbstract())
; > Ty.removeUserFromConcrete();
;
-; This was causing an assertion failure, due to the "foo" Method object never releasing
-; it's reference to the opaque %bb value.
+; This was causing an assertion failure, due to the "foo" Method object never
+; releasing it's reference to the opaque %bb value.
;
declare void "foo"(%bb)
diff --git a/test/Assembler/2002-02-19-TypeParsing.ll b/test/Assembler/2002-02-19-TypeParsing.ll
index 2a25ebbba4..b777b3494f 100644
--- a/test/Assembler/2002-02-19-TypeParsing.ll
+++ b/test/Assembler/2002-02-19-TypeParsing.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s -o /dev/null -f
+; RUN: llvm-upgrade < %s | llvm-as -o /dev/null -f
%Hosp = type { int, int, int, { \2 *, { int, int, int, { [4 x \3], \2, \5, \6,
int, int } * } *, \2 * }, { \2 *, { int, int, int, { [4 x \3], \2, \5, \6, int,
diff --git a/test/Assembler/2002-03-08-NameCollision.ll b/test/Assembler/2002-03-08-NameCollision.ll
index d92614170e..8d0c4bddcf 100644
--- a/test/Assembler/2002-03-08-NameCollision.ll
+++ b/test/Assembler/2002-03-08-NameCollision.ll
@@ -1,8 +1,9 @@
-; RUN: llvm-as < %s -o /dev/null -f
+; RUN: llvm-upgrade < %s | llvm-as -o /dev/null -f
; Method arguments were being checked for collisions at the global scope before
-; the method object was created by the parser. Because of this, false collisions
-; could occur that would cause the following error message to be produced:
+; the method object was created by the parser. Because of this, false
+; collisions could occur that would cause the following error message to be
+; produced:
;
; Redefinition of value named 'X' in the 'int *' type plane!
;
diff --git a/test/Assembler/2002-03-08-NameCollision2.ll b/test/Assembler/2002-03-08-NameCollision2.ll
index 2688b54c04..cd81c03ea1 100644
--- a/test/Assembler/2002-03-08-NameCollision2.ll
+++ b/test/Assembler/2002-03-08-NameCollision2.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s -o /dev/null -f
+; RUN: llvm-upgrade < %s | llvm-as -o /dev/null -f
; Another name collision problem. Here the problem was that if a forward
; declaration for a method was found, that this would cause spurious conflicts
diff --git a/test/Assembler/2002-04-04-PureVirtMethCall.ll b/test/Assembler/2002-04-04-PureVirtMethCall.ll
index 5fafe42b9c..31d05add7c 100644
--- a/test/Assembler/2002-04-04-PureVirtMethCall.ll
+++ b/test/Assembler/2002-04-04-PureVirtMethCall.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s -o /dev/null -f
+; RUN: llvm-upgrade | llvm-as -o /dev/null -f
type { { \2 *, \4 ** },
{ \2 *, \4 ** }
diff --git a/test/Assembler/2002-04-04-PureVirtMethCall2.ll b/test/Assembler/2002-04-04-PureVirtMethCall2.ll
index c0cb3742e9..eb60570639 100644
--- a/test/Assembler/2002-04-04-PureVirtMethCall2.ll
+++ b/test/Assembler/2002-04-04-PureVirtMethCall2.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s -o /dev/null -f
+; RUN: llvm-upgrade < %s | llvm-as -o /dev/null -f
%t = type { { \2*, \2 },
{ \2*, \2 }
diff --git a/test/Assembler/2002-04-05-TypeParsing.ll b/test/Assembler/2002-04-05-TypeParsing.ll
index ce2a90a0ce..3418de9447 100644
--- a/test/Assembler/2002-04-05-TypeParsing.ll
+++ b/test/Assembler/2002-04-05-TypeParsing.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s -o /dev/null -f
+; RUN: llvm-upgrade < %s | llvm-as -o /dev/null -f
%Hosp = type {
{ \2 *, { \2, \4 } * },
diff --git a/test/Assembler/2002-05-02-InvalidForwardRef.ll b/test/Assembler/2002-05-02-InvalidForwardRef.ll
index 8d79e60649..85c7368a61 100644
--- a/test/Assembler/2002-05-02-InvalidForwardRef.ll
+++ b/test/Assembler/2002-05-02-InvalidForwardRef.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s -o /dev/null -f
+; RUN: llvm-upgrade < %s | llvm-as -o /dev/null -f
; It looks like the assembler is not forward resolving the function declaraion
; correctly.
diff --git a/test/Assembler/2002-05-02-ParseError.ll b/test/Assembler/2002-05-02-ParseError.ll
index 108d14881a..22bcbc0c81 100644
--- a/test/Assembler/2002-05-02-ParseError.ll
+++ b/test/Assembler/2002-05-02-ParseError.ll
@@ -1,10 +1,9 @@
-; RUN: llvm-as < %s -o /dev/null -f
+; RUN: llvm-upgrade < %s | llvm-as -o /dev/null -f
; This should parse correctly without an 'implementation', but our current YACC
; based parser doesn't have the required 2 token lookahead...
-; XFAIL: *
- %T = type int *
+%T = type int *
%T %test() {
ret %T null
diff --git a/test/Assembler/2002-08-15-CastAmbiguity.ll b/test/Assembler/2002-08-15-CastAmbiguity.ll
index ce1ce0701d..c44ee670eb 100644
--- a/test/Assembler/2002-08-15-CastAmbiguity.ll
+++ b/test/Assembler/2002-08-15-CastAmbiguity.ll
@@ -1,6 +1,4 @@
-; RUN: llvm-as < %s -o /dev/null -f
-
-
+; RUN: llvm-upgrade < %s | llvm-as -o /dev/null -f
void %test(int %X) {
diff --git a/test/Assembler/2002-08-15-ConstantExprProblem.ll b/test/Assembler/2002-08-15-ConstantExprProblem.ll
index d64775f9b4..b3380ed8a4 100644
--- a/test/Assembler/2002-08-15-ConstantExprProblem.ll
+++ b/test/Assembler/2002-08-15-ConstantExprProblem.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s -o /dev/null -f
+; RUN: llvm-upgrade < %s | llvm-as -o /dev/null -f
%.LC0 = internal global [12 x sbyte] c"hello world\00"
diff --git a/test/Assembler/2002-08-15-UnresolvedGlobalReference.ll b/test/Assembler/2002-08-15-UnresolvedGlobalReference.ll
index 83b82a6884..2456677713 100644
--- a/test/Assembler/2002-08-15-UnresolvedGlobalReference.ll
+++ b/test/Assembler/2002-08-15-UnresolvedGlobalReference.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s -o /dev/null -f
+; RUN: llvm-upgrade < %s | llvm-as -o /dev/null -f
%.LC0 = internal global [12 x sbyte] c"hello world\00" ; <[12 x sbyte]*> [#uses=1]
diff --git a/test/Assembler/2002-08-22-DominanceProblem.ll b/test/Assembler/2002-08-22-DominanceProblem.ll
index 1d0cda5bd6..c6fb9a3a5f 100644
--- a/test/Assembler/2002-08-22-DominanceProblem.ll
+++ b/test/Assembler/2002-08-22-DominanceProblem.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s -o /dev/null -f
+; RUN: llvm-upgrade < %s | llvm-as -o /dev/null -f
; Dominance relationships is not calculated correctly for unreachable blocks,
; which causes the verifier to barf on this input.
diff --git a/test/Assembler/2002-10-08-LargeArrayPerformance.ll b/test/Assembler/2002-10-08-LargeArrayPerformance.ll
index 026d10ee82..1730d3a4d0 100644
--- a/test/Assembler/2002-10-08-LargeArrayPerformance.ll
+++ b/test/Assembler/2002-10-08-LargeArrayPerformance.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s -o /dev/null -f
+; RUN: llvm-upgrade < %s | llvm-as -o /dev/null -f
; This testcase comes from the following really simple c file:
;
diff --git a/test/Assembler/2002-10-15-NameClash.ll b/test/Assembler/2002-10-15-NameClash.ll
index d4c36f3a9d..5dda3c509a 100644
--- a/test/Assembler/2002-10-15-NameClash.ll
+++ b/test/Assembler/2002-10-15-NameClash.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s -o /dev/null -f
+; RUN: llvm-upgrade < %s | llvm-as -o /dev/null -f
declare int "ArrayRef"([100 x int] * %Array)
diff --git a/test/Assembler/2002-12-15-GlobalResolve.ll b/test/Assembler/2002-12-15-GlobalResolve.ll
index 62d802d2c3..332b5324ee 100644
--- a/test/Assembler/2002-12-15-GlobalResolve.ll
+++ b/test/Assembler/2002-12-15-GlobalResolve.ll
@@ -1,12 +1,9 @@
-; RUN: llvm-as < %s -o /dev/null -f
-
-
+; RUN: llvm-upgrade < %s | llvm-as -o /dev/null -f
%X = external global %T*
%X = external global int *
%T = type int
-
implementation
diff --git a/test/Assembler/2003-01-30-UnsignedString.ll b/test/Assembler/2003-01-30-UnsignedString.ll
index 5e55231932..f99b31a205 100644
--- a/test/Assembler/2003-01-30-UnsignedString.ll
+++ b/test/Assembler/2003-01-30-UnsignedString.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s -o /dev/null -f
+; RUN: llvm-upgrade < %s | llvm-as -o /dev/null -f
%spell_order = global [4 x ubyte] c"\FF\00\F7\00"
diff --git a/test/Assembler/2003-02-02-ConstGlobal.ll b/test/Assembler/2003-02-02-ConstGlobal.ll
index 0bde297cfa..faecbf5560 100644
--- a/test/Assembler/2003-02-02-ConstGlobal.ll
+++ b/test/Assembler/2003-02-02-ConstGlobal.ll
@@ -1,5 +1,4 @@
-; RUN: llvm-as < %s -o /dev/null -f
-
+; RUN: llvm-upgrade < %s | llvm-as -o /dev/null -f
%X = external global int
%X = constant int 7
diff --git a/test/Assembler/2003-04-25-UnresolvedGlobalReference.ll b/test/Assembler/2003-04-25-UnresolvedGlobalReference.ll
index 89132f6f2f..9d128f823e 100644
--- a/test/Assembler/2003-04-25-UnresolvedGlobalReference.ll
+++ b/test/Assembler/2003-04-25-UnresolvedGlobalReference.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s -o /dev/null -f
+; RUN: llvm-upgrade < %s | llvm-as -o /dev/null -f
; There should be absolutely no problem with this testcase.
diff --git a/test/Assembler/2003-05-15-AssemblerProblem.llx b/test/Assembler/2003-05-15-AssemblerProblem.llx
index e22d11d6cb..a4802940ec 100644
--- a/test/Assembler/2003-05-15-AssemblerProblem.llx
+++ b/test/Assembler/2003-05-15-AssemblerProblem.llx
@@ -1,7 +1,7 @@
; This bug was caused by two CPR's existing for the same global variable,
; colliding in the Module level CPR map.
-; RUN: llvm-as < %s -o /dev/null -f
+; RUN: llvm-upgrade < %s | llvm-as -o /dev/null -f
void %test() {
call void (...)* cast (void (short*, int)* %AddString to void (...)*)(short* null, int 0)
diff --git a/test/Assembler/2003-05-15-SwitchBug.ll b/test/Assembler/2003-05-15-SwitchBug.ll
index a77b72a0b6..748ef7a513 100644
--- a/test/Assembler/2003-05-15-SwitchBug.ll
+++ b/test/Assembler/2003-05-15-SwitchBug.ll
@@ -1,6 +1,6 @@
-; RUN: llvm-as < %s -o /dev/null -f
-
+; RUN: llvm-upgrade < %s | llvm-as -o /dev/null -f
+; Check minimal switch statement
void %test(int %X) {
switch int %X, label %dest []
diff --git a/test/Assembler/2003-05-21-ConstantShiftExpr.ll b/test/Assembler/2003-05-21-ConstantShiftExpr.ll
index 830dd7a1e6..42331d398d 100644
--- a/test/Assembler/2003-05-21-ConstantShiftExpr.ll
+++ b/test/Assembler/2003-05-21-ConstantShiftExpr.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s -o /dev/null -f
+; RUN: llvm-upgrade < %s | llvm-as -o /dev/null -f
; Test that shift instructions can be used in constant expressions.
diff --git a/test/Assembler/2003-05-21-EmptyStructTest.ll b/test/Assembler/2003-05-21-EmptyStructTest.ll
index d177b3b8e4..4b1b1980f7 100644
--- a/test/Assembler/2003-05-21-EmptyStructTest.ll
+++ b/test/Assembler/2003-05-21-EmptyStructTest.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s -o /dev/null -f
+; RUN: llvm-upgrade < %s | llvm-as -o /dev/null -f
; The old C front-end never generated empty structures, now the new one
; can. For some reason we never handled them in the parser. Weird.
diff --git a/test/Assembler/2003-05-21-MalformedShiftCrash.llx b/test/Assembler/2003-05-21-MalformedShiftCrash.llx
index e56d2bb75f..7a4782e9c3 100644
--- a/test/Assembler/2003-05-21-MalformedShiftCrash.llx
+++ b/test/Assembler/2003-05-21-MalformedShiftCrash.llx
@@ -1,4 +1,4 @@
; Found by inspection of the code
-; RUN: llvm-as < %s 2>&1 | grep "Shift constant expression"
+; RUN: llvm-upgrade < %s | llvm-as -o /dev/null -f 2>&1 | grep "Shift constant expression"
global int shr (float 1.0, ubyte 2)
diff --git a/test/Assembler/2003-06-30-RecursiveTypeProblem.ll b/test/Assembler/2003-06-30-RecursiveTypeProblem.ll
index 716850e335..62aa81e619 100644
--- a/test/Assembler/2003-06-30-RecursiveTypeProblem.ll
+++ b/test/Assembler/2003-06-30-RecursiveTypeProblem.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s -o /dev/null -f
+; RUN: llvm-upgrade < %s | llvm-as -o /dev/null -f
%MidFnTy = type void (void (%MidFnTy* )*)
diff --git a/test/Assembler/2003-10-04-NotMergingGlobalConstants.ll b/test/Assembler/2003-10-04-NotMergingGlobalConstants.ll
index c9f5c5eb63..47c40d4260 100644
--- a/test/Assembler/2003-10-04-NotMergingGlobalConstants.ll
+++ b/test/Assembler/2003-10-04-NotMergingGlobalConstants.ll
@@ -1,5 +1,4 @@
-; RUN: llvm-as < %s -o /dev/null -f
-
+; RUN: llvm-upgrade < %s | llvm-as -o /dev/null -f
%T = type opaque
%X = global %T* null
diff --git a/test/Assembler/2004-02-27-SelfUseAssertError.ll b/test/Assembler/2004-02-27-SelfUseAssertError.ll
index 2b4aed590d..fb0cfb168d 100644
--- a/test/Assembler/2004-02-27-SelfUseAssertError.ll
+++ b/test/Assembler/2004-02-27-SelfUseAssertError.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s -o /dev/null -f
+; RUN: llvm-upgrade < %s | llvm-as -o /dev/null -f
; %inc2 uses it's own value, but that's ok, as it's unreachable!
diff --git a/test/Assembler/2004-04-04-GetElementPtrIndexTypes.ll b/test/Assembler/2004-04-04-GetElementPtrIndexTypes.ll
index ea6996197b..186b9df4f0 100644
--- a/test/Assembler/2004-04-04-GetElementPtrIndexTypes.ll
+++ b/test/Assembler/2004-04-04-GetElementPtrIndexTypes.ll
@@ -1,7 +1,4 @@
-; RUN: llvm-as < %s -o /dev/null -f
-
-
-
+; RUN: llvm-upgrade < %s | llvm-as -o /dev/null -f
int *%t1({ float, int }* %X) {
%W = getelementptr { float, int }* %X, int 20, uint 1
diff --git a/test/Assembler/2004-11-28-InvalidTypeCrash.ll b/test/Assembler/2004-11-28-InvalidTypeCrash.ll
index 9174264b30..1fad05ff44 100644
--- a/test/Assembler/2004-11-28-InvalidTypeCrash.ll
+++ b/test/Assembler/2004-11-28-InvalidTypeCrash.ll
@@ -1,3 +1,3 @@
-; RUN: (llvm-as < %s) 2>&1 | grep 'Cannot create a'
+; RUN: (llvm-upgrade < %s | llvm-as -o /dev/null -f) 2>&1 | grep 'Cannot create a'
; Test for PR463. This program is erroneous, but should not crash llvm-as.
%.FOO = internal global %struct.none zeroinitializer
diff --git a/test/Assembler/2004-12-06-ConstantFloatRange.ll b/test/Assembler/2004-12-06-ConstantFloatRange.ll
index 30d103c572..8718a8d5aa 100644
--- a/test/Assembler/2004-12-06-ConstantFloatRange.ll
+++ b/test/Assembler/2004-12-06-ConstantFloatRange.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as %s -o /dev/null 2>&1 | grep "constant invalid for type"
+; RUN: llvm-upgrade %s | llvm-as -o /dev/null -f 2>&1 | grep "constant invalid for type"
; XFAIL: *
;; This is a testcase for PR409
diff --git a/test/Assembler/2005-01-31-CallingAggregateFunction.ll b/test/Assembler/2005-01-31-CallingAggregateFunction.ll
index 0f8bab4a06..a5de2bace9 100644
--- a/test/Assembler/2005-01-31-CallingAggregateFunction.ll
+++ b/test/Assembler/2005-01-31-CallingAggregateFunction.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as %s -o /dev/null 2>&1 | grep "LLVM functions cannot return aggregate types"
+; RUN: llvm-upgrade %s | llvm-as -o /dev/null -f 2>&1 | grep "LLVM functions cannot return aggregate types"
void %test() {
call {} %foo()
diff --git a/test/Assembler/2005-12-21-ZeroInitVector.ll b/test/Assembler/2005-12-21-ZeroInitVector.ll
index fdc2ba6f79..d2058a060a 100644
--- a/test/Assembler/2005-12-21-ZeroInitVector.ll
+++ b/test/Assembler/2005-12-21-ZeroInitVector.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s > /dev/null
+; RUN: llvm-upgrade < %s | llvm-as > /dev/null
< 4 x int> %foo() {
ret <4 x int> zeroinitializer
diff --git a/test/Assembler/2006-09-28-CrashOnInvalid.ll b/test/Assembler/2006-09-28-CrashOnInvalid.ll
index 3770add192..1f67c9cd65 100644
--- a/test/Assembler/2006-09-28-CrashOnInvalid.ll
+++ b/test/Assembler/2006-09-28-CrashOnInvalid.ll
@@ -1,6 +1,6 @@
; Test for PR902. This program is erroneous, but should not crash llvm-as.
; This tests that a simple error is caught and processed correctly.
-; RUN: (llvm-as < %s) 2>&1 | grep 'FP constant invalid for type'
+; RUN: llvm-upgrade < %s | llvm-as 2>&1 | grep 'FP constant invalid for type'
void %test() {
add int 1, 2.0
ret void
diff --git a/test/Assembler/ConstantExprFold.llx b/test/Assembler/ConstantExprFold.llx
index 06d0b75a98..c9c3dff945 100644
--- a/test/Assembler/ConstantExprFold.llx
+++ b/test/Assembler/ConstantExprFold.llx
@@ -1,7 +1,8 @@
-; This test checks to make sure that constant exprs fold in some simple situations
+; This test checks to make sure that constant exprs fold in some simple
+; situations
; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | not grep '(' &&
-; RUN: llvm-as < %s
+; RUN: llvm-upgrade < %s | llvm-as
%A = global long 0
diff --git a/test/Assembler/select.ll b/test/Assembler/select.ll
index 8f378bb3b9..1552fa57fa 100644
--- a/test/Assembler/select.ll
+++ b/test/Assembler/select.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s -o /dev/null -f
+; RUN: llvm-upgrade < %s | llvm-as -o /dev/null -f