Eliminate explicit control flow in tests

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

diff --git a/test/Transforms/SimplifyCFG/2002-06-24-PHINode.ll b/test/Transforms/SimplifyCFG/2002-06-24-PHINode.ll
index aa24bfbc599c40ef8d8fd4047529804d58528163..1587e7e144a0d5ea744604b5d17f8862a7ba9db4 100644 (file)
--- 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 b090e781985a5c2e2ef8dfa2cfd335342488fcf9..1a31ee4b25aae883eb102d385e9d2bc97f97949a 100644 (file)
--- 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 d1df2a17b7d77a254e411a424597c6ac4d4e15fe..21e4f59b2709a7b9d6d093b9faedfa4c1f6385f6 100644 (file)
--- 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 aecb6b9244fa926d4103f9fa8863a158c41aee2b..94cd5934eb4bf149db688977de3065d02c5c4614 100644 (file)
--- 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 c86d9398f5a6b820633056611ceedce300c81e90..c16b1cd6b0791cb62873f98ba27c89593c72c50c 100644 (file)
--- 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 207eaa9a2eb0f854bff47591fb0de4c0197acc59..3f1a8e40003216a785a36dfc59a97f364053026f 100644 (file)
--- 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: