From fa801f52d940ac6ab7f8e84dc5af9a25e85263a4 Mon Sep 17 00:00:00 2001
From: Reid Spencer <rspencer@reidspencer.com>
Date: Sun, 15 Apr 2007 19:21:54 +0000
Subject: [PATCH] For PR1319: Upgrade to use new test harness

llvm-svn: 36077
---
 test/CodeGen/CBackend/2005-07-14-NegationToMinusMinus.ll | 2 +-
 test/CodeGen/CBackend/2005-09-27-VolatileFuncPtr.ll      | 3 +--
 test/CodeGen/CBackend/2006-12-11-Float-Bitcast.ll        | 3 +--
 test/CodeGen/CBackend/2007-01-08-ParamAttr-ICmp.ll       | 2 +-
 test/CodeGen/CBackend/2007-01-15-NamedArrayType.ll       | 4 ++--
 test/CodeGen/CBackend/2007-02-23-NameConflicts.ll        | 6 +++---
 test/CodeGen/CBackend/dg.exp                             | 4 ++--
 7 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/test/CodeGen/CBackend/2005-07-14-NegationToMinusMinus.ll b/test/CodeGen/CBackend/2005-07-14-NegationToMinusMinus.ll
index 0411fb6a79d..6be1a66c18a 100644
--- a/test/CodeGen/CBackend/2005-07-14-NegationToMinusMinus.ll
+++ b/test/CodeGen/CBackend/2005-07-14-NegationToMinusMinus.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=c | not grep "\-\-65535"
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=c | not grep -- -65535
 ; ModuleID = '<stdin>'
 target endian = little
 target pointersize = 32
diff --git a/test/CodeGen/CBackend/2005-09-27-VolatileFuncPtr.ll b/test/CodeGen/CBackend/2005-09-27-VolatileFuncPtr.ll
index a29c20b13a7..32a7088984f 100644
--- a/test/CodeGen/CBackend/2005-09-27-VolatileFuncPtr.ll
+++ b/test/CodeGen/CBackend/2005-09-27-VolatileFuncPtr.ll
@@ -1,5 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=c &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=c | grep '\* *volatile *\*'
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=c | grep {\\* *volatile *\\*}
 
 %G = external global void()*
 
diff --git a/test/CodeGen/CBackend/2006-12-11-Float-Bitcast.ll b/test/CodeGen/CBackend/2006-12-11-Float-Bitcast.ll
index bf846545c9c..5c6babfafe9 100644
--- a/test/CodeGen/CBackend/2006-12-11-Float-Bitcast.ll
+++ b/test/CodeGen/CBackend/2006-12-11-Float-Bitcast.ll
@@ -1,6 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=c &&
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=c | \
-; RUN:  grep '__BITCAST' | wc -l | grep 14
+; RUN:   grep __BITCAST | wc -l | grep 14
 
 int %test1(float %F) {
    %X = bitcast float %F to int
diff --git a/test/CodeGen/CBackend/2007-01-08-ParamAttr-ICmp.ll b/test/CodeGen/CBackend/2007-01-08-ParamAttr-ICmp.ll
index c73fa1fcdc9..359feba0c89 100644
--- a/test/CodeGen/CBackend/2007-01-08-ParamAttr-ICmp.ll
+++ b/test/CodeGen/CBackend/2007-01-08-ParamAttr-ICmp.ll
@@ -1,6 +1,6 @@
 ; For PR1099
 ; RUN: llvm-as < %s | llc -march=c | \
-; RUN:   grep 'return ((((llvm_cbe_tmp2 == llvm_cbe_b_0_0_val)) ? (1) : (0)))'
+; RUN:   grep {return ((((llvm_cbe_tmp2 == llvm_cbe_b_0_0_val)) ? (1) : (0)))}
 
 target datalayout = "e-p:32:32"
 target triple = "i686-apple-darwin8"
diff --git a/test/CodeGen/CBackend/2007-01-15-NamedArrayType.ll b/test/CodeGen/CBackend/2007-01-15-NamedArrayType.ll
index e083e5cc115..a9eeff3bffd 100644
--- a/test/CodeGen/CBackend/2007-01-15-NamedArrayType.ll
+++ b/test/CodeGen/CBackend/2007-01-15-NamedArrayType.ll
@@ -1,10 +1,10 @@
-; RUN: llvm-as < %s | llc -march=c | not grep fixarray_array3
 ; PR918
+; RUN: llvm-as < %s | llc -march=c | not grep fixarray_array3
 
 %structtype_s = type { i32 }
 %fixarray_array3 = type [3 x %structtype_s]
 
-define i32 %witness(%fixarray_array3* %p) {
+define i32 @witness(%fixarray_array3* %p) {
     %q = getelementptr %fixarray_array3* %p, i32 0, i32 0, i32 0
     %v = load i32* %q
     ret i32 %v
diff --git a/test/CodeGen/CBackend/2007-02-23-NameConflicts.ll b/test/CodeGen/CBackend/2007-02-23-NameConflicts.ll
index 2e4cbf6f829..2bc4d516808 100644
--- a/test/CodeGen/CBackend/2007-02-23-NameConflicts.ll
+++ b/test/CodeGen/CBackend/2007-02-23-NameConflicts.ll
@@ -1,7 +1,7 @@
-; RUN: llvm-as < %s | llc -march=c | grep 'llvm_cbe_A = \*llvm_cbe_G;' &&
-; RUN: llvm-as < %s | llc -march=c | grep 'llvm_cbe_B = \*(&ltmp_0_1);' &&
-; RUN: llvm-as < %s | llc -march=c | grep 'return (llvm_cbe_A + llvm_cbe_B);'
 ; PR1164
+; RUN: llvm-as < %s | llc -march=c | grep {llvm_cbe_A = \\*llvm_cbe_G;}
+; RUN: llvm-as < %s | llc -march=c | grep {llvm_cbe_B = \\*(&ltmp_0_1);}
+; RUN: llvm-as < %s | llc -march=c | grep {return (llvm_cbe_A + llvm_cbe_B);}
 @G = global i32 123
 @ltmp_0_1 = global i32 123
 
diff --git a/test/CodeGen/CBackend/dg.exp b/test/CodeGen/CBackend/dg.exp
index ff34508c3c6..879685ca879 100644
--- a/test/CodeGen/CBackend/dg.exp
+++ b/test/CodeGen/CBackend/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}]]