Eliminate explicit control flow in tests
llvm-svn: 6961
diff --git a/llvm/test/Regression/Transforms/SimplifyCFG/2002-06-24-PHINode.ll b/llvm/test/Regression/Transforms/SimplifyCFG/2002-06-24-PHINode.ll
index aa24bfb..1587e7e 100644
--- a/llvm/test/Regression/Transforms/SimplifyCFG/2002-06-24-PHINode.ll
+++ b/llvm/test/Regression/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/llvm/test/Regression/Transforms/SimplifyCFG/EqualPHIEdgeBlockMerge.ll b/llvm/test/Regression/Transforms/SimplifyCFG/EqualPHIEdgeBlockMerge.ll
index b090e78..1a31ee4 100644
--- a/llvm/test/Regression/Transforms/SimplifyCFG/EqualPHIEdgeBlockMerge.ll
+++ b/llvm/test/Regression/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/llvm/test/Regression/Transforms/SimplifyCFG/PhiBlockMerge.ll b/llvm/test/Regression/Transforms/SimplifyCFG/PhiBlockMerge.ll
index d1df2a1..21e4f59 100644
--- a/llvm/test/Regression/Transforms/SimplifyCFG/PhiBlockMerge.ll
+++ b/llvm/test/Regression/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/llvm/test/Regression/Transforms/SimplifyCFG/PhiBlockMerge2.ll b/llvm/test/Regression/Transforms/SimplifyCFG/PhiBlockMerge2.ll
index aecb6b9..94cd593 100644
--- a/llvm/test/Regression/Transforms/SimplifyCFG/PhiBlockMerge2.ll
+++ b/llvm/test/Regression/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/llvm/test/Regression/Transforms/SimplifyCFG/basictest.ll b/llvm/test/Regression/Transforms/SimplifyCFG/basictest.ll
index c86d939..c16b1cd 100644
--- a/llvm/test/Regression/Transforms/SimplifyCFG/basictest.ll
+++ b/llvm/test/Regression/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/llvm/test/Regression/Transforms/SimplifyCFG/branch-fold-test.ll b/llvm/test/Regression/Transforms/SimplifyCFG/branch-fold-test.ll
index 207eaa9..3f1a8e4 100644
--- a/llvm/test/Regression/Transforms/SimplifyCFG/branch-fold-test.ll
+++ b/llvm/test/Regression/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: