aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChandler Carruth <chandlerc@gmail.com>2012-09-12 01:11:10 +0000
committerChandler Carruth <chandlerc@gmail.com>2012-09-12 01:11:10 +0000
commit1b22cec353bc6112653d50b060a1d78d70c51527 (patch)
tree1a0c099b7fb00d343e7b88945261821d22858675
parent93040b75251f3d8e27ff06bf3d0437cc8e0be1b4 (diff)
Adjust some analyzer tests to place widely shared inputs inside of an
'Inputs' subdirectory. The general desire has been to have essentially all of the non-test input files live in such directories, with some exceptions for obvious and common patterns like 'foo.c' using 'foo.h'. This came up because our distributed test runner couldn't find some of the headers, for example with stl.cpp. No functionality changed, just shuffling around here. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@163674 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--test/Analysis/Inputs/system-header-simulator-cxx.h (renamed from test/Analysis/system-header-simulator-cxx.h)0
-rw-r--r--test/Analysis/Inputs/system-header-simulator-objc.h (renamed from test/Analysis/system-header-simulator-objc.h)0
-rw-r--r--test/Analysis/Inputs/system-header-simulator.h (renamed from test/Analysis/system-header-simulator.h)0
-rw-r--r--test/Analysis/coverage.c2
-rw-r--r--test/Analysis/global-region-invalidation.c2
-rw-r--r--test/Analysis/inlining/stl.cpp2
-rw-r--r--test/Analysis/malloc-interprocedural.c2
-rw-r--r--test/Analysis/malloc.c2
-rw-r--r--test/Analysis/malloc.m2
-rw-r--r--test/Analysis/malloc.mm4
10 files changed, 8 insertions, 8 deletions
diff --git a/test/Analysis/system-header-simulator-cxx.h b/test/Analysis/Inputs/system-header-simulator-cxx.h
index e762d0a1bd..e762d0a1bd 100644
--- a/test/Analysis/system-header-simulator-cxx.h
+++ b/test/Analysis/Inputs/system-header-simulator-cxx.h
diff --git a/test/Analysis/system-header-simulator-objc.h b/test/Analysis/Inputs/system-header-simulator-objc.h
index a647b37404..a647b37404 100644
--- a/test/Analysis/system-header-simulator-objc.h
+++ b/test/Analysis/Inputs/system-header-simulator-objc.h
diff --git a/test/Analysis/system-header-simulator.h b/test/Analysis/Inputs/system-header-simulator.h
index 5790fb9cff..5790fb9cff 100644
--- a/test/Analysis/system-header-simulator.h
+++ b/test/Analysis/Inputs/system-header-simulator.h
diff --git a/test/Analysis/coverage.c b/test/Analysis/coverage.c
index 811691391e..66f0a5e385 100644
--- a/test/Analysis/coverage.c
+++ b/test/Analysis/coverage.c
@@ -1,5 +1,5 @@
// RUN: %clang_cc1 -analyze -analyzer-checker=core,unix.Malloc -analyzer-store=region -analyzer-max-loop 4 -verify %s
-#include "system-header-simulator.h"
+#include "Inputs/system-header-simulator.h"
typedef __typeof(sizeof(int)) size_t;
void *malloc(size_t);
diff --git a/test/Analysis/global-region-invalidation.c b/test/Analysis/global-region-invalidation.c
index ee6b55c796..2d64b49a8b 100644
--- a/test/Analysis/global-region-invalidation.c
+++ b/test/Analysis/global-region-invalidation.c
@@ -3,7 +3,7 @@
void clang_analyzer_eval(int);
// Note, we do need to include headers here, since the analyzer checks if the function declaration is located in a system header.
-#include "system-header-simulator.h"
+#include "Inputs/system-header-simulator.h"
// Test that system header does not invalidate the internal global.
int size_rdar9373039 = 1;
diff --git a/test/Analysis/inlining/stl.cpp b/test/Analysis/inlining/stl.cpp
index 56670a0f16..cec782151c 100644
--- a/test/Analysis/inlining/stl.cpp
+++ b/test/Analysis/inlining/stl.cpp
@@ -1,7 +1,7 @@
// RUN: %clang_cc1 -analyze -analyzer-checker=core,unix.Malloc,debug.ExprInspection -analyzer-ipa=dynamic -analyzer-config c++-stdlib-inlining=false -verify %s
// RUN: %clang_cc1 -analyze -analyzer-checker=core,unix.Malloc,debug.ExprInspection -analyzer-ipa=dynamic -analyzer-config c++-stdlib-inlining=true -DINLINE=1 -verify %s
-#include "../system-header-simulator-cxx.h"
+#include "../Inputs/system-header-simulator-cxx.h"
void clang_analyzer_eval(bool);
diff --git a/test/Analysis/malloc-interprocedural.c b/test/Analysis/malloc-interprocedural.c
index c804219eb4..0ab3a71558 100644
--- a/test/Analysis/malloc-interprocedural.c
+++ b/test/Analysis/malloc-interprocedural.c
@@ -1,6 +1,6 @@
// RUN: %clang_cc1 -analyze -analyzer-checker=unix.Malloc -analyzer-inline-max-stack-depth=5 -analyzer-inline-max-function-size=6 -verify %s
-#include "system-header-simulator.h"
+#include "Inputs/system-header-simulator.h"
typedef __typeof(sizeof(int)) size_t;
void *malloc(size_t);
diff --git a/test/Analysis/malloc.c b/test/Analysis/malloc.c
index fe99fa10d6..52a79243ce 100644
--- a/test/Analysis/malloc.c
+++ b/test/Analysis/malloc.c
@@ -1,5 +1,5 @@
// RUN: %clang_cc1 -analyze -analyzer-checker=core,alpha.deadcode.UnreachableCode,alpha.core.CastSize,unix.Malloc,debug.ExprInspection -analyzer-store=region -verify %s
-#include "system-header-simulator.h"
+#include "Inputs/system-header-simulator.h"
void clang_analyzer_eval(int);
diff --git a/test/Analysis/malloc.m b/test/Analysis/malloc.m
index 08206f3bf1..21d2dafa38 100644
--- a/test/Analysis/malloc.m
+++ b/test/Analysis/malloc.m
@@ -1,5 +1,5 @@
// RUN: %clang_cc1 -analyze -analyzer-checker=core,unix.Malloc -analyzer-store=region -verify -Wno-objc-root-class -fblocks %s
-#include "system-header-simulator-objc.h"
+#include "Inputs/system-header-simulator-objc.h"
@class NSString;
typedef __typeof(sizeof(int)) size_t;
diff --git a/test/Analysis/malloc.mm b/test/Analysis/malloc.mm
index 7a9d881b15..b5a1aeb12b 100644
--- a/test/Analysis/malloc.mm
+++ b/test/Analysis/malloc.mm
@@ -1,5 +1,5 @@
// RUN: %clang_cc1 -analyze -analyzer-checker=core,unix.Malloc -analyzer-store=region -verify -fblocks %s
-#include "system-header-simulator-objc.h"
+#include "Inputs/system-header-simulator-objc.h"
typedef __typeof(sizeof(int)) size_t;
void *malloc(size_t);
@@ -221,4 +221,4 @@ void foo(NSPointerArray* pointerArray) {
void noCrashOnVariableArgumentSelector() {
NSMutableString *myString = [NSMutableString stringWithString:@"some text"];
[myString appendFormat:@"some text = %d", 3];
-} \ No newline at end of file
+}