For PR1319:

Upgrade to new Tcl exec based test framework. This exposes three regressions
in llvm-upgrade:
test/Assembler/2002-08-19-BytecodeReader.llx
test/Assembler/2003-08-21-ConstantExprCast-Fold.llx
test/Assembler/2004-01-11-getelementptrfolding.llx

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@36067 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/Assembler/2002-04-07-HexFloatConstants.llx b/test/Assembler/2002-04-07-HexFloatConstants.llx
index d0f413ae9e954db33564ca6a4506dceb0a438e43..543c869ba0fb386c516e8e6005d7292eff982b49 100644 (file)
--- a/test/Assembler/2002-04-07-HexFloatConstants.llx
+++ b/test/Assembler/2002-04-07-HexFloatConstants.llx
@@ -5,8 +5,9 @@
 ; of the bug that was causing the Olden Health benchmark to output incorrect
 ; results!
 ;
-; RUN: llvm-upgrade < %s | llvm-as | opt -constprop | llvm-dis > %t.1 && \
-; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | llvm-as | opt -constprop | llvm-dis > %t.2 && \
+; RUN: llvm-upgrade < %s | llvm-as | opt -constprop | llvm-dis > %t.1
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | llvm-as | opt -constprop | \
+; RUN:    llvm-dis > %t.2
 ; RUN: diff %t.1 %t.2
 
 implementation

diff --git a/test/Assembler/2002-04-29-NameBinding.llx b/test/Assembler/2002-04-29-NameBinding.llx
index ad994f0386c750f4919bfbad0708949e5df727df..c65616c9036a94e256e90f8ef0cfdce65d8a7e5d 100644 (file)
--- a/test/Assembler/2002-04-29-NameBinding.llx
+++ b/test/Assembler/2002-04-29-NameBinding.llx
@@ -4,14 +4,15 @@
 ; Check by running globaldce, which will remove the constant if there are
 ; no references to it!
 ; 
-; RUN: llvm-upgrade < %s | llvm-as | opt -globaldce | llvm-dis | not grep constant
+; RUN: llvm-upgrade < %s | llvm-as | opt -globaldce | llvm-dis | \
+; RUN:   not grep constant
 ;
        
 %v1 = internal constant int 5
 
 implementation
 
-int "createtask"()
+int "createtask"() begin
        %v1 = alloca int           ;; Alloca should have one use!
        %reg112 = load int* %v1    ;; This load should not use the global!
        ret int %reg112

diff --git a/test/Assembler/2002-07-08-HugePerformanceProblem.llx b/test/Assembler/2002-07-08-HugePerformanceProblem.llx
index 02a05f8edd3e1a89448db60e358a2f45475fd0f3..2ec4e82844a91f7de12062ee463e39281ddc4084 100644 (file)
--- a/test/Assembler/2002-07-08-HugePerformanceProblem.llx
+++ b/test/Assembler/2002-07-08-HugePerformanceProblem.llx
@@ -1,6 +1,7 @@
 ; This file takes about 48 __MINUTES__ to assemble using as.  This is WAY too
 ; long.  The type resolution code needs to be sped up a lot.   
-; RUN: ulimit -t 20; llvm-upgrade < %s | llvm-as
+; RUN: llvm-upgrade < %s | llvm-as -o /dev/null -f
+; END.
 
        %ALL_INTERSECTIONS_METHOD = type int (%OBJECT*, %RAY*, %ISTACK*)*
        %BBOX = type { %BBOX_VECT, %BBOX_VECT }

diff --git a/test/Assembler/2003-11-12-ConstantExprCast.llx b/test/Assembler/2003-11-12-ConstantExprCast.llx
index ce48c20f536a2987b2599e6eaf1c37f7138a9ec9..284831183d0d18dc41c8bb3682a7ff70ace1b0eb 100644 (file)
--- a/test/Assembler/2003-11-12-ConstantExprCast.llx
+++ b/test/Assembler/2003-11-12-ConstantExprCast.llx
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | not grep ' bitcast ('
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | not grep { bitcast (}
 
 %.Base64_1 = external constant [4 x sbyte] 
 

diff --git a/test/Assembler/2004-01-11-getelementptrfolding.llx b/test/Assembler/2004-01-11-getelementptrfolding.llx
index 6ab1a5577b08aef32095aaf3906b151c181b2dfb..36d983e18b38d94d1c36ea03b02ba4959dc0100a 100644 (file)
--- a/test/Assembler/2004-01-11-getelementptrfolding.llx
+++ b/test/Assembler/2004-01-11-getelementptrfolding.llx
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | not grep 'getelementptr.*getelementptr'
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | \
+; RUN:   not grep {getelementptr.*getelementptr}
 
         %struct.TUVVertex = type { short, short, short, short }
         %struct.TTriangleItem = type { sbyte*, sbyte*, [3 x %struct.TUVVertex] }

diff --git a/test/Assembler/2004-11-28-InvalidTypeCrash.ll b/test/Assembler/2004-11-28-InvalidTypeCrash.ll
index ea16cc45252e7d5b27a793f917b03b4ea3a498dd..5b43b73062193d7dcc972b8af7084055807471e5 100644 (file)
--- a/test/Assembler/2004-11-28-InvalidTypeCrash.ll
+++ b/test/Assembler/2004-11-28-InvalidTypeCrash.ll
@@ -1,4 +1,5 @@
-; RUN: llvm-as 2>&1 < %s -o /dev/null -f | \
-; RUN:   grep 'Cannot create a null initialized value of this type'
 ; Test for PR463.  This program is erroneous, but should not crash llvm-as.
+; RUN: ignore llvm-as < %s -o /dev/null -f |& \
+; RUN:   grep {Cannot create a null initialized value of this type}
+
 @.FOO  = internal global %struct.none zeroinitializer

diff --git a/test/Assembler/2004-12-05-LocalGlobalSymtabConflict.ll b/test/Assembler/2004-12-05-LocalGlobalSymtabConflict.ll
index 5743e42f9d2aaa2ea8e1aa6a594d6e0b713d2a7e..d558d0bd61880a4d255beeefecc120a3962d7112 100644 (file)
--- a/test/Assembler/2004-12-05-LocalGlobalSymtabConflict.ll
+++ b/test/Assembler/2004-12-05-LocalGlobalSymtabConflict.ll
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -inline | llvm-dis | not grep '%G = alloca int'
+; RUN: llvm-upgrade < %s | llvm-as | opt -inline | llvm-dis | \
+; RUN:   not grep {%G = alloca int}
 
 ; In this testcase, %bar stores to the global G.  Make sure that inlining does
 ; not cause it to store to the G in main instead.

diff --git a/test/Assembler/2004-12-06-ConstantFloatRange.ll b/test/Assembler/2004-12-06-ConstantFloatRange.ll
index 8718a8d5aad7d731e9417662ef60f25a9c47108e..cc74392ff953ee8ed77b7487543b044debbd788b 100644 (file)
--- a/test/Assembler/2004-12-06-ConstantFloatRange.ll
+++ b/test/Assembler/2004-12-06-ConstantFloatRange.ll
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade %s | llvm-as -o /dev/null -f 2>&1 | grep "constant invalid for type"
+; RUN: llvm-upgrade %s | llvm-as -o /dev/null -f |& \
+; RUN:    grep {constant invalid for type}
 ; XFAIL: *
 
 ;; This is a testcase for PR409

diff --git a/test/Assembler/2005-01-03-FPConstantDisassembly.ll b/test/Assembler/2005-01-03-FPConstantDisassembly.ll
index 7dfa0e54043e60c59bdd3d2d1bd9a6be07aba7a7..c3a66b42e27aaebc95aef6ba3e56c9bbf4071e6d 100644 (file)
--- a/test/Assembler/2005-01-03-FPConstantDisassembly.ll
+++ b/test/Assembler/2005-01-03-FPConstantDisassembly.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | grep '1.0'
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | grep 1.0
 
 double %test() {
         ret double 1.0   ;; This should not require hex notation

diff --git a/test/Assembler/2005-01-31-CallingAggregateFunction.ll b/test/Assembler/2005-01-31-CallingAggregateFunction.ll
index 7eff6343f28f1ef6758257a1efbc022b8fa6ffaa..c9252147fb38bc37e638e07d0599af7b921f6bbe 100644 (file)
--- a/test/Assembler/2005-01-31-CallingAggregateFunction.ll
+++ b/test/Assembler/2005-01-31-CallingAggregateFunction.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as 2>&1 < %s -o /dev/null -f | \
+; RUN: ignore llvm-as < %s -o /dev/null -f |& \
 ; RUN:    grep "LLVM functions cannot return aggregate types"
 
 define void @test() {

diff --git a/test/Assembler/2006-05-26-VarargsCallEncode.ll b/test/Assembler/2006-05-26-VarargsCallEncode.ll
index e5de6de5f8bf6707170c2d5981eddcae8bd09fc2..c87b19d3d307b3e8ef00d5dd17c4843cb12853fc 100644 (file)
--- a/test/Assembler/2006-05-26-VarargsCallEncode.ll
+++ b/test/Assembler/2006-05-26-VarargsCallEncode.ll
@@ -1,5 +1,5 @@
 ; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | \
-; RUN:    grep 'tail call void ({  }\* sret'
+; RUN:    grep {tail call void (\{  \}\\* sret}
 
 declare csretcc void %foo({}*, ...)
 

diff --git a/test/Assembler/2007-01-01-Cast-To-Bool.ll b/test/Assembler/2007-01-01-Cast-To-Bool.ll
index 1dfc5d559875c7ba36c559c50248371aaad36cc6..263515152d9541f62fc638f974d7ddd8e2c37a1a 100644 (file)
--- a/test/Assembler/2007-01-01-Cast-To-Bool.ll
+++ b/test/Assembler/2007-01-01-Cast-To-Bool.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | grep 'icmp ne'
+; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | grep {icmp ne}
 bool %main(int %X) {
   %res = cast bool true to bool
   ret bool %res

diff --git a/test/Assembler/2007-01-12-Varargs-Upgrade.ll b/test/Assembler/2007-01-12-Varargs-Upgrade.ll
index 3c1f5bbe277eccdfb58765330bbb4b9166edd260..e5f0ab278463c7ff4ecd36ae86c9311669dbbd2f 100644 (file)
--- a/test/Assembler/2007-01-12-Varargs-Upgrade.ll
+++ b/test/Assembler/2007-01-12-Varargs-Upgrade.ll
@@ -1,7 +1,8 @@
 ; For PR1093: This test checks that llvm-upgrade correctly translates
 ; the llvm.va_* intrinsics to their cannonical argument form (i8*).
 ; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | \
-; RUN:   grep ' bitcast' | wc -l | grep 5
+; RUN:   grep { bitcast} | wc -l | grep 5
+
 %str = internal constant [7 x ubyte] c"%d %d\0A\00"            ; <[7 x ubyte]*> [#uses=1]
 
 implementation   ; Functions:

diff --git a/test/Assembler/2007-01-16-CrashOnBadCast.ll b/test/Assembler/2007-01-16-CrashOnBadCast.ll
index 859e83721aa3565c5e443fa69c0722d3db8fe262..96d0f4f4a9edcc5c5fa0c33cb25c6b51348c16ec 100644 (file)
--- a/test/Assembler/2007-01-16-CrashOnBadCast.ll
+++ b/test/Assembler/2007-01-16-CrashOnBadCast.ll
@@ -1,6 +1,5 @@
 ; PR1117
-; RUN: llvm-as < %s 2>&1 > /dev/null | \
-; RUN:  grep "invalid cast opcode for cast from"
+; RUN: llvm-as < %s -o /dev/null -f |& grep "invalid cast opcode for cast from"
 
 define i8* @nada(i64 %X) {
     %result = trunc i64 %X to i8*

diff --git a/test/Assembler/2007-01-16-CrashOnBadCast2.ll b/test/Assembler/2007-01-16-CrashOnBadCast2.ll
index bcc6f0e120083c72b2c296ee0509885b2ff8e971..c7716241c1bf141e2e12f42bdafc22d08ed01be3 100644 (file)
--- a/test/Assembler/2007-01-16-CrashOnBadCast2.ll
+++ b/test/Assembler/2007-01-16-CrashOnBadCast2.ll
@@ -1,5 +1,4 @@
 ; PR1117
-; RUN: llvm-as < %s 2>&1 > /dev/null | \
-; RUN:  grep "invalid cast opcode for cast from"
+; RUN: llvm-as < %s -o /dev/null -f |& grep "invalid cast opcode for cast from"
 
 @X = constant i8* trunc (i64 0 to i8*)

diff --git a/test/Assembler/2007-01-27-UpgradePointers.ll b/test/Assembler/2007-01-27-UpgradePointers.ll
index 37825a2056321cd002580548353350bd8fc80ea8..41ce1a6a22cb2ab8785b596a6f41477507375a0b 100644 (file)
--- a/test/Assembler/2007-01-27-UpgradePointers.ll
+++ b/test/Assembler/2007-01-27-UpgradePointers.ll
@@ -1,7 +1,6 @@
 ; PR1137
-; RUN: llvm-upgrade < %s &&
-; RUN: llvm-upgrade < %s | llvm-as -o /dev/null -f &&
-; RUN: llvm-upgrade < %s | grep 'tmp = alloca' | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as -o /dev/null -f
+; RUN: llvm-upgrade < %s | grep {tmp = alloca} | wc -l | grep 1
 ;
 target datalayout = "e-p:32:32"
 target endian = little

diff --git a/test/Assembler/2007-02-01-UpgradeShift.ll b/test/Assembler/2007-02-01-UpgradeShift.ll
index 393124788f96cbdeab40a1d081fed6882fd8e393..0a9e3a90d0e9bfcbcd28d87601d071d9110b319b 100644 (file)
--- a/test/Assembler/2007-02-01-UpgradeShift.ll
+++ b/test/Assembler/2007-02-01-UpgradeShift.ll
@@ -1,11 +1,11 @@
 ; Test that upgrading shift instructions and constant expressions works
 ; correctly.
-; RUN: llvm-upgrade < %s | grep 'ashr i32 .X, 2' &&
-; RUN: llvm-upgrade < %s | grep 'lshr i32 .X, 2' &&
-; RUN: llvm-upgrade < %s | grep 'shl i32 .X, 2' &&
-; RUN: llvm-upgrade < %s | grep 'ashr i32 .X, 6' &&
-; RUN: llvm-upgrade < %s | grep 'lshr i32 .X, 1' &&
-; RUN: llvm-upgrade < %s | grep 'shl i32 .X, 1'
+; RUN: llvm-upgrade < %s | grep {ashr i32 .X, 2}
+; RUN: llvm-upgrade < %s | grep {lshr i32 .X, 2} 
+; RUN: llvm-upgrade < %s | grep {shl i32 .X, 2}
+; RUN: llvm-upgrade < %s | grep {ashr i32 .X, 6}
+; RUN: llvm-upgrade < %s | grep {lshr i32 .X, 1}
+; RUN: llvm-upgrade < %s | grep {shl i32 .X, 1}
 
 void %test(int %X) {
   %A = ashr int %X, ubyte 2

diff --git a/test/Assembler/2007-03-14-UpgradeLocalSignless.ll b/test/Assembler/2007-03-14-UpgradeLocalSignless.ll
index 5a1eaa2d4ce9c8a083274ae75de9cdec4c87f056..88078bbc720d997840baa558e5fb9364e7b229ab 100644 (file)
--- a/test/Assembler/2007-03-14-UpgradeLocalSignless.ll
+++ b/test/Assembler/2007-03-14-UpgradeLocalSignless.ll
@@ -1,6 +1,6 @@
 ; PR1256
-; RUN: llvm-upgrade < %s | grep 'call void @f( i32 .tmp )'
-; RUN: llvm-upgrade < %s | grep 'call void @g( i8 .tmp\.upgrd\.2 )'
+; RUN: llvm-upgrade < %s | grep {call void @f( i32 .tmp )}
+; RUN: llvm-upgrade < %s | grep {call void @g( i8 .tmp\.upgrd\.2 )}
 
 target datalayout = "e-p:32:32"
 target endian = little

diff --git a/test/Assembler/2007-03-19-NegValue.ll b/test/Assembler/2007-03-19-NegValue.ll
index 364bec1c3ec4590e3e5e55d462f37db52a6e745d..e90cf351e1d737595eb239c0d335c868f598511f 100644 (file)
--- a/test/Assembler/2007-03-19-NegValue.ll
+++ b/test/Assembler/2007-03-19-NegValue.ll
@@ -1,5 +1,5 @@
 ; Test whether negative values > 64 bits retain their negativeness.
-; RUN: llvm-as < %s | llvm-dis | grep 'add i65.*, -1'
+; RUN: llvm-as < %s | llvm-dis | grep {add i65.*, -1}
 
 define i65 @testConsts(i65 %N) {
   %a = add i65 %N, -1

diff --git a/test/Assembler/dg.exp b/test/Assembler/dg.exp
index ff34508c3c64c167429097e1c896dd65daaff278..879685ca879df60056ae48bf4411e0df73b77dc5 100644 (file)
--- a/test/Assembler/dg.exp
+++ b/test/Assembler/dg.exp
@@ -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}]]