From bb4501dec637be450fc294b81244ea5c4b536821 Mon Sep 17 00:00:00 2001
From: Michael Gottesman <mgottesman@apple.com>
Date: Thu, 31 Jan 2013 01:04:23 +0000
Subject: [PATCH] Filecheckized 2x tests in SimplifyCFG and removed their date
 prefix to fit with current llvm style for test names.

llvm-svn: 174011
---
 .../{2002-05-05-EmptyBlockMerge.ll => EmptyBlockMerge.ll}    | 5 ++---
 .../SimplifyCFG/{2002-06-24-PHINode.ll => PHINode.ll}        | 3 ++-
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename test/Transforms/SimplifyCFG/{2002-05-05-EmptyBlockMerge.ll => EmptyBlockMerge.ll} (86%)
 rename test/Transforms/SimplifyCFG/{2002-06-24-PHINode.ll => PHINode.ll} (77%)

diff --git a/test/Transforms/SimplifyCFG/2002-05-05-EmptyBlockMerge.ll b/test/Transforms/SimplifyCFG/EmptyBlockMerge.ll
similarity index 86%
rename from test/Transforms/SimplifyCFG/2002-05-05-EmptyBlockMerge.ll
rename to test/Transforms/SimplifyCFG/EmptyBlockMerge.ll
index feffb4e4c81..aba08dc073a 100644
--- a/test/Transforms/SimplifyCFG/2002-05-05-EmptyBlockMerge.ll
+++ b/test/Transforms/SimplifyCFG/EmptyBlockMerge.ll
@@ -1,8 +1,6 @@
 ; Basic block #2 should not be merged into BB #3!
 ;
-; RUN: opt < %s -simplifycfg -S | \
-; RUN:   grep "br label"
-;
+; RUN: opt < %s -simplifycfg -S | FileCheck %s
 
 declare void @foo()
 
@@ -13,6 +11,7 @@ bb0:
 	br i1 %cond218, label %bb3, label %bb2
 bb2:		; preds = %bb0
 	call void @foo( )
+; CHECK: br label %bb3
 	br label %bb3
 bb3:		; preds = %bb2, %bb0
 	%reg117 = phi i32 [ 110, %bb2 ], [ %reg108, %bb0 ]		; <i32> [#uses=1]
diff --git a/test/Transforms/SimplifyCFG/2002-06-24-PHINode.ll b/test/Transforms/SimplifyCFG/PHINode.ll
similarity index 77%
rename from test/Transforms/SimplifyCFG/2002-06-24-PHINode.ll
rename to test/Transforms/SimplifyCFG/PHINode.ll
index 88f32bc0827..25a242a5599 100644
--- a/test/Transforms/SimplifyCFG/2002-06-24-PHINode.ll
+++ b/test/Transforms/SimplifyCFG/PHINode.ll
@@ -1,10 +1,11 @@
 ; -simplifycfg is not folding blocks if there is a PHI node involved.  This 
 ; should be fixed eventually
 
-; RUN: opt < %s -simplifycfg -S | not grep br
+; RUN: opt < %s -simplifycfg -S | FileCheck %s
 
 define i32 @main(i32 %argc) {
 ; <label>:0
+; CHECK-NOT: br label %InlinedFunctionReturnNode
 	br label %InlinedFunctionReturnNode
 InlinedFunctionReturnNode:		; preds = %0
 	%X = phi i32 [ 7, %0 ]		; <i32> [#uses=1]