Revert the test moves from 176733. Use "REQUIRES: asserts" instead.

llvm-svn: 176873

28 files changed, 18 insertions, 40 deletions

diff --git a/llvm/test/Transforms/GVN/Stats/lit.local.cfg b/llvm/test/Transforms/GVN/Stats/lit.local.cfg
deleted file mode 100644
index 89c0cd9d487..00000000000
--- a/llvm/test/Transforms/GVN/Stats/lit.local.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-config.suffixes = ['.ll', '.c', '.cpp']
-
-if not config.root.enable_assertions:
-    config.unsupported = True
diff --git a/llvm/test/Transforms/GVN/Stats/nonescaping-malloc.ll b/llvm/test/Transforms/GVN/nonescaping-malloc.ll
index afcb7fe3bb0..c2eeed56ffc 100644
--- a/llvm/test/Transforms/GVN/Stats/nonescaping-malloc.ll
+++ b/llvm/test/Transforms/GVN/nonescaping-malloc.ll
@@ -1,3 +1,4 @@
+; REQUIRES: asserts
 ; RUN: opt < %s -basicaa -gvn -stats -disable-output 2>&1 | grep "Number of loads deleted"
 ; rdar://7363102
 
diff --git a/llvm/test/Transforms/GlobalOpt/Stats/2009-03-05-dbg.ll b/llvm/test/Transforms/GlobalOpt/2009-03-05-dbg.ll
index 0f3efa09a1d..e71aed9e05f 100644
--- a/llvm/test/Transforms/GlobalOpt/Stats/2009-03-05-dbg.ll
+++ b/llvm/test/Transforms/GlobalOpt/2009-03-05-dbg.ll
@@ -1,3 +1,4 @@
+; REQUIRES: asserts
 ; RUN: opt < %s -globalopt -stats -disable-output 2>&1 | grep "1 globalopt - Number of global vars shrunk to booleans"
 
 @Stop = internal global i32 0                     ; <i32*> [#uses=3]
diff --git a/llvm/test/Transforms/GlobalOpt/Stats/lit.local.cfg b/llvm/test/Transforms/GlobalOpt/Stats/lit.local.cfg
deleted file mode 100644
index 89c0cd9d487..00000000000
--- a/llvm/test/Transforms/GlobalOpt/Stats/lit.local.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-config.suffixes = ['.ll', '.c', '.cpp']
-
-if not config.root.enable_assertions:
-    config.unsupported = True
diff --git a/llvm/test/Transforms/IndVarSimplify/Stats/lit.local.cfg b/llvm/test/Transforms/IndVarSimplify/Stats/lit.local.cfg
deleted file mode 100644
index 89c0cd9d487..00000000000
--- a/llvm/test/Transforms/IndVarSimplify/Stats/lit.local.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-config.suffixes = ['.ll', '.c', '.cpp']
-
-if not config.root.enable_assertions:
-    config.unsupported = True
diff --git a/llvm/test/Transforms/IndVarSimplify/Stats/phi-uses-value-multiple-times.ll b/llvm/test/Transforms/IndVarSimplify/phi-uses-value-multiple-times.ll
index 52c9e5c3ffc..dc36b994825 100644
--- a/llvm/test/Transforms/IndVarSimplify/Stats/phi-uses-value-multiple-times.ll
+++ b/llvm/test/Transforms/IndVarSimplify/phi-uses-value-multiple-times.ll
@@ -1,3 +1,4 @@
+; REQUIRES: asserts
 ; RUN: opt < %s -indvars -disable-output -stats -info-output-file - | FileCheck %s
 ; Check that IndVarSimplify is not creating unnecessary canonical IVs
 ; that will never be used.
diff --git a/llvm/test/Transforms/Inline/Stats/lit.local.cfg b/llvm/test/Transforms/Inline/Stats/lit.local.cfg
deleted file mode 100644
index 89c0cd9d487..00000000000
--- a/llvm/test/Transforms/Inline/Stats/lit.local.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-config.suffixes = ['.ll', '.c', '.cpp']
-
-if not config.root.enable_assertions:
-    config.unsupported = True
diff --git a/llvm/test/Transforms/Inline/Stats/delete-call.ll b/llvm/test/Transforms/Inline/delete-call.ll
index 0afd2ee4c2d..97c52af9e0d 100644
--- a/llvm/test/Transforms/Inline/Stats/delete-call.ll
+++ b/llvm/test/Transforms/Inline/delete-call.ll
@@ -1,3 +1,4 @@
+; REQUIRES: asserts
 ; RUN: opt -S -inline -stats < %s 2>&1 | FileCheck %s
 ; CHECK: Number of functions inlined
 
diff --git a/llvm/test/Transforms/LICM/Stats/lit.local.cfg b/llvm/test/Transforms/LICM/Stats/lit.local.cfg
deleted file mode 100644
index 89c0cd9d487..00000000000
--- a/llvm/test/Transforms/LICM/Stats/lit.local.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-config.suffixes = ['.ll', '.c', '.cpp']
-
-if not config.root.enable_assertions:
-    config.unsupported = True
diff --git a/llvm/test/Transforms/LICM/Stats/hoist-invariant-load.ll b/llvm/test/Transforms/LICM/hoist-invariant-load.ll
index f9fc551df35..1ba94d6b489 100644
--- a/llvm/test/Transforms/LICM/Stats/hoist-invariant-load.ll
+++ b/llvm/test/Transforms/LICM/hoist-invariant-load.ll
@@ -1,3 +1,4 @@
+; REQUIRES: asserts
 ; RUN: opt < %s -licm -stats -S 2>&1 | grep "1 licm"
 
 @"\01L_OBJC_METH_VAR_NAME_" = internal global [4 x i8] c"foo\00", section "__TEXT,__objc_methname,cstring_literals", align 1
diff --git a/llvm/test/Transforms/LoopUnroll/Stats/lit.local.cfg b/llvm/test/Transforms/LoopUnroll/Stats/lit.local.cfg
deleted file mode 100644
index 89c0cd9d487..00000000000
--- a/llvm/test/Transforms/LoopUnroll/Stats/lit.local.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-config.suffixes = ['.ll', '.c', '.cpp']
-
-if not config.root.enable_assertions:
-    config.unsupported = True
diff --git a/llvm/test/Transforms/LoopUnroll/Stats/runtime-loop3.ll b/llvm/test/Transforms/LoopUnroll/runtime-loop3.ll
index 55cf22373ec..aa928ccc60c 100644
--- a/llvm/test/Transforms/LoopUnroll/Stats/runtime-loop3.ll
+++ b/llvm/test/Transforms/LoopUnroll/runtime-loop3.ll
@@ -1,3 +1,4 @@
+; REQUIRES: asserts
 ; RUN: opt < %s -disable-output -stats -loop-unroll -unroll-runtime -unroll-threshold=400 -info-output-file - | FileCheck %s --check-prefix=STATS
 
 ; Test that nested loops can be unrolled.  We need to increase threshold to do it
diff --git a/llvm/test/Transforms/LoopUnswitch/Stats/2008-11-03-Invariant.ll b/llvm/test/Transforms/LoopUnswitch/2008-11-03-Invariant.ll
index 9d73d31d504..31dba79be1f 100644
--- a/llvm/test/Transforms/LoopUnswitch/Stats/2008-11-03-Invariant.ll
+++ b/llvm/test/Transforms/LoopUnswitch/2008-11-03-Invariant.ll
@@ -1,3 +1,4 @@
+; REQUIRES: asserts
 ; RUN: opt < %s -loop-unswitch -stats -disable-output 2>&1 | grep "1 loop-unswitch - Number of branches unswitched" | count 1
 ; PR 3170
 define i32 @a(i32 %x, i32 %y) nounwind {
diff --git a/llvm/test/Transforms/LoopUnswitch/Stats/2011-11-18-SimpleSwitch.ll b/llvm/test/Transforms/LoopUnswitch/2011-11-18-SimpleSwitch.ll
index bde52da87ae..a8608b87720 100644
--- a/llvm/test/Transforms/LoopUnswitch/Stats/2011-11-18-SimpleSwitch.ll
+++ b/llvm/test/Transforms/LoopUnswitch/2011-11-18-SimpleSwitch.ll
@@ -1,3 +1,4 @@
+; REQUIRES: asserts
 ; RUN: opt -loop-unswitch -disable-output -stats -info-output-file - < %s | FileCheck --check-prefix=STATS %s
 ; RUN: opt -S -loop-unswitch -verify-loop-info -verify-dom-info < %s | FileCheck %s
 
diff --git a/llvm/test/Transforms/LoopUnswitch/Stats/2011-11-18-TwoSwitches-Threshold.ll b/llvm/test/Transforms/LoopUnswitch/2011-11-18-TwoSwitches-Threshold.ll
index c3bf5966ad0..686cedbbc51 100644
--- a/llvm/test/Transforms/LoopUnswitch/Stats/2011-11-18-TwoSwitches-Threshold.ll
+++ b/llvm/test/Transforms/LoopUnswitch/2011-11-18-TwoSwitches-Threshold.ll
@@ -1,3 +1,4 @@
+; REQUIRES: asserts
 ; RUN: opt -loop-unswitch -loop-unswitch-threshold 13 -disable-output -stats -info-output-file - < %s | FileCheck --check-prefix=STATS %s
 ; RUN: opt -S -loop-unswitch -loop-unswitch-threshold 13 -verify-loop-info -verify-dom-info < %s | FileCheck %s
 
diff --git a/llvm/test/Transforms/LoopUnswitch/Stats/2011-11-18-TwoSwitches.ll b/llvm/test/Transforms/LoopUnswitch/2011-11-18-TwoSwitches.ll
index 95303337da5..3ba9fc2f5cf 100644
--- a/llvm/test/Transforms/LoopUnswitch/Stats/2011-11-18-TwoSwitches.ll
+++ b/llvm/test/Transforms/LoopUnswitch/2011-11-18-TwoSwitches.ll
@@ -1,3 +1,4 @@
+; REQUIRES: asserts
 ; RUN: opt -loop-unswitch -loop-unswitch-threshold 1000 -disable-output -stats -info-output-file - < %s | FileCheck --check-prefix=STATS %s
 ; RUN: opt -S -loop-unswitch -loop-unswitch-threshold 1000 -verify-loop-info -verify-dom-info < %s | FileCheck %s
 
diff --git a/llvm/test/Transforms/LoopUnswitch/Stats/lit.local.cfg b/llvm/test/Transforms/LoopUnswitch/Stats/lit.local.cfg
deleted file mode 100644
index 89c0cd9d487..00000000000
--- a/llvm/test/Transforms/LoopUnswitch/Stats/lit.local.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-config.suffixes = ['.ll', '.c', '.cpp']
-
-if not config.root.enable_assertions:
-    config.unsupported = True
diff --git a/llvm/test/Transforms/LoopUnswitch/Stats/infinite-loop.ll b/llvm/test/Transforms/LoopUnswitch/infinite-loop.ll
index f3fba642f81..8261e389370 100644
--- a/llvm/test/Transforms/LoopUnswitch/Stats/infinite-loop.ll
+++ b/llvm/test/Transforms/LoopUnswitch/infinite-loop.ll
@@ -1,3 +1,4 @@
+; REQUIRES: asserts
 ; RUN: opt -loop-unswitch -disable-output -stats -info-output-file - < %s | FileCheck --check-prefix=STATS %s
 ; RUN: opt -loop-unswitch -simplifycfg -S < %s | FileCheck %s
 ; PR5373
diff --git a/llvm/test/Transforms/MergeFunc/Stats/lit.local.cfg b/llvm/test/Transforms/MergeFunc/Stats/lit.local.cfg
deleted file mode 100644
index 89c0cd9d487..00000000000
--- a/llvm/test/Transforms/MergeFunc/Stats/lit.local.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-config.suffixes = ['.ll', '.c', '.cpp']
-
-if not config.root.enable_assertions:
-    config.unsupported = True
diff --git a/llvm/test/Transforms/MergeFunc/Stats/phi-speculation1.ll b/llvm/test/Transforms/MergeFunc/phi-speculation1.ll
index fd0baffb310..548e5102be1 100644
--- a/llvm/test/Transforms/MergeFunc/Stats/phi-speculation1.ll
+++ b/llvm/test/Transforms/MergeFunc/phi-speculation1.ll
@@ -1,3 +1,4 @@
+; REQUIRES: asserts
 ; RUN: opt < %s -mergefunc -stats -disable-output 2>&1 | not grep "functions merged"
 
 define i32 @foo1(i32 %x) {
diff --git a/llvm/test/Transforms/MergeFunc/Stats/phi-speculation2.ll b/llvm/test/Transforms/MergeFunc/phi-speculation2.ll
index eec8b5c5a90..d42a465d0c6 100644
--- a/llvm/test/Transforms/MergeFunc/Stats/phi-speculation2.ll
+++ b/llvm/test/Transforms/MergeFunc/phi-speculation2.ll
@@ -1,3 +1,4 @@
+; REQUIRES: asserts
 ; RUN: opt < %s -mergefunc -stats -disable-output 2>&1 | grep "functions merged"
 
 define i32 @foo1(i32 %x) {
diff --git a/llvm/test/Transforms/MergeFunc/Stats/vector.ll b/llvm/test/Transforms/MergeFunc/vector.ll
index 4af079f8cdf..dba5fa349ab 100644
--- a/llvm/test/Transforms/MergeFunc/Stats/vector.ll
+++ b/llvm/test/Transforms/MergeFunc/vector.ll
@@ -1,3 +1,4 @@
+; REQUIRES: asserts
 ; RUN: opt -mergefunc -stats -disable-output < %s 2>&1 | grep "functions merged"
 
 ; This test is checks whether we can merge
diff --git a/llvm/test/Transforms/MergeFunc/Stats/vectors-and-arrays.ll b/llvm/test/Transforms/MergeFunc/vectors-and-arrays.ll
index dc64a0858ba..22747224a19 100644
--- a/llvm/test/Transforms/MergeFunc/Stats/vectors-and-arrays.ll
+++ b/llvm/test/Transforms/MergeFunc/vectors-and-arrays.ll
@@ -1,3 +1,4 @@
+; REQUIRES: asserts
 ; RUN: opt -mergefunc < %s -disable-output -stats | not grep merged
 ; This used to crash with an assert.
 
diff --git a/llvm/test/Transforms/TailCallElim/Stats/lit.local.cfg b/llvm/test/Transforms/TailCallElim/Stats/lit.local.cfg
deleted file mode 100644
index 89c0cd9d487..00000000000
--- a/llvm/test/Transforms/TailCallElim/Stats/lit.local.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-config.suffixes = ['.ll', '.c', '.cpp']
-
-if not config.root.enable_assertions:
-    config.unsupported = True
diff --git a/llvm/test/Transforms/TailCallElim/Stats/ackermann.ll b/llvm/test/Transforms/TailCallElim/ackermann.ll
index 5b5dbcc225c..83d98b84ea7 100644
--- a/llvm/test/Transforms/TailCallElim/Stats/ackermann.ll
+++ b/llvm/test/Transforms/TailCallElim/ackermann.ll
@@ -1,3 +1,4 @@
+; REQUIRES: asserts
 ; This function contains two tail calls, which should be eliminated
 ; RUN: opt < %s -tailcallelim -stats -disable-output 2>&1 | grep "2 tailcallelim"
 
diff --git a/llvm/test/Transforms/TailCallElim/Stats/dup_tail.ll b/llvm/test/Transforms/TailCallElim/dup_tail.ll
index 3b87ed3ca6e..f5b87f27644 100644
--- a/llvm/test/Transforms/TailCallElim/Stats/dup_tail.ll
+++ b/llvm/test/Transforms/TailCallElim/dup_tail.ll
@@ -1,3 +1,4 @@
+; REQUIRES: asserts
 ; Duplicate the return into if.end to enable TCE.
 ; RUN: opt -tailcallelim -stats -disable-output < %s 2>&1 | FileCheck %s
 
diff --git a/llvm/test/Transforms/TailDup/Stats/2008-06-11-AvoidDupLoopHeader.ll b/llvm/test/Transforms/TailDup/2008-06-11-AvoidDupLoopHeader.ll
index 7853d7ba06f..292186020f4 100644
--- a/llvm/test/Transforms/TailDup/Stats/2008-06-11-AvoidDupLoopHeader.ll
+++ b/llvm/test/Transforms/TailDup/2008-06-11-AvoidDupLoopHeader.ll
@@ -1,3 +1,4 @@
+; REQUIRES: asserts
 ; RUN: opt < %s -tailduplicate -taildup-threshold=3 -stats -disable-output 2>&1 | not grep tailduplicate
 ; XFAIL: *
 
diff --git a/llvm/test/Transforms/TailDup/Stats/lit.local.cfg b/llvm/test/Transforms/TailDup/Stats/lit.local.cfg
deleted file mode 100644
index 89c0cd9d487..00000000000
--- a/llvm/test/Transforms/TailDup/Stats/lit.local.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-config.suffixes = ['.ll', '.c', '.cpp']
-
-if not config.root.enable_assertions:
-    config.unsupported = True