Convert scripts from using explicit control flow to use the new grep-not script

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

diff --git a/test/Transforms/InstCombine/2002-05-14-SubFailure.ll b/test/Transforms/InstCombine/2002-05-14-SubFailure.ll
index 4141c10d70521220a8f4d27e6059ac03ad67182f..dd859c512233e3f21227f254d9c2a7a7be2ee8b2 100644 (file)
--- a/test/Transforms/InstCombine/2002-05-14-SubFailure.ll
+++ b/test/Transforms/InstCombine/2002-05-14-SubFailure.ll
@@ -1,10 +1,7 @@
 ; Instcombine was missing a test that caused it to make illegal transformations
 ; sometimes.  In this case, it transforms the sub into an add:
 ; RUN: echo foo
-; RUN: if as < %s | opt -instcombine | dis | grep add
-; RUN: then exit 1
-; RUN: else exit 0
-; RUN: fi
+; RUN: as < %s | opt -instcombine | dis | grep-not add
 ;
 
 

diff --git a/test/Transforms/InstCombine/2002-12-05-MissedConstProp.ll b/test/Transforms/InstCombine/2002-12-05-MissedConstProp.ll
index c8e2aca71b091704764370855a5eb16fc992ead3..96c692438e7b2e26d65bc8a24d6935fb6ba67a2d 100644 (file)
--- a/test/Transforms/InstCombine/2002-12-05-MissedConstProp.ll
+++ b/test/Transforms/InstCombine/2002-12-05-MissedConstProp.ll
@@ -1,7 +1,4 @@
-; RUN: if as < %s | opt -instcombine | dis | grep add
-; RUN: then exit 1
-; RUN: else exit 0
-; RUN: fi
+; RUN: as < %s | opt -instcombine | dis | grep-not add
 
 int %test(int %A) {
   %A.neg = sub int 0, %A

diff --git a/test/Transforms/InstCombine/add.ll b/test/Transforms/InstCombine/add.ll
index d3e358d0ebbbabe54bcddbe6604aefdfaa35d688..b2850d37dec202b7155f6fdb0e78371ebddb07e0 100644 (file)
--- a/test/Transforms/InstCombine/add.ll
+++ b/test/Transforms/InstCombine/add.ll
@@ -3,10 +3,7 @@
 ; This also tests that a subtract with a constant is properly converted
 ; to a add w/negative constant
 
-; RUN: if as < %s | opt -instcombine -die | dis | grep add
-; RUN: then exit 1
-; RUN: else exit 0
-; RUN: fi
+; RUN: as < %s | opt -instcombine -die | dis | grep-not add
 
 implementation
 

diff --git a/test/Transforms/InstCombine/and.ll b/test/Transforms/InstCombine/and.ll
index 269b33c285ae5fbc3be280f3fdda65caee6cdd20..a06fc33fced75b82b4c8ebff41d90bb7b3ba225e 100644 (file)
--- a/test/Transforms/InstCombine/and.ll
+++ b/test/Transforms/InstCombine/and.ll
@@ -1,10 +1,7 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
 
-; RUN: if as < %s | opt -instcombine | dis | grep and
-; RUN: then exit 1
-; RUN: else exit 0
-; RUN: fi
+; RUN: as < %s | opt -instcombine | dis | grep-not and
 
 implementation
 

diff --git a/test/Transforms/InstCombine/call.ll b/test/Transforms/InstCombine/call.ll
index 39b82bf3439882fabb406b6db63ee70d93c6240b..665a09c76392c32a2c08c4bae5276a5ed461b2cd 100644 (file)
--- a/test/Transforms/InstCombine/call.ll
+++ b/test/Transforms/InstCombine/call.ll
@@ -1,7 +1,4 @@
-; RUN: if as < %s | opt -instcombine -die | dis | grep call | grep cast
-; RUN: then exit 1
-; RUN: else exit 0
-; RUN: fi
+; RUN: as < %s | opt -instcombine -die | dis | grep call | grep-not cast
 
 implementation
 

diff --git a/test/Transforms/InstCombine/cast-set.ll b/test/Transforms/InstCombine/cast-set.ll
index fb634f893e498564ba5b6804203279a2ade91642..ef3821a1f04b30d139918c9702bfcad6c548fa2d 100644 (file)
--- a/test/Transforms/InstCombine/cast-set.ll
+++ b/test/Transforms/InstCombine/cast-set.ll
@@ -3,10 +3,7 @@
 ; slow.  Might it be better to make there be an instcombine prepass before
 ; level raise that takes care of the obvious stuff?
 
-; RUN: if as < %s | opt -instcombine | dis | grep cast
-; RUN: then exit 1
-; RUN: else exit 0
-; RUN: fi
+; RUN: as < %s | opt -instcombine | dis | grep-not cast
 
 bool %test1(int %X) {
        %A = cast int %X to uint

diff --git a/test/Transforms/InstCombine/cast.ll b/test/Transforms/InstCombine/cast.ll
index d197eafb79662f38e424f67a2b1d372ca1761305..32556c070e814a8659cd8658256545d6df25e283 100644 (file)
--- a/test/Transforms/InstCombine/cast.ll
+++ b/test/Transforms/InstCombine/cast.ll
@@ -1,9 +1,6 @@
 ; Tests to make sure elimination of casts is working correctly
 
-; RUN: if as < %s | opt -instcombine -die | dis | grep '%c' | grep cast
-; RUN: then exit 1
-; RUN: else exit 0
-; RUN: fi
+; RUN: as < %s | opt -instcombine -die | dis | grep '%c' | grep-not cast
 
 implementation
 

diff --git a/test/Transforms/InstCombine/div.ll b/test/Transforms/InstCombine/div.ll
index 2bcd452c23bd59036d6a87eb436ca9af3c139680..913d3ccef5c047fc096d7efc96a2c6bcf7ea3cac 100644 (file)
--- a/test/Transforms/InstCombine/div.ll
+++ b/test/Transforms/InstCombine/div.ll
@@ -1,10 +1,7 @@
 ; This test makes sure that div instructions are properly eliminated.
 ;
 
-; RUN: if as < %s | opt -instcombine | dis | grep div
-; RUN: then exit 1
-; RUN: else exit 0
-; RUN: fi
+; RUN: as < %s | opt -instcombine | dis | grep-not div
 
 implementation
 

diff --git a/test/Transforms/InstCombine/getelementptr.ll b/test/Transforms/InstCombine/getelementptr.ll
index 52c1ba6768c6d68d74d0c6cb28b630b73f4d4bcb..011554cffd7e1d06d8d85fbd2d30c8b01d0374c0 100644 (file)
--- a/test/Transforms/InstCombine/getelementptr.ll
+++ b/test/Transforms/InstCombine/getelementptr.ll
@@ -1,9 +1,6 @@
 ; The %A getelementptr instruction should be eliminated here
 
-; RUN: if as < %s | opt -instcombine -die | dis | grep getelementptr | grep '%A '
-; RUN: then exit 1
-; RUN: else exit 0
-; RUN: fi
+; RUN: as < %s | opt -instcombine -die | dis | grep getelementptr | grep-not '%A '
 
 %Global = constant [10 x sbyte] c"helloworld"
 

diff --git a/test/Transforms/InstCombine/load.ll b/test/Transforms/InstCombine/load.ll
index 47da1ff00686b962620db87d53cc89ddab881462..f80e02e464e1673e51df61c324f4f1d259b57b87 100644 (file)
--- a/test/Transforms/InstCombine/load.ll
+++ b/test/Transforms/InstCombine/load.ll
@@ -1,10 +1,7 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
 
-; RUN: if as < %s | opt -instcombine | dis | grep load
-; RUN: then exit 1
-; RUN: else exit 0
-; RUN: fi
+; RUN: as < %s | opt -instcombine | dis | grep-not load
 
 %X = constant int 42
 %Y = constant [2 x { int, float }] [ { int, float } { int 12, float 1.0 }, 

diff --git a/test/Transforms/InstCombine/not.ll b/test/Transforms/InstCombine/not.ll
index 24d8f69a4b2dbb476987bec9471a2a66dc1aaf89..0928ce7bc30415afcf1c90f04996aed2c124991c 100644 (file)
--- a/test/Transforms/InstCombine/not.ll
+++ b/test/Transforms/InstCombine/not.ll
@@ -1,10 +1,7 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
 
-; RUN: if as < %s | opt -instcombine -die | dis | grep xor
-; RUN: then exit 1
-; RUN: else exit 0
-; RUN: fi
+; RUN: as < %s | opt -instcombine -die | dis | grep-not xor
 
 implementation
 

diff --git a/test/Transforms/InstCombine/or.ll b/test/Transforms/InstCombine/or.ll
index e01bb11bf580472238a890556280c1f82bfac213..09141a3c0ac933884aef212eeceadefd8a5cbfae 100644 (file)
--- a/test/Transforms/InstCombine/or.ll
+++ b/test/Transforms/InstCombine/or.ll
@@ -1,10 +1,7 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
 
-; RUN: if as < %s | opt -instcombine | dis | grep -v '%OROK = or' | grep or\ 
-; RUN: then exit 1
-; RUN: else exit 0
-; RUN: fi
+; RUN: as < %s | opt -instcombine | dis | grep -v '%OROK = or' | grep-not 'or '
 
 implementation
 

diff --git a/test/Transforms/InstCombine/phi.ll b/test/Transforms/InstCombine/phi.ll
index 52d9157a44a952a390d7e293729ee3586412ab85..f867bdf42657a9b5a0e58cf88636cea58b1b2163 100644 (file)
--- a/test/Transforms/InstCombine/phi.ll
+++ b/test/Transforms/InstCombine/phi.ll
@@ -1,10 +1,7 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
 
-; RUN: if as < %s | opt -instcombine -die | dis | grep phi
-; RUN: then exit 1
-; RUN: else exit 0
-; RUN: fi
+; RUN: as < %s | opt -instcombine -die | dis | grep-not phi
 
 implementation
 

diff --git a/test/Transforms/InstCombine/pow.ll b/test/Transforms/InstCombine/pow.ll
index 9a3ca7e6f9f4fb52859ded67c0ba5d25a50ef936..66027cde12487316e07c7c5c9417554cb97e899c 100644 (file)
--- a/test/Transforms/InstCombine/pow.ll
+++ b/test/Transforms/InstCombine/pow.ll
@@ -2,10 +2,7 @@
 ;
 ; Equivalent to: http://gcc.gnu.org/ml/gcc-patches/2003-02/msg01786.html
 
-; RUN: if as < %s | opt -instcombine | dis | grep 'call double %pow'
-; RUN: then exit 1
-; RUN: else exit 0
-; RUN: fi
+; RUN: as < %s | opt -instcombine | dis | grep-not 'call double %pow'
 
 declare double %pow(double, double)
 

diff --git a/test/Transforms/InstCombine/rem.ll b/test/Transforms/InstCombine/rem.ll
index ddc1c4b0c66e1c463c40e996ce6174e507cff8fd..09300a56726d4d6442089e0e12c2d0c5d11f0a7d 100644 (file)
--- a/test/Transforms/InstCombine/rem.ll
+++ b/test/Transforms/InstCombine/rem.ll
@@ -1,10 +1,7 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
 
-; RUN: if as < %s | opt -instcombine | dis | grep rem
-; RUN: then exit 1
-; RUN: else exit 0
-; RUN: fi
+; RUN: as < %s | opt -instcombine | dis | grep-not rem
 
 implementation
 

diff --git a/test/Transforms/InstCombine/set.ll b/test/Transforms/InstCombine/set.ll
index f97a2b6198d5e6632caf9c70712076b5625275af..760e14d1e29aefa62f7cbfc3f0246998dc64e49c 100644 (file)
--- a/test/Transforms/InstCombine/set.ll
+++ b/test/Transforms/InstCombine/set.ll
@@ -1,10 +1,7 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
 
-; RUN: if as < %s | opt -instcombine | dis | grep set
-; RUN: then exit 1
-; RUN: else exit 0
-; RUN: fi
+; RUN: as < %s | opt -instcombine | dis | grep-not set
 
 %X = uninitialized global int
 

diff --git a/test/Transforms/InstCombine/setcc-strength-reduce.ll b/test/Transforms/InstCombine/setcc-strength-reduce.ll
index 375dac607146a00f831ec61c0f7cae28346b3d30..9051d032cff0c826093d0239e1081c96914e7e7c 100644 (file)
--- a/test/Transforms/InstCombine/setcc-strength-reduce.ll
+++ b/test/Transforms/InstCombine/setcc-strength-reduce.ll
@@ -3,10 +3,7 @@
 ; into equivalent setne,eq instructions.
 ;
 
-; RUN: if as < %s | opt -instcombine | dis | grep -v seteq | grep -v setne | grep set
-; RUN: then exit 1
-; RUN: else exit 0
-; RUN: fi
+; RUN: as < %s | opt -instcombine | dis | grep -v seteq | grep -v setne | grep-not set
 
 bool "test1"(uint %A) {
        %B = setge uint %A, 1   ; setne %A, 0

diff --git a/test/Transforms/InstCombine/shift.ll b/test/Transforms/InstCombine/shift.ll
index 66a081789003f82cbfd6b0c725d45561c8d23cc3..67e2827007f7f540e44432abdae078be5e51b8c5 100644 (file)
--- a/test/Transforms/InstCombine/shift.ll
+++ b/test/Transforms/InstCombine/shift.ll
@@ -1,10 +1,7 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
 
-; RUN: if as < %s | opt -instcombine | dis | grep sh
-; RUN: then exit 1
-; RUN: else exit 0
-; RUN: fi
+; RUN: as < %s | opt -instcombine | dis | grep-not sh
 
 implementation
 

diff --git a/test/Transforms/InstCombine/sub.ll b/test/Transforms/InstCombine/sub.ll
index 184886c9be2beba93d9a39993803afbd754df45d..4bd9be645b5ec7edd7ca18539a330707dceca405 100644 (file)
--- a/test/Transforms/InstCombine/sub.ll
+++ b/test/Transforms/InstCombine/sub.ll
@@ -1,10 +1,7 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
 
-; RUN: if as < %s | opt -instcombine -die | dis | grep sub | grep -v 'sub int %Cok, %Bok'
-; RUN: then exit 1
-; RUN: else exit 0
-; RUN: fi
+; RUN: as < %s | opt -instcombine -die | dis | grep sub | grep-not -v 'sub int %Cok, %Bok'
 
 implementation