For PR1319: Upgrade to new test harness.

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

diff --git a/test/CodeGen/ARM/long.ll b/test/CodeGen/ARM/long.ll
index 2384aff2bf100100fd0524820bd187db02e8e1fd..5acd1eae5e3d8b9ef353b78fb5fc1169c4ccf742 100644 (file)
--- a/test/CodeGen/ARM/long.ll
+++ b/test/CodeGen/ARM/long.ll
@@ -16,6 +16,7 @@
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=thumb | \
 ; RUN:   grep sbc | wc -l | grep 1 
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=thumb | grep __muldi3
+; END.
 
 long %f1() {
 entry:

diff --git a/test/CodeGen/Generic/2007-02-16-BranchFold.ll b/test/CodeGen/Generic/2007-02-16-BranchFold.ll
index c3222d2a91801c3391209a6179f3d98f915e2f17..69ed7db2dc839cfdc524dc1a82f4294de709e34e 100644 (file)
--- a/test/CodeGen/Generic/2007-02-16-BranchFold.ll
+++ b/test/CodeGen/Generic/2007-02-16-BranchFold.ll
@@ -1,6 +1,5 @@
-; RUN: llvm-as < %s | llc &&
-; RUN: llvm-as < %s | llc | grep jmp | wc -l | grep 0
 ; PR 1200
+; RUN: llvm-as < %s | llc | not grep jmp 
 
 ; ModuleID = '<stdin>'
 target datalayout = "e-p:32:32"

diff --git a/test/CodeGen/Generic/2007-02-23-DAGCombine-Miscompile.ll b/test/CodeGen/Generic/2007-02-23-DAGCombine-Miscompile.ll
index e220e92ebfe1f4637aeb881145580823e43145e9..63a1498736bb7e09152c420e6bc96058c6fac159 100644 (file)
--- a/test/CodeGen/Generic/2007-02-23-DAGCombine-Miscompile.ll
+++ b/test/CodeGen/Generic/2007-02-23-DAGCombine-Miscompile.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=x86 | grep 'movl $1, %eax'
 ; PR1219
+; RUN: llvm-as < %s | llc -march=x86 | grep {movl \$1, %eax}
 
 define i32 @test(i1 %X) {
 old_entry1:

diff --git a/test/CodeGen/Generic/addc-fold2.ll b/test/CodeGen/Generic/addc-fold2.ll
index 72cc0f63b4c63bcac687fe1b5202ff22b1bb3032..8f3cdd0793d4bb3210ebf26b37cafdfcd35cdac2 100644 (file)
--- a/test/CodeGen/Generic/addc-fold2.ll
+++ b/test/CodeGen/Generic/addc-fold2.ll
@@ -1,6 +1,5 @@
-; RUN: llvm-as < %s | llc &&
-; RUN: llvm-as < %s | llc -march=x86 | grep 'add' &&
-; RUN: llvm-as < %s | llc -march=x86 | not grep 'adc'
+; RUN: llvm-as < %s | llc -march=x86 | grep add
+; RUN: llvm-as < %s | llc -march=x86 | not grep adc
 
 define i64 @test(i64 %A, i32 %B) {
         %tmp12 = zext i32 %B to i64             ; <i64> [#uses=1]

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

diff --git a/test/CodeGen/Generic/ispositive.ll b/test/CodeGen/Generic/ispositive.ll
index f1d7569efa2cfa5da5a94b9b937ee590acc37634..c158f15cfb8f898d36c87db351dd52ca53fece39 100644 (file)
--- a/test/CodeGen/Generic/ispositive.ll
+++ b/test/CodeGen/Generic/ispositive.ll
@@ -1,7 +1,8 @@
-; RUN: llvm-as < %s | llc -march=x86 | grep shrl.*31 &&
-; RUN: llvm-as < %s | llc -march=ppc32 -mtriple=powerpc-apple-darwin8 | grep 'srwi r3, r3, 31' &&
-; RUN: llvm-as < %s | llc -march=arm | grep 'mov r0, r0, lsr #31' &&
-; RUN: llvm-as < %s | llc -march=thumb | grep 'lsr r0, r0, #31'
+; RUN: llvm-as < %s | llc -march=x86 | grep {shrl.*31}
+; RUN: llvm-as < %s | llc -march=ppc32 -mtriple=powerpc-apple-darwin8 | \
+; RUN:   grep {srwi r3, r3, 31}
+; RUN: llvm-as < %s | llc -march=arm | grep {mov r0, r0, lsr #31}
+; RUN: llvm-as < %s | llc -march=thumb | grep {lsr r0, r0, #31}
 
 define i32 @test1(i32 %X) {
 entry:

diff --git a/test/CodeGen/Generic/phi-immediate-factoring.ll b/test/CodeGen/Generic/phi-immediate-factoring.ll
index 3d40c8e10607f3e88a7a3d19806cbb887ed5abeb..cec1b433f68f86d631e21f1623bc45d37943a570 100644 (file)
--- a/test/CodeGen/Generic/phi-immediate-factoring.ll
+++ b/test/CodeGen/Generic/phi-immediate-factoring.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=x86 | grep 'movl $1' | wc -l | grep 1
 ; PR1296
+; RUN: llvm-as < %s | llc -march=x86 | grep {movl \$1} | wc -l | grep 1
 
 target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64"
 target triple = "i686-apple-darwin8"

diff --git a/test/CodeGen/Generic/switch-crit-edge-constant.ll b/test/CodeGen/Generic/switch-crit-edge-constant.ll
index 12c15159af1c8b56e49f5d7e3e4991d6cc7816c2..ef986e0ed5b1497ae13169316a40523e5e9e0595 100644 (file)
--- a/test/CodeGen/Generic/switch-crit-edge-constant.ll
+++ b/test/CodeGen/Generic/switch-crit-edge-constant.ll
@@ -1,6 +1,6 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep 'mov.*str1' | wc -l | grep 1
 ; PR925
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | \
+; RUN:   grep mov.*str1 | wc -l | grep 1
 
 target endian = little
 target pointersize = 32

diff --git a/test/CodeGen/IA64/2005-10-29-shladd.ll b/test/CodeGen/IA64/2005-10-29-shladd.ll
index 355b487ef5681829f914eb3b16593a5c04205ea3..186e5e84286cebf825bddf02e927ac7c6d3f6226 100644 (file)
--- a/test/CodeGen/IA64/2005-10-29-shladd.ll
+++ b/test/CodeGen/IA64/2005-10-29-shladd.ll
@@ -1,5 +1,5 @@
 ; this should turn into shladd 
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=ia64 | grep 'shladd'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ia64 | grep shladd
 
 implementation   ; Functions:
 

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