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

diff --git a/test/Analysis/system-header-simulator-cxx.h b/test/Analysis/Inputs/system-header-simulator-cxx.h
similarity index 100%
rename from test/Analysis/system-header-simulator-cxx.h
rename to 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
similarity index 100%
rename from test/Analysis/system-header-simulator-objc.h
rename to 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
similarity index 100%
rename from test/Analysis/system-header-simulator.h
rename to test/Analysis/Inputs/system-header-simulator.h

diff --git a/test/Analysis/coverage.c b/test/Analysis/coverage.c
index 811691391eb1b4e2a53fd3bff071b2234c7b9a3f..66f0a5e385b9b9ed1f2fa1201a83a63410bf62cb 100644 (file)
--- 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 ee6b55c796032a67c9914db48a0b0c048c539a59..2d64b49a8baff68592acf6c68f2b050a11d1efea 100644 (file)
--- 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 56670a0f16d2a717145a0a7b20c27b6a0f900c5c..cec782151c959d8f825c49d42158b06c2aa71e08 100644 (file)
--- 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 c804219eb4dfeabe6471506c9be1d839c0e37ad1..0ab3a715585837b0a63344f2dcf51fd629a83a75 100644 (file)
--- 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 fe99fa10d685de3e99b432c8d8652b20eb8b6902..52a79243ce4e3e1ccd2aef57eed9dd0bbd62ad7f 100644 (file)
--- 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 08206f3bf14ccfc9022702953d9c5c35693483bc..21d2dafa38b6ef9316483dd00c3aeb1c2d86f9fd 100644 (file)
--- 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 7a9d881b151811c420ae424081769097056a6c72..b5a1aeb12b8953405421f99565d59e92c3112d48 100644 (file)
--- 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
+}