r180637 - [analyzer] Consolidate BoolAssignmentChecker tests by using two RUN lines.

[Jordan Rose]

Author: jrose
Date: Fri Apr 26 16:42:47 2013
New Revision: 180637

URL: http://llvm.org/viewvc/llvm-project?rev=180637&view=rev
Log:
[analyzer] Consolidate BoolAssignmentChecker tests by using two RUN lines.

Added:
    cfe/trunk/test/Analysis/bool-assignment.c
      - copied, changed from r180629, cfe/trunk/test/Analysis/bool-assignment.cpp
Removed:
    cfe/trunk/test/Analysis/bool-assignment.cpp
    cfe/trunk/test/Analysis/bool-assignment2.c

Copied: cfe/trunk/test/Analysis/bool-assignment.c (from r180629, cfe/trunk/test/Analysis/bool-assignment.cpp)
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/bool-assignment.c?p2=cfe/trunk/test/Analysis/bool-assignment.c&p1=cfe/trunk/test/Analysis/bool-assignment.cpp&r1=180629&r2=180637&rev=180637&view=diff
==============================================================================
--- cfe/trunk/test/Analysis/bool-assignment.cpp (original)
+++ cfe/trunk/test/Analysis/bool-assignment.c Fri Apr 26 16:42:47 2013
@@ -1,8 +1,9 @@
-// RUN: %clang_cc1 -analyze -analyzer-checker=core,alpha.core.BoolAssignment -analyzer-store=region -verify %s
+// RUN: %clang_cc1 -analyze -analyzer-checker=core,alpha.core.BoolAssignment -analyzer-store=region -verify -std=c99 -Dbool=_Bool %s
+// RUN: %clang_cc1 -analyze -analyzer-checker=core,alpha.core.BoolAssignment -analyzer-store=region -verify -x c++ %s
 
-// Test C++'s bool
+// Test C++'s bool and C's _Bool
 
-void test_cppbool_initialization(int y) {
+void test_stdbool_initialization(int y) {
   if (y < 0) {
     bool x = y; // expected-warning {{Assignment of a non-Boolean value}}
     return;
@@ -14,7 +15,7 @@ void test_cppbool_initialization(int y)
   bool x = y; // no-warning
 }
 
-void test_cppbool_assignment(int y) {
+void test_stdbool_assignment(int y) {
   bool x = 0; // no-warning
   if (y < 0) {
     x = y; // expected-warning {{Assignment of a non-Boolean value}}

Removed: cfe/trunk/test/Analysis/bool-assignment.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/bool-assignment.cpp?rev=180636&view=auto
==============================================================================
--- cfe/trunk/test/Analysis/bool-assignment.cpp (original)
+++ cfe/trunk/test/Analysis/bool-assignment.cpp (removed)
@@ -1,87 +0,0 @@
-// RUN: %clang_cc1 -analyze -analyzer-checker=core,alpha.core.BoolAssignment -analyzer-store=region -verify %s
-
-// Test C++'s bool
-
-void test_cppbool_initialization(int y) {
-  if (y < 0) {
-    bool x = y; // expected-warning {{Assignment of a non-Boolean value}}
-    return;
-  }
-  if (y > 1) {
-    bool x = y; // expected-warning {{Assignment of a non-Boolean value}}
-    return;
-  }
-  bool x = y; // no-warning
-}
-
-void test_cppbool_assignment(int y) {
-  bool x = 0; // no-warning
-  if (y < 0) {
-    x = y; // expected-warning {{Assignment of a non-Boolean value}}
-    return;
-  }
-  if (y > 1) {
-    x = y; // expected-warning {{Assignment of a non-Boolean value}}
-    return;
-  }
-  x = y; // no-warning
-}
-
-// Test Objective-C's BOOL
-
-typedef signed char BOOL;
-
-void test_BOOL_initialization(int y) {
-  if (y < 0) {
-    BOOL x = y; // expected-warning {{Assignment of a non-Boolean value}}
-    return;
-  }
-  if (y > 1) {
-    BOOL x = y; // expected-warning {{Assignment of a non-Boolean value}}
-    return;
-  }
-  BOOL x = y; // no-warning
-}
-
-void test_BOOL_assignment(int y) {
-  BOOL x = 0; // no-warning
-  if (y < 0) {
-    x = y; // expected-warning {{Assignment of a non-Boolean value}}
-    return;
-  }
-  if (y > 1) {
-    x = y; // expected-warning {{Assignment of a non-Boolean value}}
-    return;
-  }
-  x = y; // no-warning
-}
-
-
-// Test MacTypes.h's Boolean
-
-typedef unsigned char Boolean;
-
-void test_Boolean_initialization(int y) {
-  if (y < 0) {
-    Boolean x = y; // expected-warning {{Assignment of a non-Boolean value}}
-    return;
-  }
-  if (y > 1) {
-    Boolean x = y; // expected-warning {{Assignment of a non-Boolean value}}
-    return;
-  }
-  Boolean x = y; // no-warning
-}
-
-void test_Boolean_assignment(int y) {
-  Boolean x = 0; // no-warning
-  if (y < 0) {
-    x = y; // expected-warning {{Assignment of a non-Boolean value}}
-    return;
-  }
-  if (y > 1) {
-    x = y; // expected-warning {{Assignment of a non-Boolean value}}
-    return;
-  }
-  x = y; // no-warning
-}

Removed: cfe/trunk/test/Analysis/bool-assignment2.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/bool-assignment2.c?rev=180636&view=auto
==============================================================================
--- cfe/trunk/test/Analysis/bool-assignment2.c (original)
+++ cfe/trunk/test/Analysis/bool-assignment2.c (removed)
@@ -1,35 +0,0 @@
-// RUN: %clang_cc1 -std=c99 -analyze -analyzer-checker=core,alpha.core.BoolAssignment -analyzer-store=region -verify %s
-
-// Test stdbool.h's _Bool
-
-// Prior to C99, stdbool.h uses this typedef, but even in ANSI C mode, _Bool
-// appears to be defined.
-
-// #if __STDC_VERSION__ < 199901L
-// typedef int _Bool;
-// #endif
-
-void test_stdbool_initialization(int y) {
-  if (y < 0) {
-    _Bool x = y; // expected-warning {{Assignment of a non-Boolean value}}
-    return;
-  }
-  if (y > 1) {
-    _Bool x = y; // expected-warning {{Assignment of a non-Boolean value}}
-    return;
-  }
-  _Bool x = y; // no-warning
-}
-
-void test_stdbool_assignment(int y) {
-  _Bool x = 0; // no-warning
-  if (y < 0) {
-    x = y; // expected-warning {{Assignment of a non-Boolean value}}
-    return;
-  }
-  if (y > 1) {
-    x = y; // expected-warning {{Assignment of a non-Boolean value}}
-    return;
-  }
-  x = y; // no-warning
-}