Eliminate explicit control flow in tests

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

6 files changed, 6 insertions, 24 deletions

diff --git a/test/Transforms/SimplifyCFG/2002-06-24-PHINode.ll b/test/Transforms/SimplifyCFG/2002-06-24-PHINode.ll
index aa24bfbc59..1587e7e144 100644
--- a/test/Transforms/SimplifyCFG/2002-06-24-PHINode.ll
+++ b/test/Transforms/SimplifyCFG/2002-06-24-PHINode.ll
@@ -1,10 +1,7 @@
 ; -simplifycfg is not folding blocks if there is a PHI node involved.  This 
 ; should be fixed eventually
 
-; RUN: if as < %s | opt -simplifycfg | dis | grep br
-; RUN: then exit 1
-; RUN: else exit 0
-; RUN: fi
+; RUN: as < %s | opt -simplifycfg | dis | not grep br
 
 int %main(int %argc) {
         br label %InlinedFunctionReturnNode
diff --git a/test/Transforms/SimplifyCFG/EqualPHIEdgeBlockMerge.ll b/test/Transforms/SimplifyCFG/EqualPHIEdgeBlockMerge.ll
index b090e78198..1a31ee4b25 100644
--- a/test/Transforms/SimplifyCFG/EqualPHIEdgeBlockMerge.ll
+++ b/test/Transforms/SimplifyCFG/EqualPHIEdgeBlockMerge.ll
@@ -1,9 +1,6 @@
 ; Test merging of blocks with phi nodes.
 ;
-; RUN: if as < %s | opt -simplifycfg | dis | grep 'N:'
-; RUN: then exit 1
-; RUN: else exit 0
-; RUN: fi
+; RUN: as < %s | opt -simplifycfg | dis | not grep 'N:'
 ;
 
 int %test(bool %a) {
diff --git a/test/Transforms/SimplifyCFG/PhiBlockMerge.ll b/test/Transforms/SimplifyCFG/PhiBlockMerge.ll
index d1df2a17b7..21e4f59b27 100644
--- a/test/Transforms/SimplifyCFG/PhiBlockMerge.ll
+++ b/test/Transforms/SimplifyCFG/PhiBlockMerge.ll
@@ -1,9 +1,6 @@
 ; Test merging of blocks that only have PHI nodes in them
 ;
-; RUN: if as < %s | opt -simplifycfg | dis | grep 'N:'
-; RUN: then exit 1
-; RUN: else exit 0
-; RUN: fi
+; RUN: as < %s | opt -simplifycfg | dis | not grep 'N:'
 ;
 
 int %test(bool %a, bool %b) {
diff --git a/test/Transforms/SimplifyCFG/PhiBlockMerge2.ll b/test/Transforms/SimplifyCFG/PhiBlockMerge2.ll
index aecb6b9244..94cd5934eb 100644
--- a/test/Transforms/SimplifyCFG/PhiBlockMerge2.ll
+++ b/test/Transforms/SimplifyCFG/PhiBlockMerge2.ll
@@ -2,10 +2,7 @@
 ; where the mergedinto block doesn't have any PHI nodes, and is in fact 
 ; dominated by the block-to-be-eliminated
 ;
-; RUN: if as < %s | opt -simplifycfg | dis | grep 'N:'
-; RUN: then exit 1
-; RUN: else exit 0
-; RUN: fi
+; RUN: as < %s | opt -simplifycfg | dis | not grep 'N:'
 ;
 
 int %test(bool %a, bool %b) {
diff --git a/test/Transforms/SimplifyCFG/basictest.ll b/test/Transforms/SimplifyCFG/basictest.ll
index c86d9398f5..c16b1cd6b0 100644
--- a/test/Transforms/SimplifyCFG/basictest.ll
+++ b/test/Transforms/SimplifyCFG/basictest.ll
@@ -1,9 +1,6 @@
 ; Test CFG simplify removal of branch instructions...
 ;
-; RUN: if as < %s | opt -simplifycfg | dis | grep br
-; RUN: then exit 1
-; RUN: else exit 0
-; RUN: fi
+; RUN: as < %s | opt -simplifycfg | dis | not grep br
 
 
 void "test1"() {
diff --git a/test/Transforms/SimplifyCFG/branch-fold-test.ll b/test/Transforms/SimplifyCFG/branch-fold-test.ll
index 207eaa9a2e..3f1a8e4000 100644
--- a/test/Transforms/SimplifyCFG/branch-fold-test.ll
+++ b/test/Transforms/SimplifyCFG/branch-fold-test.ll
@@ -1,10 +1,7 @@
 ; This test ensures that the simplifycfg pass continues to constant fold
 ; terminator instructions.
 
-; RUN: if as < %s | opt -simplifycfg | grep br
-; RUN: then exit 1
-; RUN: else exit 0
-; RUN: fi
+; RUN: as < %s | opt -simplifycfg | not grep br
 
 int %test(int %A, int %B) {
 J: