From 9457a800f1fea4db4bb595c77de277609913b1b3 Mon Sep 17 00:00:00 2001 From: Ted Kremenek Date: Tue, 17 Feb 2009 23:32:18 +0000 Subject: [PATCH] Update several tests to explicitly use BasicConstraintManager as well as to use RangeConstraintManager with RegionStoreManager. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@64854 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/Analysis/CFNumber.c | 7 ++++--- test/Analysis/CFRetainRelease_NSAssertionHandler.m | 2 +- test/Analysis/CGColorSpace.c | 5 +++-- test/Analysis/CheckNSError.m | 4 ++-- test/Analysis/NSPanel.m | 5 +++-- test/Analysis/NSString.m | 5 +++-- test/Analysis/NSWindow.m | 5 +++-- test/Analysis/NoReturn.m | 8 +++++--- test/Analysis/ObjCProperties.m | 9 ++++++--- test/Analysis/array-struct.c | 8 +++++--- test/Analysis/cfref_PR2519.c | 6 ++++-- test/Analysis/cfref_rdar6080742.c | 6 ++++-- test/Analysis/complex.c | 8 +++++--- test/Analysis/dead-stores.c | 9 ++++++--- 14 files changed, 54 insertions(+), 33 deletions(-) diff --git a/test/Analysis/CFNumber.c b/test/Analysis/CFNumber.c index cfef84983b..40b6a91af7 100644 --- a/test/Analysis/CFNumber.c +++ b/test/Analysis/CFNumber.c @@ -1,6 +1,7 @@ -// RUN: clang -analyze -checker-cfref -analyzer-store=basic -verify -triple x86_64-apple-darwin9 %s && -// RUN: clang -analyze -checker-cfref -analyzer-store=basic -verify -triple x86_64-apple-darwin9 -analyzer-constraints=range %s && -// RUN: clang -analyze -checker-cfref -analyzer-store=region -verify -triple x86_64-apple-darwin9 %s +// RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=basic -verify -triple x86_64-apple-darwin9 %s && +// RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=range -verify -triple x86_64-apple-darwin9 %s && +// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=basic -verify -triple x86_64-apple-darwin9 %s && +// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=range -verify -triple x86_64-apple-darwin9 %s typedef signed long CFIndex; typedef const struct __CFAllocator * CFAllocatorRef; diff --git a/test/Analysis/CFRetainRelease_NSAssertionHandler.m b/test/Analysis/CFRetainRelease_NSAssertionHandler.m index a4c16bda9a..eda63bab2c 100644 --- a/test/Analysis/CFRetainRelease_NSAssertionHandler.m +++ b/test/Analysis/CFRetainRelease_NSAssertionHandler.m @@ -1,4 +1,4 @@ -// RUN: clang -analyze -checker-cfref -verify %s && +// RUN: clang -analyze -checker-cfref -verify %s -analyzer-constraints=basic && // RUN: clang -analyze -checker-cfref -verify %s -analyzer-constraints=range typedef struct objc_selector *SEL; diff --git a/test/Analysis/CGColorSpace.c b/test/Analysis/CGColorSpace.c index 807c6b83f2..eecd1d5b3c 100644 --- a/test/Analysis/CGColorSpace.c +++ b/test/Analysis/CGColorSpace.c @@ -1,5 +1,6 @@ -// RUN: clang -analyze -checker-cfref -analyzer-store=basic -verify %s && -// RUN: clang -analyze -checker-cfref -analyzer-store=region -verify %s && +// RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=basic verify %s && +// RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=range verify %s && +// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=basic -verify %s && // RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=range -verify %s typedef struct CGColorSpace *CGColorSpaceRef; diff --git a/test/Analysis/CheckNSError.m b/test/Analysis/CheckNSError.m index ac6ab673c3..10f79e8c2f 100644 --- a/test/Analysis/CheckNSError.m +++ b/test/Analysis/CheckNSError.m @@ -1,5 +1,5 @@ -// RUN: clang -analyze -checker-cfref -analyzer-store=basic -verify %s && -// RUN: clang -analyze -checker-cfref -analyzer-store=region -verify %s && +// RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=basic -verify %s && +// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=basic -verify %s && // RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=range -verify %s && // RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=range -verify %s diff --git a/test/Analysis/NSPanel.m b/test/Analysis/NSPanel.m index 2ceabc0c1d..b7ecfef87d 100644 --- a/test/Analysis/NSPanel.m +++ b/test/Analysis/NSPanel.m @@ -1,6 +1,7 @@ -// RUN: clang -analyze -checker-cfref -analyzer-store=basic -verify %s && +// RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=basic -verify %s && // RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=range -verify %s && -// RUN: clang -analyze -checker-cfref -analyzer-store=region -verify %s +// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=basic -verify %s && +// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=range -verify %s // BEGIN delta-debugging reduced header stuff diff --git a/test/Analysis/NSString.m b/test/Analysis/NSString.m index 5a515a345c..29e332402e 100644 --- a/test/Analysis/NSString.m +++ b/test/Analysis/NSString.m @@ -1,6 +1,7 @@ -// RUN: clang -analyze -checker-cfref -analyzer-store=basic -verify %s && +// RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=basic -verify %s && // RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=range -verify %s && -// RUN: clang -analyze -checker-cfref -analyzer-store=region -verify %s +// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=basic -verify %s && +// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=range -verify %s //===----------------------------------------------------------------------===// // The following code is reduced using delta-debugging from diff --git a/test/Analysis/NSWindow.m b/test/Analysis/NSWindow.m index ef8bff5c8d..93ab871e16 100644 --- a/test/Analysis/NSWindow.m +++ b/test/Analysis/NSWindow.m @@ -1,6 +1,7 @@ -// RUN: clang -analyze -checker-cfref -warn-dead-stores -analyzer-store=basic -verify %s && +// RUN: clang -analyze -checker-cfref -warn-dead-stores -analyzer-store=basic -analyzer-constraints=basic -verify %s && // RUN: clang -analyze -checker-cfref -warn-dead-stores -analyzer-store=basic -analyzer-constraints=range -verify %s && -// RUN: clang -analyze -checker-cfref -warn-dead-stores -analyzer-store=region -verify %s +// RUN: clang -analyze -checker-cfref -warn-dead-stores -analyzer-store=region -analyzer-constraints=basic -verify %s && +// RUN: clang -analyze -checker-cfref -warn-dead-stores -analyzer-store=region -analyzer-constraints=range -verify %s // These declarations were reduced using Delta-Debugging from Foundation.h // on Mac OS X. The test cases are below. diff --git a/test/Analysis/NoReturn.m b/test/Analysis/NoReturn.m index 1ab60bd380..9a0e48403f 100644 --- a/test/Analysis/NoReturn.m +++ b/test/Analysis/NoReturn.m @@ -1,7 +1,9 @@ -// RUN: clang -analyze -checker-simple -analyzer-store=basic -verify %s && -// RUN: clang -analyze -checker-cfref -analyzer-store=basic -verify %s && +// RUN: clang -analyze -checker-simple -analyzer-store=basic -analyzer-constraints=basic -verify %s && +// RUN: clang -analyze -checker-simple -analyzer-store=basic -analyzer-constraints=range -verify %s && +// RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=basic -verify %s && // RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=range -verify %s && -// RUN: clang -analyze -checker-cfref -analyzer-store=region -verify %s +// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=basic -verify %s && +// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=range -verify %s #include diff --git a/test/Analysis/ObjCProperties.m b/test/Analysis/ObjCProperties.m index c2c3b66dd7..adee5e2e58 100644 --- a/test/Analysis/ObjCProperties.m +++ b/test/Analysis/ObjCProperties.m @@ -1,6 +1,9 @@ -// RUN: clang -analyze -checker-simple %s -verify && -// RUN: clang -analyze -checker-cfref -analyzer-store=basic %s -verify && -// RUN: clang -analyze -checker-cfref -analyzer-store=region %s -verify +// RUN: clang -analyze -checker-simple -analyzer-store=basic -analyzer-constraints=basic %s -verify && +// RUN: clang -analyze -checker-simple -analyzer-store=basic -analyzer-constraints=range %s -verify && +// RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=basic %s -verify && +// RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=range %s -verify && +// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=basic %s -verify && +// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=range %s -verify // The point of this test cases is to exercise properties in the static // analyzer diff --git a/test/Analysis/array-struct.c b/test/Analysis/array-struct.c index 0d25ef721d..bf615c3fc8 100644 --- a/test/Analysis/array-struct.c +++ b/test/Analysis/array-struct.c @@ -1,6 +1,8 @@ -// RUN: clang -analyze -checker-simple -analyzer-store=basic -verify %s && -// RUN: clang -analyze -checker-cfref -analyzer-store=basic -verify %s && -// RUN: clang -analyze -checker-cfref -analyzer-store=region -verify %s +// RUN: clang -analyze -checker-simple -analyzer-store=basic -analyzer-constraints=basic -verify %s && +// RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=basic -verify %s && +// RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=range -verify %s && +// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=basic -verify %s && +// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=range -verify %s struct s { int data; diff --git a/test/Analysis/cfref_PR2519.c b/test/Analysis/cfref_PR2519.c index 0e25c12a75..a37af6d64f 100644 --- a/test/Analysis/cfref_PR2519.c +++ b/test/Analysis/cfref_PR2519.c @@ -1,5 +1,7 @@ -// RUN: clang -analyze -checker-cfref --analyzer-store=basic -verify %s && -// RUN: clang -analyze -checker-cfref --analyzer-store=region -verify %s +// RUN: clang -analyze -checker-cfref --analyzer-store=basic -analyzer-constraints=basic -verify %s && +// RUN: clang -analyze -checker-cfref --analyzer-store=basic -analyzer-constraints=range -verify %s && +// RUN: clang -analyze -checker-cfref --analyzer-store=region -analyzer-constraints=basic -verify %s && +// RUN: clang -analyze -checker-cfref --analyzer-store=region -analyzer-constraints=range -verify %s typedef unsigned char Boolean; typedef signed long CFIndex; diff --git a/test/Analysis/cfref_rdar6080742.c b/test/Analysis/cfref_rdar6080742.c index 0912a7a103..c088ec426f 100644 --- a/test/Analysis/cfref_rdar6080742.c +++ b/test/Analysis/cfref_rdar6080742.c @@ -1,5 +1,7 @@ -// RUN: clang -analyze -checker-cfref -analyzer-store=basic -verify %s && -// RUN: clang -analyze -checker-cfref -analyzer-store=region -verify %s +// RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=basic -verify %s && +// RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=range -verify %s && +// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=basic -verify %s && +// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=range -verify %s // This test case was reported in . // It tests path-sensitivity with respect to '!(cfstring != 0)' (negation of inequality). diff --git a/test/Analysis/complex.c b/test/Analysis/complex.c index f2ade5aa1c..eed3ed44f3 100644 --- a/test/Analysis/complex.c +++ b/test/Analysis/complex.c @@ -1,6 +1,8 @@ -// RUN: clang -analyze -checker-simple -verify %s && -// RUN: clang -analyze -checker-cfref -analyzer-store=basic -verify %s && -// RUN: clang -analyze -checker-cfref -analyzer-store=region -verify %s +// RUN: clang -analyze -checker-simple -analyzer-store=basic -analyzer-constraints=basic -verify %s && +// RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=basic -verify %s && +// RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=range -verify %s && +// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=basic -verify %s && +// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=range -verify %s #include diff --git a/test/Analysis/dead-stores.c b/test/Analysis/dead-stores.c index 2d07a8057b..8e44717299 100644 --- a/test/Analysis/dead-stores.c +++ b/test/Analysis/dead-stores.c @@ -1,7 +1,10 @@ // RUN: clang -analyze -warn-dead-stores -verify %s && -// RUN: clang -analyze -checker-simple -warn-dead-stores -verify %s && -// RUN: clang -analyze -warn-dead-stores -checker-simple -verify %s - +// RUN: clang -analyze -checker-simple -analyzer-store=basic -analyzer-constraints=basic -warn-dead-stores -verify %s && +// RUN: clang -analyze -checker-simple -analyzer-store=basic -analyzer-constraints=range -warn-dead-stores -verify %s && +// RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=basic -warn-dead-stores -verify %s && +// RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=range -warn-dead-stores -verify %s && +// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=basic -warn-dead-stores -verify %s && +// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=range -warn-dead-stores -verify %s void f1() { int k, y; -- 2.40.0