Partly revert "Move clang tests that depend on llvm/ADT/Statistic.h to a subdir".

This reverts commit 176730, and uses "REQUIRES: asserts" instead.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@176815 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/Analysis/Stats/lit.local.cfg b/test/Analysis/Stats/lit.local.cfg
deleted file mode 100644
index a36c70e..0000000
--- a/test/Analysis/Stats/lit.local.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-config.suffixes = ['.c', '.cpp', '.m', '.mm', '.cu', '.ll', '.cl', '.s']
-
-if 'asserts' not in config.root.available_features:
-    config.unsupported = True
diff --git a/test/Analysis/Stats/objc-method-coverage.m b/test/Analysis/objc-method-coverage.m
similarity index 94%
rename from test/Analysis/Stats/objc-method-coverage.m
rename to test/Analysis/objc-method-coverage.m
index cb66bff..489c19b 100644
--- a/test/Analysis/Stats/objc-method-coverage.m
+++ b/test/Analysis/objc-method-coverage.m
@@ -1,3 +1,4 @@
+// REQUIRES: asserts
 // RUN: %clang_cc1 -analyze -analyzer-checker=core -analyzer-stats -fblocks %s 2>&1 | FileCheck %s
 @interface I
 int f() {
@@ -13,4 +14,4 @@
 
 // CHECK: ... Statistics Collected ...
 // CHECK: 2 AnalysisConsumer - The # of functions and blocks analyzed (as top level with inlining turned on).
-// CHECK: 100 AnalysisConsumer - The % of reachable basic blocks.
\ No newline at end of file
+// CHECK: 100 AnalysisConsumer - The % of reachable basic blocks.
diff --git a/test/Analysis/Stats/stats.c b/test/Analysis/stats.c
similarity index 92%
rename from test/Analysis/Stats/stats.c
rename to test/Analysis/stats.c
index 6beadbe..5701dc7 100644
--- a/test/Analysis/Stats/stats.c
+++ b/test/Analysis/stats.c
@@ -1,3 +1,4 @@
+// REQUIRES: asserts
 // RUN: %clang_cc1 -analyze -analyzer-checker=core -analyzer-stats %s 2>&1 | FileCheck %s
 
 void foo() {