Move test inputs into Inputs directory.

We don't need a new ExpectedOutputs/ convention. Expected outputs are
just another form of test input.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@339634 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/Analysis/ExpectedOutputs/plists/NewDelete-path-notes.cpp.plist b/test/Analysis/Inputs/expected-plists/NewDelete-path-notes.cpp.plist
similarity index 100%
rename from test/Analysis/ExpectedOutputs/plists/NewDelete-path-notes.cpp.plist
rename to test/Analysis/Inputs/expected-plists/NewDelete-path-notes.cpp.plist

diff --git a/test/Analysis/ExpectedOutputs/plists/conditional-path-notes.c.plist b/test/Analysis/Inputs/expected-plists/conditional-path-notes.c.plist
similarity index 100%
rename from test/Analysis/ExpectedOutputs/plists/conditional-path-notes.c.plist
rename to test/Analysis/Inputs/expected-plists/conditional-path-notes.c.plist

diff --git a/test/Analysis/ExpectedOutputs/plists/cstring-plist.c.plist b/test/Analysis/Inputs/expected-plists/cstring-plist.c.plist
similarity index 100%
rename from test/Analysis/ExpectedOutputs/plists/cstring-plist.c.plist
rename to test/Analysis/Inputs/expected-plists/cstring-plist.c.plist

diff --git a/test/Analysis/ExpectedOutputs/plists/cxx-for-range.cpp.plist b/test/Analysis/Inputs/expected-plists/cxx-for-range.cpp.plist
similarity index 100%
rename from test/Analysis/ExpectedOutputs/plists/cxx-for-range.cpp.plist
rename to test/Analysis/Inputs/expected-plists/cxx-for-range.cpp.plist

diff --git a/test/Analysis/ExpectedOutputs/plists/edges-new.mm.plist b/test/Analysis/Inputs/expected-plists/edges-new.mm.plist
similarity index 100%
rename from test/Analysis/ExpectedOutputs/plists/edges-new.mm.plist
rename to test/Analysis/Inputs/expected-plists/edges-new.mm.plist

diff --git a/test/Analysis/ExpectedOutputs/plists/generics.m.plist b/test/Analysis/Inputs/expected-plists/generics.m.plist
similarity index 100%
rename from test/Analysis/ExpectedOutputs/plists/generics.m.plist
rename to test/Analysis/Inputs/expected-plists/generics.m.plist

diff --git a/test/Analysis/ExpectedOutputs/plists/inline-plist.c.plist b/test/Analysis/Inputs/expected-plists/inline-plist.c.plist
similarity index 100%
rename from test/Analysis/ExpectedOutputs/plists/inline-plist.c.plist
rename to test/Analysis/Inputs/expected-plists/inline-plist.c.plist

diff --git a/test/Analysis/ExpectedOutputs/plists/inline-unique-reports.c.plist b/test/Analysis/Inputs/expected-plists/inline-unique-reports.c.plist
similarity index 100%
rename from test/Analysis/ExpectedOutputs/plists/inline-unique-reports.c.plist
rename to test/Analysis/Inputs/expected-plists/inline-unique-reports.c.plist

diff --git a/test/Analysis/ExpectedOutputs/plists/method-call-path-notes.cpp.plist b/test/Analysis/Inputs/expected-plists/method-call-path-notes.cpp.plist
similarity index 100%
rename from test/Analysis/ExpectedOutputs/plists/method-call-path-notes.cpp.plist
rename to test/Analysis/Inputs/expected-plists/method-call-path-notes.cpp.plist

diff --git a/test/Analysis/ExpectedOutputs/plists/model-file.cpp.plist b/test/Analysis/Inputs/expected-plists/model-file.cpp.plist
similarity index 100%
rename from test/Analysis/ExpectedOutputs/plists/model-file.cpp.plist
rename to test/Analysis/Inputs/expected-plists/model-file.cpp.plist

diff --git a/test/Analysis/ExpectedOutputs/plists/null-deref-path-notes.m.plist b/test/Analysis/Inputs/expected-plists/null-deref-path-notes.m.plist
similarity index 100%
rename from test/Analysis/ExpectedOutputs/plists/null-deref-path-notes.m.plist
rename to test/Analysis/Inputs/expected-plists/null-deref-path-notes.m.plist

diff --git a/test/Analysis/ExpectedOutputs/plists/nullability-notes.m.plist b/test/Analysis/Inputs/expected-plists/nullability-notes.m.plist
similarity index 100%
rename from test/Analysis/ExpectedOutputs/plists/nullability-notes.m.plist
rename to test/Analysis/Inputs/expected-plists/nullability-notes.m.plist

diff --git a/test/Analysis/ExpectedOutputs/plists/objc-arc.m.plist b/test/Analysis/Inputs/expected-plists/objc-arc.m.plist
similarity index 100%
rename from test/Analysis/ExpectedOutputs/plists/objc-arc.m.plist
rename to test/Analysis/Inputs/expected-plists/objc-arc.m.plist

diff --git a/test/Analysis/ExpectedOutputs/plists/objc-radar17039661.m.plist b/test/Analysis/Inputs/expected-plists/objc-radar17039661.m.plist
similarity index 100%
rename from test/Analysis/ExpectedOutputs/plists/objc-radar17039661.m.plist
rename to test/Analysis/Inputs/expected-plists/objc-radar17039661.m.plist

diff --git a/test/Analysis/ExpectedOutputs/plists/plist-macros.cpp.plist b/test/Analysis/Inputs/expected-plists/plist-macros.cpp.plist
similarity index 100%
rename from test/Analysis/ExpectedOutputs/plists/plist-macros.cpp.plist
rename to test/Analysis/Inputs/expected-plists/plist-macros.cpp.plist

diff --git a/test/Analysis/ExpectedOutputs/plists/plist-output-alternate.m.plist b/test/Analysis/Inputs/expected-plists/plist-output-alternate.m.plist
similarity index 100%
rename from test/Analysis/ExpectedOutputs/plists/plist-output-alternate.m.plist
rename to test/Analysis/Inputs/expected-plists/plist-output-alternate.m.plist

diff --git a/test/Analysis/ExpectedOutputs/plists/plist-output.m.plist b/test/Analysis/Inputs/expected-plists/plist-output.m.plist
similarity index 100%
rename from test/Analysis/ExpectedOutputs/plists/plist-output.m.plist
rename to test/Analysis/Inputs/expected-plists/plist-output.m.plist

diff --git a/test/Analysis/ExpectedOutputs/plists/plist-stats-output.c.plist b/test/Analysis/Inputs/expected-plists/plist-stats-output.c.plist
similarity index 100%
rename from test/Analysis/ExpectedOutputs/plists/plist-stats-output.c.plist
rename to test/Analysis/Inputs/expected-plists/plist-stats-output.c.plist

diff --git a/test/Analysis/ExpectedOutputs/plists/retain-release-path-notes-gc.m.plist b/test/Analysis/Inputs/expected-plists/retain-release-path-notes-gc.m.plist
similarity index 100%
rename from test/Analysis/ExpectedOutputs/plists/retain-release-path-notes-gc.m.plist
rename to test/Analysis/Inputs/expected-plists/retain-release-path-notes-gc.m.plist

diff --git a/test/Analysis/ExpectedOutputs/plists/retain-release-path-notes.m.plist b/test/Analysis/Inputs/expected-plists/retain-release-path-notes.m.plist
similarity index 100%
rename from test/Analysis/ExpectedOutputs/plists/retain-release-path-notes.m.plist
rename to test/Analysis/Inputs/expected-plists/retain-release-path-notes.m.plist

diff --git a/test/Analysis/ExpectedOutputs/plists/unix-fns.c.plist b/test/Analysis/Inputs/expected-plists/unix-fns.c.plist
similarity index 100%
rename from test/Analysis/ExpectedOutputs/plists/unix-fns.c.plist
rename to test/Analysis/Inputs/expected-plists/unix-fns.c.plist

diff --git a/test/Analysis/ExpectedOutputs/plists/yaccignore.c.plist b/test/Analysis/Inputs/expected-plists/yaccignore.c.plist
similarity index 100%
rename from test/Analysis/ExpectedOutputs/plists/yaccignore.c.plist
rename to test/Analysis/Inputs/expected-plists/yaccignore.c.plist

diff --git a/test/Analysis/NewDelete-path-notes.cpp b/test/Analysis/NewDelete-path-notes.cpp
index 24332da0c6e4d2fa867b579f8c2c184052a8e408..a74602fb3c8a57f0b1b41f66ef0279f150540266 100644 (file)
--- a/test/Analysis/NewDelete-path-notes.cpp
+++ b/test/Analysis/NewDelete-path-notes.cpp
@@ -1,7 +1,7 @@
 // RUN: %clang_analyze_cc1 -analyzer-checker=cplusplus.NewDelete,unix.Malloc -analyzer-output=text -verify %s
 // RUN: %clang_analyze_cc1 -analyzer-checker=cplusplus.NewDelete,unix.Malloc -analyzer-output=text -analyzer-config c++-allocator-inlining=true -verify %s
 // RUN: %clang_analyze_cc1 -analyzer-checker=cplusplus.NewDelete,unix.Malloc -analyzer-output=plist %s -o %t.plist
-// RUN: tail -n +11 %t.plist | diff -u -w - %S/ExpectedOutputs/plists/NewDelete-path-notes.cpp.plist
+// RUN: tail -n +11 %t.plist | diff -u -w - %S/Inputs/expected-plists/NewDelete-path-notes.cpp.plist
 
 void test() {
   int *p = new int;

diff --git a/test/Analysis/conditional-path-notes.c b/test/Analysis/conditional-path-notes.c
index 6a95fcb9910331cdc95836efe47e621be3d3ffaf..c0903a45f9ae15c604d477374b419d2fcf9bfcbd 100644 (file)
--- a/test/Analysis/conditional-path-notes.c
+++ b/test/Analysis/conditional-path-notes.c
@@ -1,6 +1,6 @@
 // RUN: %clang_analyze_cc1 %s -analyzer-checker=core.NullDereference -analyzer-output=text -verify
 // RUN: %clang_analyze_cc1 %s -analyzer-checker=core.NullDereference -analyzer-output=plist -o %t
-// RUN: tail -n +11 %t | diff -u -w - %S/ExpectedOutputs/plists/conditional-path-notes.c.plist
+// RUN: tail -n +11 %t | diff -u -w - %S/Inputs/expected-plists/conditional-path-notes.c.plist
 
 void testCondOp(int *p) {
   int *x = p ? p : p;

diff --git a/test/Analysis/ExpectedOutputs/plists/copypaste/plist-diagnostics-notes-as-events.cpp.plist b/test/Analysis/copypaste/Inputs/expected-plists/plist-diagnostics-notes-as-events.cpp.plist
similarity index 100%
rename from test/Analysis/ExpectedOutputs/plists/copypaste/plist-diagnostics-notes-as-events.cpp.plist
rename to test/Analysis/copypaste/Inputs/expected-plists/plist-diagnostics-notes-as-events.cpp.plist

diff --git a/test/Analysis/ExpectedOutputs/plists/copypaste/plist-diagnostics.cpp.plist b/test/Analysis/copypaste/Inputs/expected-plists/plist-diagnostics.cpp.plist
similarity index 100%
rename from test/Analysis/ExpectedOutputs/plists/copypaste/plist-diagnostics.cpp.plist
rename to test/Analysis/copypaste/Inputs/expected-plists/plist-diagnostics.cpp.plist

diff --git a/test/Analysis/copypaste/plist-diagnostics-notes-as-events.cpp b/test/Analysis/copypaste/plist-diagnostics-notes-as-events.cpp
index f72842856d6ea5e9f20d0e651160bdf60e186afb..79949f70c85447f895fe34f07d04f3b27f9d663d 100644 (file)
--- a/test/Analysis/copypaste/plist-diagnostics-notes-as-events.cpp
+++ b/test/Analysis/copypaste/plist-diagnostics-notes-as-events.cpp
@@ -1,5 +1,5 @@
 // RUN: %clang_analyze_cc1 -analyzer-output=plist -analyzer-config notes-as-events=true -o %t.plist -std=c++11 -analyzer-checker=alpha.clone.CloneChecker -analyzer-config alpha.clone.CloneChecker:MinimumCloneComplexity=10 -verify %s
-// RUN: tail -n +11 %t.plist | diff -u -w - %S/../ExpectedOutputs/plists/copypaste/plist-diagnostics-notes-as-events.cpp.plist
+// RUN: tail -n +11 %t.plist | diff -u -w - %S/Inputs/expected-plists/plist-diagnostics-notes-as-events.cpp.plist
 
 void log();
 

diff --git a/test/Analysis/copypaste/plist-diagnostics.cpp b/test/Analysis/copypaste/plist-diagnostics.cpp
index 765a0b261bb276be7b4c6a6f6941c03a8aa35f0b..2a773b0f0eb4b1bdd05164c1fd64c26ea247fc3a 100644 (file)
--- a/test/Analysis/copypaste/plist-diagnostics.cpp
+++ b/test/Analysis/copypaste/plist-diagnostics.cpp
@@ -1,5 +1,5 @@
 // RUN: %clang_analyze_cc1 -analyzer-output=plist -o %t.plist -std=c++11 -analyzer-checker=alpha.clone.CloneChecker -analyzer-config alpha.clone.CloneChecker:MinimumCloneComplexity=10 -verify %s
-// RUN: tail -n +11 %t.plist | diff -u -w - %S/../ExpectedOutputs/plists/copypaste/plist-diagnostics.cpp.plist
+// RUN: tail -n +11 %t.plist | diff -u -w - %S/Inputs/expected-plists/plist-diagnostics.cpp.plist
 
 void log();
 

diff --git a/test/Analysis/cxx-for-range.cpp b/test/Analysis/cxx-for-range.cpp
index 8a7280b539fa5b0e6e8a1f68972dd0af1e2d80a7..89e53e4fd8b87bddb08986ae2c6e70f7d146e8c5 100644 (file)
--- a/test/Analysis/cxx-for-range.cpp
+++ b/test/Analysis/cxx-for-range.cpp
@@ -1,5 +1,5 @@
 // RUN: %clang_analyze_cc1 -std=c++11 -analyzer-checker=core -analyzer-output=plist-multi-file -o %t.plist -verify %s
-// RUN: tail -n +11 %t.plist | diff -u -w - %S/ExpectedOutputs/plists/cxx-for-range.cpp.plist
+// RUN: tail -n +11 %t.plist | diff -u -w - %S/Inputs/expected-plists/cxx-for-range.cpp.plist
 
 extern void work();
 

diff --git a/test/Analysis/ExpectedOutputs/plists/diagnostics/deref-track-symbolic-region.c.plist b/test/Analysis/diagnostics/Inputs/expected-plists/deref-track-symbolic-region.c.plist
similarity index 100%
rename from test/Analysis/ExpectedOutputs/plists/diagnostics/deref-track-symbolic-region.c.plist
rename to test/Analysis/diagnostics/Inputs/expected-plists/deref-track-symbolic-region.c.plist

diff --git a/test/Analysis/ExpectedOutputs/plists/diagnostics/undef-value-caller.c.plist b/test/Analysis/diagnostics/Inputs/expected-plists/undef-value-caller.c.plist
similarity index 100%
rename from test/Analysis/ExpectedOutputs/plists/diagnostics/undef-value-caller.c.plist
rename to test/Analysis/diagnostics/Inputs/expected-plists/undef-value-caller.c.plist

diff --git a/test/Analysis/ExpectedOutputs/plists/diagnostics/undef-value-param.c.plist b/test/Analysis/diagnostics/Inputs/expected-plists/undef-value-param.c.plist
similarity index 100%
rename from test/Analysis/ExpectedOutputs/plists/diagnostics/undef-value-param.c.plist
rename to test/Analysis/diagnostics/Inputs/expected-plists/undef-value-param.c.plist

diff --git a/test/Analysis/ExpectedOutputs/plists/diagnostics/undef-value-param.m.plist b/test/Analysis/diagnostics/Inputs/expected-plists/undef-value-param.m.plist
similarity index 100%
rename from test/Analysis/ExpectedOutputs/plists/diagnostics/undef-value-param.m.plist
rename to test/Analysis/diagnostics/Inputs/expected-plists/undef-value-param.m.plist

diff --git a/test/Analysis/diagnostics/deref-track-symbolic-region.c b/test/Analysis/diagnostics/deref-track-symbolic-region.c
index 1278ea283335ed39e33ab3ecaa974406865c5a3c..101eac20b5d58793dfba13518b6f08d548362e6f 100644 (file)
--- a/test/Analysis/diagnostics/deref-track-symbolic-region.c
+++ b/test/Analysis/diagnostics/deref-track-symbolic-region.c
@@ -1,6 +1,6 @@
 // RUN: %clang_analyze_cc1 -analyzer-checker=core -analyzer-output=text -verify %s
 // RUN: %clang_analyze_cc1 -analyzer-checker=core -analyzer-output=plist-multi-file  %s -o %t.plist
-// RUN: tail -n +11 %t.plist | diff -u -w - %S/../ExpectedOutputs/plists/diagnostics/deref-track-symbolic-region.c.plist
+// RUN: tail -n +11 %t.plist | diff -u -w - %S/Inputs/expected-plists/deref-track-symbolic-region.c.plist
 
 struct S {
   int *x;

diff --git a/test/Analysis/diagnostics/undef-value-caller.c b/test/Analysis/diagnostics/undef-value-caller.c
index ac2af35ab719763a8d462ecac916ecd91dc0e192..a624a04b8e7af87affac5528f0c320597b548e1e 100644 (file)
--- a/test/Analysis/diagnostics/undef-value-caller.c
+++ b/test/Analysis/diagnostics/undef-value-caller.c
@@ -1,5 +1,5 @@
 // RUN: %clang_analyze_cc1 -analyzer-checker=core -analyzer-output=plist -o %t %s
-// RUN: tail -n +11 %t | diff -u -w - %S/../ExpectedOutputs/plists/diagnostics/undef-value-caller.c.plist
+// RUN: tail -n +11 %t | diff -u -w - %S/Inputs/expected-plists/undef-value-caller.c.plist
 
 #include "undef-value-callee.h"
 

diff --git a/test/Analysis/diagnostics/undef-value-param.c b/test/Analysis/diagnostics/undef-value-param.c
index 6bbbc399944c564a15f2c58778aeb92d9b454099..860217461f683a9924ceb2b42d4f8c465faecb7f 100644 (file)
--- a/test/Analysis/diagnostics/undef-value-param.c
+++ b/test/Analysis/diagnostics/undef-value-param.c
@@ -1,6 +1,6 @@
 // RUN: %clang_analyze_cc1 -analyzer-checker=core -analyzer-output=text -verify %s
 // RUN: %clang_analyze_cc1 -analyzer-checker=core -analyzer-output=plist-multi-file  %s -o %t.plist
-// RUN: tail -n +11 %t.plist | diff -u -w - %S/../ExpectedOutputs/plists/diagnostics/undef-value-param.c.plist
+// RUN: tail -n +11 %t.plist | diff -u -w - %S/Inputs/expected-plists/undef-value-param.c.plist
 
 void foo_irrelevant(int c) {
     if (c)

diff --git a/test/Analysis/diagnostics/undef-value-param.m b/test/Analysis/diagnostics/undef-value-param.m
index 724fb925667cbc4c5128983573bbc79686b6eed0..c4d539d61c08b4cde4787743d264516ba458ba84 100644 (file)
--- a/test/Analysis/diagnostics/undef-value-param.m
+++ b/test/Analysis/diagnostics/undef-value-param.m
@@ -1,6 +1,6 @@
 // RUN: %clang_analyze_cc1 -analyzer-checker=core,osx -analyzer-output=text -verify %s
 // RUN: %clang_analyze_cc1 -analyzer-checker=core,osx -analyzer-output=plist-multi-file %s -o %t.plist
-// RUN: tail -n +11 %t.plist | diff -u -w - %S/../ExpectedOutputs/plists/diagnostics/undef-value-param.m.plist
+// RUN: tail -n +11 %t.plist | diff -u -w - %S/Inputs/expected-plists/undef-value-param.m.plist
 
 typedef signed char BOOL;
 @protocol NSObject  - (BOOL)isEqual:(id)object; @end

diff --git a/test/Analysis/edges-new.mm b/test/Analysis/edges-new.mm
index 37c21a8804089bc61fcb0378b9f01ffe886f1f73..3823abec29d97dc2ddf70bbd6ee51744ee6d00c1 100644 (file)
--- a/test/Analysis/edges-new.mm
+++ b/test/Analysis/edges-new.mm
@@ -1,5 +1,5 @@
 // RUN: %clang_analyze_cc1 -triple x86_64-apple-darwin10 -analyzer-checker=core,deadcode.DeadStores,osx.cocoa.RetainCount,unix.Malloc,unix.MismatchedDeallocator -analyzer-eagerly-assume -analyzer-output=plist -o %t -w %s
-// RUN: tail -n +11 %t | diff -u -w - %S/ExpectedOutputs/plists/edges-new.mm.plist
+// RUN: tail -n +11 %t | diff -u -w - %S/Inputs/expected-plists/edges-new.mm.plist
 
 //===----------------------------------------------------------------------===//
 // Forward declarations (from headers).

diff --git a/test/Analysis/generics.m b/test/Analysis/generics.m
index d0edb2164fff4dbbe6607ba0d4ce2c3a422a67d2..0b896107a2130dcb348eb42328657d0264644ece 100644 (file)
--- a/test/Analysis/generics.m
+++ b/test/Analysis/generics.m
@@ -1,6 +1,6 @@
 // RUN: %clang_analyze_cc1 -analyzer-checker=core,osx.cocoa.ObjCGenerics,alpha.core.DynamicTypeChecker -verify -Wno-objc-method-access %s
 // RUN: %clang_analyze_cc1 -analyzer-checker=core,osx.cocoa.ObjCGenerics,alpha.core.DynamicTypeChecker -verify -Wno-objc-method-access %s -analyzer-output=plist -o %t.plist
-// RUN: tail -n +11 %t.plist | diff -u -w - %S/ExpectedOutputs/plists/generics.m.plist
+// RUN: tail -n +11 %t.plist | diff -u -w - %S/Inputs/expected-plists/generics.m.plist
 
 #if !__has_feature(objc_generics)
 #  error Compiler does not support Objective-C generics?

diff --git a/test/Analysis/inline-plist.c b/test/Analysis/inline-plist.c
index 57ca812a4d85cd0ec55b0c84c8802da5786d783e..50490b279b0e9e613eba21e3ec7d09a76a2a4ba0 100644 (file)
--- a/test/Analysis/inline-plist.c
+++ b/test/Analysis/inline-plist.c
@@ -1,6 +1,6 @@
 // RUN: %clang_analyze_cc1 %s -analyzer-checker=core.NullDereference,core.DivideZero -fblocks -analyzer-output=text -analyzer-config suppress-null-return-paths=false -verify %s
 // RUN: %clang_analyze_cc1 %s -analyzer-checker=core.NullDereference,core.DivideZero -fblocks -analyzer-output=plist -analyzer-config suppress-null-return-paths=false -o %t
-// RUN: tail -n +11 %t | diff -u -w - %S/ExpectedOutputs/plists/inline-plist.c.plist
+// RUN: tail -n +11 %t | diff -u -w - %S/Inputs/expected-plists/inline-plist.c.plist
 
 // <rdar://problem/10967815>
 void mmm(int y) {

diff --git a/test/Analysis/inline-unique-reports.c b/test/Analysis/inline-unique-reports.c
index 5545d2d4ac67e0f7010912168eb6b7684d3b2597..e86899259511834bfbf7e0a1042a6ee395a1aa16 100644 (file)
--- a/test/Analysis/inline-unique-reports.c
+++ b/test/Analysis/inline-unique-reports.c
@@ -1,5 +1,5 @@
 // RUN: %clang_analyze_cc1 %s -analyzer-checker=core.NullDereference -analyzer-output=plist -o %t > /dev/null 2>&1
-// RUN: tail -n +11 %t | diff -u -w - %S/ExpectedOutputs/plists/inline-unique-reports.c.plist
+// RUN: tail -n +11 %t | diff -u -w - %S/Inputs/expected-plists/inline-unique-reports.c.plist
 
 static inline bug(int *p) {
   *p = 0xDEADBEEF;

diff --git a/test/Analysis/ExpectedOutputs/plists/inlining/eager-reclamation-path-notes.c.plist b/test/Analysis/inlining/Inputs/expected-plists/eager-reclamation-path-notes.c.plist
similarity index 100%
rename from test/Analysis/ExpectedOutputs/plists/inlining/eager-reclamation-path-notes.c.plist
rename to test/Analysis/inlining/Inputs/expected-plists/eager-reclamation-path-notes.c.plist

diff --git a/test/Analysis/ExpectedOutputs/plists/inlining/eager-reclamation-path-notes.cpp.plist b/test/Analysis/inlining/Inputs/expected-plists/eager-reclamation-path-notes.cpp.plist
similarity index 100%
rename from test/Analysis/ExpectedOutputs/plists/inlining/eager-reclamation-path-notes.cpp.plist
rename to test/Analysis/inlining/Inputs/expected-plists/eager-reclamation-path-notes.cpp.plist

diff --git a/test/Analysis/ExpectedOutputs/plists/inlining/path-notes.c.plist b/test/Analysis/inlining/Inputs/expected-plists/path-notes.c.plist
similarity index 100%
rename from test/Analysis/ExpectedOutputs/plists/inlining/path-notes.c.plist
rename to test/Analysis/inlining/Inputs/expected-plists/path-notes.c.plist

diff --git a/test/Analysis/ExpectedOutputs/plists/inlining/path-notes.cpp.plist b/test/Analysis/inlining/Inputs/expected-plists/path-notes.cpp.plist
similarity index 100%
rename from test/Analysis/ExpectedOutputs/plists/inlining/path-notes.cpp.plist
rename to test/Analysis/inlining/Inputs/expected-plists/path-notes.cpp.plist

diff --git a/test/Analysis/ExpectedOutputs/plists/inlining/path-notes.m.plist b/test/Analysis/inlining/Inputs/expected-plists/path-notes.m.plist
similarity index 100%
rename from test/Analysis/ExpectedOutputs/plists/inlining/path-notes.m.plist
rename to test/Analysis/inlining/Inputs/expected-plists/path-notes.m.plist

diff --git a/test/Analysis/inlining/eager-reclamation-path-notes.c b/test/Analysis/inlining/eager-reclamation-path-notes.c
index 136dd5b91f3aa02961990d631866d7b24c5caf7a..3c8435124cc52d9151641609848bcc74c4179437 100644 (file)
--- a/test/Analysis/inlining/eager-reclamation-path-notes.c
+++ b/test/Analysis/inlining/eager-reclamation-path-notes.c
@@ -1,6 +1,6 @@
 // RUN: %clang_analyze_cc1 -analyzer-checker=core -analyzer-output=text -analyzer-config graph-trim-interval=5 -verify %s
 // RUN: %clang_analyze_cc1 -analyzer-checker=core -analyzer-output=plist-multi-file -analyzer-config graph-trim-interval=5 %s -o %t.plist
-// RUN: tail -n +11 %t.plist | diff -u -w - %S/../ExpectedOutputs/plists/inlining/eager-reclamation-path-notes.c.plist
+// RUN: tail -n +11 %t.plist | diff -u -w - %S/Inputs/expected-plists/eager-reclamation-path-notes.c.plist
 
 void use(int *ptr, int val) {
   *ptr = val; // expected-warning {{Dereference of null pointer (loaded from variable 'ptr')}}

diff --git a/test/Analysis/inlining/eager-reclamation-path-notes.cpp b/test/Analysis/inlining/eager-reclamation-path-notes.cpp
index 9a3a54d1bbaefdd55b59ade60a6e248dcc78914c..5761e969eef7ddf91724640bc251497a25251da2 100644 (file)
--- a/test/Analysis/inlining/eager-reclamation-path-notes.cpp
+++ b/test/Analysis/inlining/eager-reclamation-path-notes.cpp
@@ -1,6 +1,6 @@
 // RUN: %clang_analyze_cc1 -analyzer-checker=core -analyzer-output=text -analyzer-config graph-trim-interval=5 -analyzer-config suppress-null-return-paths=false -verify %s
 // RUN: %clang_analyze_cc1 -analyzer-checker=core -analyzer-output=plist-multi-file -analyzer-config graph-trim-interval=5 -analyzer-config suppress-null-return-paths=false %s -o %t.plist
-// RUN: tail -n +11 %t.plist | diff -u -w - %S/../ExpectedOutputs/plists/inlining/eager-reclamation-path-notes.cpp.plist
+// RUN: tail -n +11 %t.plist | diff -u -w - %S/Inputs/expected-plists/eager-reclamation-path-notes.cpp.plist
 
 typedef struct {
   int getValue();

diff --git a/test/Analysis/inlining/path-notes.c b/test/Analysis/inlining/path-notes.c
index 68d2f7531109545be296b17e312f0aece023f04f..ddf321fc5761efaec5f9684f26eb0809d82a698f 100644 (file)
--- a/test/Analysis/inlining/path-notes.c
+++ b/test/Analysis/inlining/path-notes.c
@@ -1,6 +1,6 @@
 // RUN: %clang_analyze_cc1 -analyzer-checker=core -analyzer-output=text -analyzer-config suppress-null-return-paths=false -verify %s
 // RUN: %clang_analyze_cc1 -analyzer-checker=core -analyzer-output=plist-multi-file -analyzer-config suppress-null-return-paths=false %s -o %t.plist
-// RUN: tail -n +11 %t.plist | diff -u -w - %S/../ExpectedOutputs/plists/inlining/path-notes.c.plist
+// RUN: tail -n +11 %t.plist | diff -u -w - %S/Inputs/expected-plists/path-notes.c.plist
 
 void zero(int **p) {
   *p = 0;

diff --git a/test/Analysis/inlining/path-notes.cpp b/test/Analysis/inlining/path-notes.cpp
index 2203ba853ef17050323afccfff8220e0a6a3839d..afa07c7c694f0f0fb45fe080efd0161be076bcb4 100644 (file)
--- a/test/Analysis/inlining/path-notes.cpp
+++ b/test/Analysis/inlining/path-notes.cpp
@@ -1,6 +1,6 @@
 // RUN: %clang_analyze_cc1 -analyzer-checker=core -analyzer-output=text -analyzer-config c++-inlining=destructors -std=c++11 -verify -Wno-tautological-undefined-compare %s
 // RUN: %clang_analyze_cc1 -analyzer-checker=core -analyzer-output=plist-multi-file -analyzer-config c++-inlining=destructors -std=c++11 %s -o %t.plist -Wno-tautological-undefined-compare
-// RUN: tail -n +11 %t.plist | diff -u -w - %S/../ExpectedOutputs/plists/inlining/path-notes.cpp.plist
+// RUN: tail -n +11 %t.plist | diff -u -w - %S/Inputs/expected-plists/path-notes.cpp.plist
 
 class Foo {
 public:

diff --git a/test/Analysis/inlining/path-notes.m b/test/Analysis/inlining/path-notes.m
index 8114fdd24ec5e00d792707b66dcde73aa5da70aa..3968b8ed84a56406049d182349a541142a4f087d 100644 (file)
--- a/test/Analysis/inlining/path-notes.m
+++ b/test/Analysis/inlining/path-notes.m
@@ -1,6 +1,6 @@
 // RUN: %clang_analyze_cc1 -analyzer-checker=core,osx.cocoa.NilArg,osx.cocoa.RetainCount -analyzer-output=text -analyzer-config suppress-null-return-paths=false -fblocks -verify %s
 // RUN: %clang_analyze_cc1 -analyzer-checker=core,osx.cocoa.NilArg,osx.cocoa.RetainCount -analyzer-output=plist-multi-file -analyzer-config suppress-null-return-paths=false -fblocks %s -o %t.plist
-// RUN: tail -n +11 %t.plist | diff -u -w - %S/../ExpectedOutputs/plists/inlining/path-notes.m.plist
+// RUN: tail -n +11 %t.plist | diff -u -w - %S/Inputs/expected-plists/path-notes.m.plist
 
 typedef struct dispatch_queue_s *dispatch_queue_t;
 typedef void (^dispatch_block_t)(void);

diff --git a/test/Analysis/method-call-path-notes.cpp b/test/Analysis/method-call-path-notes.cpp
index 914a24d49d0c88b852c74430d569aaf7a2d5f189..f7f9d26900d83122c29dff06400d167cd23334b4 100644 (file)
--- a/test/Analysis/method-call-path-notes.cpp
+++ b/test/Analysis/method-call-path-notes.cpp
@@ -1,6 +1,6 @@
 // RUN: %clang_analyze_cc1 -analyzer-checker=core -analyzer-output=text -verify %s
 // RUN: %clang_analyze_cc1 -analyzer-checker=core -analyzer-output=plist-multi-file  %s -o %t.plist
-// RUN: tail -n +11 %t.plist | diff -u -w - %S/ExpectedOutputs/plists/method-call-path-notes.cpp.plist
+// RUN: tail -n +11 %t.plist | diff -u -w - %S/Inputs/expected-plists/method-call-path-notes.cpp.plist
 
 // Test warning about null or uninitialized pointer values used as instance member
 // calls.

diff --git a/test/Analysis/model-file.cpp b/test/Analysis/model-file.cpp
index 573b9358c2024cdd4ba9052c58f740ea3bf94f99..d5afacaa7d89d6f8c0eb8f1125c1221ff01ddb35 100644 (file)
--- a/test/Analysis/model-file.cpp
+++ b/test/Analysis/model-file.cpp
@@ -1,5 +1,5 @@
 // RUN: %clang_analyze_cc1 -analyzer-checker=core -analyzer-config faux-bodies=true,model-path=%S/Inputs/Models -analyzer-output=plist-multi-file -verify %s -o %t
-// RUN: tail -n +11 %t | diff -u -w - %S/ExpectedOutputs/plists/model-file.cpp.plist
+// RUN: tail -n +11 %t | diff -u -w - %S/Inputs/expected-plists/model-file.cpp.plist
 
 typedef int* intptr;
 

diff --git a/test/Analysis/null-deref-path-notes.m b/test/Analysis/null-deref-path-notes.m
index 54f56c9d86e56cc80d0ed8fface5cfbd83897471..95708951dc4e7219e60b624a16ef096c129f5a8a 100644 (file)
--- a/test/Analysis/null-deref-path-notes.m
+++ b/test/Analysis/null-deref-path-notes.m
@@ -1,6 +1,6 @@
 // RUN: %clang_analyze_cc1 -analyzer-checker=core -analyzer-store=region -analyzer-output=text -fblocks -verify -Wno-objc-root-class %s
 // RUN: %clang_analyze_cc1 -analyzer-checker=core -analyzer-store=region -analyzer-output=plist-multi-file -fblocks -Wno-objc-root-class %s -o %t
-// RUN: tail -n +11 %t | diff -u -w - %S/ExpectedOutputs/plists/null-deref-path-notes.m.plist
+// RUN: tail -n +11 %t | diff -u -w - %S/Inputs/expected-plists/null-deref-path-notes.m.plist
 
 @interface Root {
 @public

diff --git a/test/Analysis/nullability-notes.m b/test/Analysis/nullability-notes.m
index 32009ea54ea2a872d45351df2a9168f52da00bec..5fd657474a91ab1804989f3540553668e7068c24 100644 (file)
--- a/test/Analysis/nullability-notes.m
+++ b/test/Analysis/nullability-notes.m
@@ -1,6 +1,6 @@
 // RUN: %clang_analyze_cc1 -fblocks -analyzer-checker=core,nullability.NullPassedToNonnull,nullability.NullReturnedFromNonnull,nullability.NullablePassedToNonnull,nullability.NullableReturnedFromNonnull,nullability.NullableDereferenced -analyzer-output=text -verify %s
 // RUN: %clang_analyze_cc1 -fblocks -analyzer-checker=core,nullability.NullPassedToNonnull,nullability.NullReturnedFromNonnull,nullability.NullablePassedToNonnull,nullability.NullableReturnedFromNonnull,nullability.NullableDereferenced -analyzer-output=plist -o %t.plist %s
-// RUN: tail -n +11 %t.plist | diff -u -w - %S/ExpectedOutputs/plists/nullability-notes.m.plist
+// RUN: tail -n +11 %t.plist | diff -u -w - %S/Inputs/expected-plists/nullability-notes.m.plist
 
 #include "Inputs/system-header-simulator-for-nullability.h"
 

diff --git a/test/Analysis/objc-arc.m b/test/Analysis/objc-arc.m
index aaa2529f0283eb8eb53046a67a33a555a6d4afa0..f2a4c5cfe3de1a4d520e3695e1343555b4b42845 100644 (file)
--- a/test/Analysis/objc-arc.m
+++ b/test/Analysis/objc-arc.m
@@ -1,5 +1,5 @@
 // RUN: %clang_analyze_cc1 -triple x86_64-apple-darwin10 -analyzer-checker=core,osx.cocoa.RetainCount,deadcode -verify -fblocks -analyzer-opt-analyze-nested-blocks -fobjc-arc -analyzer-output=plist-multi-file -o %t.plist %s
-// RUN: tail -n +11 %t.plist | diff -u -w - %S/ExpectedOutputs/plists/objc-arc.m.plist
+// RUN: tail -n +11 %t.plist | diff -u -w - %S/Inputs/expected-plists/objc-arc.m.plist
 
 typedef signed char BOOL;
 typedef struct _NSZone NSZone;

diff --git a/test/Analysis/plist-macros.cpp b/test/Analysis/plist-macros.cpp
index 43d06679d2e88b8175c4cf8f4f3f6fa0d5d2afcd..a8a8b0dd6d5694283ed98328aefb3ddbaacd41ed 100644 (file)
--- a/test/Analysis/plist-macros.cpp
+++ b/test/Analysis/plist-macros.cpp
@@ -1,6 +1,6 @@
 // RUN: %clang_analyze_cc1 -analyzer-checker=core,unix -analyzer-eagerly-assume -verify %s
 // RUN: %clang_analyze_cc1 -analyzer-checker=core,unix -analyzer-eagerly-assume -analyzer-output=plist-multi-file %s -o %t.plist
-// RUN: tail -n +11 %t.plist | diff -u -w - %S/ExpectedOutputs/plists/plist-macros.cpp.plist
+// RUN: tail -n +11 %t.plist | diff -u -w - %S/Inputs/expected-plists/plist-macros.cpp.plist
 
 
 typedef __typeof(sizeof(int)) size_t;

diff --git a/test/Analysis/plist-output-alternate.m b/test/Analysis/plist-output-alternate.m
index b8cc00e116729980503b7a266449a71d141f2499..094b84e1d0b1903775c2beb6f18fcdeb054572fd 100644 (file)
--- a/test/Analysis/plist-output-alternate.m
+++ b/test/Analysis/plist-output-alternate.m
@@ -1,5 +1,5 @@
 // RUN: %clang_analyze_cc1 -analyzer-checker=core,osx.cocoa.RetainCount,alpha.core -fblocks -analyzer-output=plist -o %t %s
-// RUN: tail -n +11 %t | diff -u -w - %S/ExpectedOutputs/plists/plist-output-alternate.m.plist
+// RUN: tail -n +11 %t | diff -u -w - %S/Inputs/expected-plists/plist-output-alternate.m.plist
 
 void test_null_init(void) {
   int *p = 0;

diff --git a/test/Analysis/plist-output.m b/test/Analysis/plist-output.m
index facdabd917c9cadde18087b1159cdd484ee7d3eb..de40518d150d63c7fbb716f167d954bebd396571 100644 (file)
--- a/test/Analysis/plist-output.m
+++ b/test/Analysis/plist-output.m
@@ -1,5 +1,5 @@
 // RUN: %clang_analyze_cc1 %s -analyzer-checker=osx.cocoa.RetainCount,deadcode.DeadStores,core -analyzer-output=plist -o %t.plist
-// RUN: tail -n +11 %t.plist | diff -u -w - %S/ExpectedOutputs/plists/plist-output.m.plist
+// RUN: tail -n +11 %t.plist | diff -u -w - %S/Inputs/expected-plists/plist-output.m.plist
 
 void test_null_init(void) {
   int *p = 0;

diff --git a/test/Analysis/retain-release-path-notes-gc.m b/test/Analysis/retain-release-path-notes-gc.m
index f501e25a28bec2f4d69f5cc0b86be613f0d232a1..74137b40e7b71c630dc4ca6cb6eb781b7a379112 100644 (file)
--- a/test/Analysis/retain-release-path-notes-gc.m
+++ b/test/Analysis/retain-release-path-notes-gc.m
@@ -1,6 +1,6 @@
 // RUN: %clang_analyze_cc1 -triple x86_64-apple-darwin10 -analyzer-checker=core,osx.coreFoundation.CFRetainRelease,osx.cocoa.ClassRelease,osx.cocoa.RetainCount -analyzer-store=region -fobjc-gc-only -analyzer-output=text -verify %s
 // RUN: %clang_analyze_cc1 -triple x86_64-apple-darwin10 -analyzer-checker=core,osx.coreFoundation.CFRetainRelease,osx.cocoa.ClassRelease,osx.cocoa.RetainCount -analyzer-store=region -fobjc-gc-only -analyzer-output=plist-multi-file %s -o %t.plist
-// RUN: tail -n +11 %t.plist | diff -u -w - %S/ExpectedOutputs/plists/retain-release-path-notes-gc.m.plist
+// RUN: tail -n +11 %t.plist | diff -u -w - %S/Inputs/expected-plists/retain-release-path-notes-gc.m.plist
 
 /***
 This file is for testing the path-sensitive notes for retain/release errors.

diff --git a/test/Analysis/retain-release-path-notes.m b/test/Analysis/retain-release-path-notes.m
index aaeac8be94916fd114ac4f4a1e12d89cf68a41c9..27cb5165735a96beb58aa803775a6bc176eb3d19 100644 (file)
--- a/test/Analysis/retain-release-path-notes.m
+++ b/test/Analysis/retain-release-path-notes.m
@@ -1,6 +1,6 @@
 // RUN: %clang_analyze_cc1 -triple x86_64-apple-darwin10 -analyzer-checker=core,osx.coreFoundation.CFRetainRelease,osx.cocoa.ClassRelease,osx.cocoa.RetainCount -analyzer-store=region -analyzer-output=text -verify %s
 // RUN: %clang_analyze_cc1 -triple x86_64-apple-darwin10 -analyzer-checker=core,osx.coreFoundation.CFRetainRelease,osx.cocoa.ClassRelease,osx.cocoa.RetainCount -analyzer-store=region -analyzer-output=plist-multi-file %s -o %t
-// RUN: tail -n +11 %t | diff -u -w - %S/ExpectedOutputs/plists/retain-release-path-notes.m.plist
+// RUN: tail -n +11 %t | diff -u -w - %S/Inputs/expected-plists/retain-release-path-notes.m.plist
 
 /***
 This file is for testing the path-sensitive notes for retain/release errors.