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

[Jan Wen Voung]

Author: jvoung
Date: Mon Mar 11 12:48:03 2013
New Revision: 176815

URL: http://llvm.org/viewvc/llvm-project?rev=176815&view=rev
Log:
Partly revert "Move clang tests that depend on llvm/ADT/Statistic.h to a subdir".

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

Added:
    cfe/trunk/test/Analysis/objc-method-coverage.m   (contents, props changed)
      - copied, changed from r176810, cfe/trunk/test/Analysis/Stats/objc-method-coverage.m
    cfe/trunk/test/Analysis/stats.c   (contents, props changed)
      - copied, changed from r176810, cfe/trunk/test/Analysis/Stats/stats.c
Removed:
    cfe/trunk/test/Analysis/Stats/lit.local.cfg
    cfe/trunk/test/Analysis/Stats/objc-method-coverage.m
    cfe/trunk/test/Analysis/Stats/stats.c

Removed: cfe/trunk/test/Analysis/Stats/lit.local.cfg
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/Stats/lit.local.cfg?rev=176814&view=auto
==============================================================================
--- cfe/trunk/test/Analysis/Stats/lit.local.cfg (original)
+++ cfe/trunk/test/Analysis/Stats/lit.local.cfg (removed)
@@ -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

Removed: cfe/trunk/test/Analysis/Stats/objc-method-coverage.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/Stats/objc-method-coverage.m?rev=176814&view=auto
==============================================================================
--- cfe/trunk/test/Analysis/Stats/objc-method-coverage.m (original)
+++ cfe/trunk/test/Analysis/Stats/objc-method-coverage.m (removed)
@@ -1,16 +0,0 @@
-// RUN: %clang_cc1 -analyze -analyzer-checker=core -analyzer-stats -fblocks %s 2>&1 | FileCheck %s
- at interface I
-int f() {
-  return 0;
-}
- at end
-
- at implementation I
-+ (void *)ff{
-  return (void*)0;  
-}
- at end
-
-// 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

Removed: cfe/trunk/test/Analysis/Stats/stats.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/Stats/stats.c?rev=176814&view=auto
==============================================================================
--- cfe/trunk/test/Analysis/Stats/stats.c (original)
+++ cfe/trunk/test/Analysis/Stats/stats.c (removed)
@@ -1,8 +0,0 @@
-// RUN: %clang_cc1 -analyze -analyzer-checker=core -analyzer-stats %s 2>&1 | FileCheck %s
-
-void foo() {
-  int x;
-}
-// CHECK: ... Statistics Collected ...
-// CHECK:100 AnalysisConsumer - The % of reachable basic blocks.
-// CHECK:The # of times RemoveDeadBindings is called

Copied: cfe/trunk/test/Analysis/objc-method-coverage.m (from r176810, cfe/trunk/test/Analysis/Stats/objc-method-coverage.m)
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/objc-method-coverage.m?p2=cfe/trunk/test/Analysis/objc-method-coverage.m&p1=cfe/trunk/test/Analysis/Stats/objc-method-coverage.m&r1=176810&r2=176815&rev=176815&view=diff
==============================================================================
--- cfe/trunk/test/Analysis/Stats/objc-method-coverage.m (original)
+++ cfe/trunk/test/Analysis/objc-method-coverage.m Mon Mar 11 12:48:03 2013
@@ -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 @@ int f() {
 
 // 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.

Propchange: cfe/trunk/test/Analysis/objc-method-coverage.m
------------------------------------------------------------------------------
    svn:eol-style = LF

Copied: cfe/trunk/test/Analysis/stats.c (from r176810, cfe/trunk/test/Analysis/Stats/stats.c)
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/stats.c?p2=cfe/trunk/test/Analysis/stats.c&p1=cfe/trunk/test/Analysis/Stats/stats.c&r1=176810&r2=176815&rev=176815&view=diff
==============================================================================
--- cfe/trunk/test/Analysis/Stats/stats.c (original)
+++ cfe/trunk/test/Analysis/stats.c Mon Mar 11 12:48:03 2013
@@ -1,3 +1,4 @@
+// REQUIRES: asserts
 // RUN: %clang_cc1 -analyze -analyzer-checker=core -analyzer-stats %s 2>&1 | FileCheck %s
 
 void foo() {

Propchange: cfe/trunk/test/Analysis/stats.c
------------------------------------------------------------------------------
    svn:eol-style = LF