Author: george.karpenkov Date: Thu Jan 10 10:15:44 2019 New Revision: 350866
URL: http://llvm.org/viewvc/llvm-project?rev=350866&view=rev Log: [analyzer] [NFC] Reverse the argument order for "diff" in tests The current argument order has "expected" and "actual" the wrong way around, so that the diff shows the change from expected to actual, not from actual to expected. Namely, if the expected diagnostics contains the string "foo", but the analyzer emits "bar", we really want to see: ``` - foo + bar ``` not ``` - bar + foo ``` since adapting to most changes would require applying that diff to the expected output. Differential Revision: https://reviews.llvm.org/D56340 Modified: cfe/trunk/test/Analysis/NewDelete-path-notes.cpp cfe/trunk/test/Analysis/conditional-path-notes.c cfe/trunk/test/Analysis/copypaste/plist-diagnostics-notes-as-events.cpp cfe/trunk/test/Analysis/copypaste/plist-diagnostics.cpp cfe/trunk/test/Analysis/cxx-for-range.cpp cfe/trunk/test/Analysis/diagnostics/Inputs/expected-sarif/sarif-diagnostics-taint-test.c.sarif cfe/trunk/test/Analysis/diagnostics/Inputs/expected-sarif/sarif-multi-diagnostic-test.c.sarif cfe/trunk/test/Analysis/diagnostics/deref-track-symbolic-region.c cfe/trunk/test/Analysis/diagnostics/report-issues-within-main-file.cpp cfe/trunk/test/Analysis/diagnostics/sarif-diagnostics-taint-test.c cfe/trunk/test/Analysis/diagnostics/sarif-multi-diagnostic-test.c cfe/trunk/test/Analysis/diagnostics/undef-value-caller.c cfe/trunk/test/Analysis/diagnostics/undef-value-param.c cfe/trunk/test/Analysis/diagnostics/undef-value-param.m cfe/trunk/test/Analysis/edges-new.mm cfe/trunk/test/Analysis/generics.m cfe/trunk/test/Analysis/inline-plist.c cfe/trunk/test/Analysis/inline-unique-reports.c cfe/trunk/test/Analysis/inlining/eager-reclamation-path-notes.c cfe/trunk/test/Analysis/inlining/eager-reclamation-path-notes.cpp cfe/trunk/test/Analysis/inlining/path-notes.c cfe/trunk/test/Analysis/inlining/path-notes.cpp cfe/trunk/test/Analysis/inlining/path-notes.m cfe/trunk/test/Analysis/lit.local.cfg cfe/trunk/test/Analysis/method-call-path-notes.cpp cfe/trunk/test/Analysis/model-file.cpp cfe/trunk/test/Analysis/null-deref-path-notes.m cfe/trunk/test/Analysis/nullability-notes.m cfe/trunk/test/Analysis/objc-arc.m cfe/trunk/test/Analysis/plist-macros-with-expansion.cpp cfe/trunk/test/Analysis/plist-macros.cpp cfe/trunk/test/Analysis/plist-output-alternate.m cfe/trunk/test/Analysis/plist-output.m cfe/trunk/test/Analysis/retain-release-path-notes.m cfe/trunk/test/Analysis/unix-fns.c Modified: cfe/trunk/test/Analysis/NewDelete-path-notes.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/NewDelete-path-notes.cpp?rev=350866&r1=350865&r2=350866&view=diff ============================================================================== --- cfe/trunk/test/Analysis/NewDelete-path-notes.cpp (original) +++ cfe/trunk/test/Analysis/NewDelete-path-notes.cpp Thu Jan 10 10:15:44 2019 @@ -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: cat %t.plist | %diff_plist %S/Inputs/expected-plists/NewDelete-path-notes.cpp.plist +// RUN: cat %t.plist | %diff_plist %S/Inputs/expected-plists/NewDelete-path-notes.cpp.plist - void test() { int *p = new int; Modified: cfe/trunk/test/Analysis/conditional-path-notes.c URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/conditional-path-notes.c?rev=350866&r1=350865&r2=350866&view=diff ============================================================================== --- cfe/trunk/test/Analysis/conditional-path-notes.c (original) +++ cfe/trunk/test/Analysis/conditional-path-notes.c Thu Jan 10 10:15:44 2019 @@ -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: cat %t | %diff_plist %S/Inputs/expected-plists/conditional-path-notes.c.plist +// RUN: cat %t | %diff_plist %S/Inputs/expected-plists/conditional-path-notes.c.plist - void testCondOp(int *p) { int *x = p ? p : p; Modified: cfe/trunk/test/Analysis/copypaste/plist-diagnostics-notes-as-events.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/copypaste/plist-diagnostics-notes-as-events.cpp?rev=350866&r1=350865&r2=350866&view=diff ============================================================================== --- cfe/trunk/test/Analysis/copypaste/plist-diagnostics-notes-as-events.cpp (original) +++ cfe/trunk/test/Analysis/copypaste/plist-diagnostics-notes-as-events.cpp Thu Jan 10 10:15:44 2019 @@ -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: cat %t.plist | %diff_plist %S/Inputs/expected-plists/plist-diagnostics-notes-as-events.cpp.plist +// RUN: cat %t.plist | %diff_plist %S/Inputs/expected-plists/plist-diagnostics-notes-as-events.cpp.plist - void log(); Modified: cfe/trunk/test/Analysis/copypaste/plist-diagnostics.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/copypaste/plist-diagnostics.cpp?rev=350866&r1=350865&r2=350866&view=diff ============================================================================== --- cfe/trunk/test/Analysis/copypaste/plist-diagnostics.cpp (original) +++ cfe/trunk/test/Analysis/copypaste/plist-diagnostics.cpp Thu Jan 10 10:15:44 2019 @@ -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: cat %t.plist | %diff_plist %S/Inputs/expected-plists/plist-diagnostics.cpp.plist +// RUN: cat %t.plist | %diff_plist %S/Inputs/expected-plists/plist-diagnostics.cpp.plist - void log(); Modified: cfe/trunk/test/Analysis/cxx-for-range.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/cxx-for-range.cpp?rev=350866&r1=350865&r2=350866&view=diff ============================================================================== --- cfe/trunk/test/Analysis/cxx-for-range.cpp (original) +++ cfe/trunk/test/Analysis/cxx-for-range.cpp Thu Jan 10 10:15:44 2019 @@ -1,5 +1,5 @@ // RUN: %clang_analyze_cc1 -std=c++11 -analyzer-checker=core -analyzer-output=plist-multi-file -o %t.plist -verify -analyzer-config eagerly-assume=false %s -// RUN: cat %t.plist | %diff_plist %S/Inputs/expected-plists/cxx-for-range.cpp.plist +// RUN: cat %t.plist | %diff_plist %S/Inputs/expected-plists/cxx-for-range.cpp.plist - extern void work(); Modified: cfe/trunk/test/Analysis/diagnostics/Inputs/expected-sarif/sarif-diagnostics-taint-test.c.sarif URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/diagnostics/Inputs/expected-sarif/sarif-diagnostics-taint-test.c.sarif?rev=350866&r1=350865&r2=350866&view=diff ============================================================================== --- cfe/trunk/test/Analysis/diagnostics/Inputs/expected-sarif/sarif-diagnostics-taint-test.c.sarif (original) +++ cfe/trunk/test/Analysis/diagnostics/Inputs/expected-sarif/sarif-diagnostics-taint-test.c.sarif Thu Jan 10 10:15:44 2019 @@ -7,7 +7,7 @@ "fileLocation": { "uri": "file:sarif-diagnostics-taint-test.c" }, - "length": 413, + "length": 415, "mimeType": "text/plain", "roles": [ "resultFile" Modified: cfe/trunk/test/Analysis/diagnostics/Inputs/expected-sarif/sarif-multi-diagnostic-test.c.sarif URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/diagnostics/Inputs/expected-sarif/sarif-multi-diagnostic-test.c.sarif?rev=350866&r1=350865&r2=350866&view=diff ============================================================================== --- cfe/trunk/test/Analysis/diagnostics/Inputs/expected-sarif/sarif-multi-diagnostic-test.c.sarif (original) +++ cfe/trunk/test/Analysis/diagnostics/Inputs/expected-sarif/sarif-multi-diagnostic-test.c.sarif Thu Jan 10 10:15:44 2019 @@ -7,7 +7,7 @@ "fileLocation": { "uri": "file:sarif-multi-diagnostic-test.c" }, - "length": 665, + "length": 667, "mimeType": "text/plain", "roles": [ "resultFile" Modified: cfe/trunk/test/Analysis/diagnostics/deref-track-symbolic-region.c URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/diagnostics/deref-track-symbolic-region.c?rev=350866&r1=350865&r2=350866&view=diff ============================================================================== --- cfe/trunk/test/Analysis/diagnostics/deref-track-symbolic-region.c (original) +++ cfe/trunk/test/Analysis/diagnostics/deref-track-symbolic-region.c Thu Jan 10 10:15:44 2019 @@ -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: cat %t.plist | %diff_plist %S/Inputs/expected-plists/deref-track-symbolic-region.c.plist +// RUN: cat %t.plist | %diff_plist %S/Inputs/expected-plists/deref-track-symbolic-region.c.plist - struct S { int *x; Modified: cfe/trunk/test/Analysis/diagnostics/report-issues-within-main-file.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/diagnostics/report-issues-within-main-file.cpp?rev=350866&r1=350865&r2=350866&view=diff ============================================================================== --- cfe/trunk/test/Analysis/diagnostics/report-issues-within-main-file.cpp (original) +++ cfe/trunk/test/Analysis/diagnostics/report-issues-within-main-file.cpp Thu Jan 10 10:15:44 2019 @@ -1,5 +1,5 @@ // RUN: %clang_analyze_cc1 -analyzer-checker=core,unix -analyzer-output=plist-multi-file -analyzer-config report-in-main-source-file=true %s -o %t.plist -// RUN: cat %t.plist | %diff_plist %S/Inputs/expected-plists/report-issues-within-main-file.cpp.plist +// RUN: cat %t.plist | %diff_plist %S/Inputs/expected-plists/report-issues-within-main-file.cpp.plist - #include "Inputs/include/report-issues-within-main-file.h" void mainPlusHeader() { Modified: cfe/trunk/test/Analysis/diagnostics/sarif-diagnostics-taint-test.c URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/diagnostics/sarif-diagnostics-taint-test.c?rev=350866&r1=350865&r2=350866&view=diff ============================================================================== --- cfe/trunk/test/Analysis/diagnostics/sarif-diagnostics-taint-test.c (original) +++ cfe/trunk/test/Analysis/diagnostics/sarif-diagnostics-taint-test.c Thu Jan 10 10:15:44 2019 @@ -1,4 +1,4 @@ -// RUN: %clang_analyze_cc1 -analyzer-checker=alpha.security.taint,debug.TaintTest %s -verify -analyzer-output=sarif -o - | %diff_sarif %S/Inputs/expected-sarif/sarif-diagnostics-taint-test.c.sarif +// RUN: %clang_analyze_cc1 -analyzer-checker=alpha.security.taint,debug.TaintTest %s -verify -analyzer-output=sarif -o - | %diff_sarif %S/Inputs/expected-sarif/sarif-diagnostics-taint-test.c.sarif - #include "../Inputs/system-header-simulator.h" int atoi(const char *nptr); Modified: cfe/trunk/test/Analysis/diagnostics/sarif-multi-diagnostic-test.c URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/diagnostics/sarif-multi-diagnostic-test.c?rev=350866&r1=350865&r2=350866&view=diff ============================================================================== --- cfe/trunk/test/Analysis/diagnostics/sarif-multi-diagnostic-test.c (original) +++ cfe/trunk/test/Analysis/diagnostics/sarif-multi-diagnostic-test.c Thu Jan 10 10:15:44 2019 @@ -1,4 +1,4 @@ -// RUN: %clang_analyze_cc1 -analyzer-checker=core,alpha.security.taint,debug.TaintTest %s -verify -analyzer-output=sarif -o - | %diff_sarif %S/Inputs/expected-sarif/sarif-multi-diagnostic-test.c.sarif +// RUN: %clang_analyze_cc1 -analyzer-checker=core,alpha.security.taint,debug.TaintTest %s -verify -analyzer-output=sarif -o - | %diff_sarif %S/Inputs/expected-sarif/sarif-multi-diagnostic-test.c.sarif - #include "../Inputs/system-header-simulator.h" int atoi(const char *nptr); Modified: cfe/trunk/test/Analysis/diagnostics/undef-value-caller.c URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/diagnostics/undef-value-caller.c?rev=350866&r1=350865&r2=350866&view=diff ============================================================================== --- cfe/trunk/test/Analysis/diagnostics/undef-value-caller.c (original) +++ cfe/trunk/test/Analysis/diagnostics/undef-value-caller.c Thu Jan 10 10:15:44 2019 @@ -1,5 +1,5 @@ // RUN: %clang_analyze_cc1 -analyzer-checker=core -analyzer-output=plist -o %t %s -// RUN: cat %t | %diff_plist %S/Inputs/expected-plists/undef-value-caller.c.plist +// RUN: cat %t | %diff_plist %S/Inputs/expected-plists/undef-value-caller.c.plist - #include "undef-value-callee.h" Modified: cfe/trunk/test/Analysis/diagnostics/undef-value-param.c URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/diagnostics/undef-value-param.c?rev=350866&r1=350865&r2=350866&view=diff ============================================================================== --- cfe/trunk/test/Analysis/diagnostics/undef-value-param.c (original) +++ cfe/trunk/test/Analysis/diagnostics/undef-value-param.c Thu Jan 10 10:15:44 2019 @@ -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: cat %t.plist | %diff_plist %S/Inputs/expected-plists/undef-value-param.c.plist +// RUN: cat %t.plist | %diff_plist %S/Inputs/expected-plists/undef-value-param.c.plist - void foo_irrelevant(int c) { if (c) Modified: cfe/trunk/test/Analysis/diagnostics/undef-value-param.m URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/diagnostics/undef-value-param.m?rev=350866&r1=350865&r2=350866&view=diff ============================================================================== --- cfe/trunk/test/Analysis/diagnostics/undef-value-param.m (original) +++ cfe/trunk/test/Analysis/diagnostics/undef-value-param.m Thu Jan 10 10:15:44 2019 @@ -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: cat %t.plist | %diff_plist %S/Inputs/expected-plists/undef-value-param.m.plist +// RUN: cat %t.plist | %diff_plist %S/Inputs/expected-plists/undef-value-param.m.plist - typedef signed char BOOL; @protocol NSObject - (BOOL)isEqual:(id)object; @end Modified: cfe/trunk/test/Analysis/edges-new.mm URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/edges-new.mm?rev=350866&r1=350865&r2=350866&view=diff ============================================================================== --- cfe/trunk/test/Analysis/edges-new.mm (original) +++ cfe/trunk/test/Analysis/edges-new.mm Thu Jan 10 10:15:44 2019 @@ -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-output=plist -o %t -w %s -// RUN: cat %t | %diff_plist %S/Inputs/expected-plists/edges-new.mm.plist +// RUN: cat %t | %diff_plist %S/Inputs/expected-plists/edges-new.mm.plist - //===----------------------------------------------------------------------===// // Forward declarations (from headers). Modified: cfe/trunk/test/Analysis/generics.m URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/generics.m?rev=350866&r1=350865&r2=350866&view=diff ============================================================================== --- cfe/trunk/test/Analysis/generics.m (original) +++ cfe/trunk/test/Analysis/generics.m Thu Jan 10 10:15:44 2019 @@ -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: cat %t.plist | %diff_plist %S/Inputs/expected-plists/generics.m.plist +// RUN: cat %t.plist | %diff_plist %S/Inputs/expected-plists/generics.m.plist - #if !__has_feature(objc_generics) # error Compiler does not support Objective-C generics? Modified: cfe/trunk/test/Analysis/inline-plist.c URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/inline-plist.c?rev=350866&r1=350865&r2=350866&view=diff ============================================================================== --- cfe/trunk/test/Analysis/inline-plist.c (original) +++ cfe/trunk/test/Analysis/inline-plist.c Thu Jan 10 10:15:44 2019 @@ -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 -analyzer-config eagerly-assume=false %s // RUN: %clang_analyze_cc1 -analyzer-config eagerly-assume=false %s -analyzer-checker=core.NullDereference,core.DivideZero -fblocks -analyzer-output=plist -analyzer-config suppress-null-return-paths=false -o %t -// RUN: cat %t | %diff_plist %S/Inputs/expected-plists/inline-plist.c.plist +// RUN: cat %t | %diff_plist %S/Inputs/expected-plists/inline-plist.c.plist - // <rdar://problem/10967815> void mmm(int y) { Modified: cfe/trunk/test/Analysis/inline-unique-reports.c URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/inline-unique-reports.c?rev=350866&r1=350865&r2=350866&view=diff ============================================================================== --- cfe/trunk/test/Analysis/inline-unique-reports.c (original) +++ cfe/trunk/test/Analysis/inline-unique-reports.c Thu Jan 10 10:15:44 2019 @@ -1,5 +1,5 @@ // RUN: %clang_analyze_cc1 %s -analyzer-checker=core.NullDereference -analyzer-output=plist -o %t > /dev/null 2>&1 -// RUN: cat %t | %diff_plist %S/Inputs/expected-plists/inline-unique-reports.c.plist +// RUN: cat %t | %diff_plist %S/Inputs/expected-plists/inline-unique-reports.c.plist - static inline bug(int *p) { *p = 0xDEADBEEF; Modified: cfe/trunk/test/Analysis/inlining/eager-reclamation-path-notes.c URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/inlining/eager-reclamation-path-notes.c?rev=350866&r1=350865&r2=350866&view=diff ============================================================================== --- cfe/trunk/test/Analysis/inlining/eager-reclamation-path-notes.c (original) +++ cfe/trunk/test/Analysis/inlining/eager-reclamation-path-notes.c Thu Jan 10 10:15:44 2019 @@ -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: cat %t.plist | %diff_plist %S/Inputs/expected-plists/eager-reclamation-path-notes.c.plist +// RUN: cat %t.plist | %diff_plist %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')}} Modified: cfe/trunk/test/Analysis/inlining/eager-reclamation-path-notes.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/inlining/eager-reclamation-path-notes.cpp?rev=350866&r1=350865&r2=350866&view=diff ============================================================================== --- cfe/trunk/test/Analysis/inlining/eager-reclamation-path-notes.cpp (original) +++ cfe/trunk/test/Analysis/inlining/eager-reclamation-path-notes.cpp Thu Jan 10 10:15:44 2019 @@ -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: cat %t.plist | %diff_plist %S/Inputs/expected-plists/eager-reclamation-path-notes.cpp.plist +// RUN: cat %t.plist | %diff_plist %S/Inputs/expected-plists/eager-reclamation-path-notes.cpp.plist - typedef struct { int getValue(); Modified: cfe/trunk/test/Analysis/inlining/path-notes.c URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/inlining/path-notes.c?rev=350866&r1=350865&r2=350866&view=diff ============================================================================== --- cfe/trunk/test/Analysis/inlining/path-notes.c (original) +++ cfe/trunk/test/Analysis/inlining/path-notes.c Thu Jan 10 10:15:44 2019 @@ -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: cat %t.plist | %diff_plist %S/Inputs/expected-plists/path-notes.c.plist +// RUN: cat %t.plist | %diff_plist %S/Inputs/expected-plists/path-notes.c.plist - void zero(int **p) { *p = 0; Modified: cfe/trunk/test/Analysis/inlining/path-notes.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/inlining/path-notes.cpp?rev=350866&r1=350865&r2=350866&view=diff ============================================================================== --- cfe/trunk/test/Analysis/inlining/path-notes.cpp (original) +++ cfe/trunk/test/Analysis/inlining/path-notes.cpp Thu Jan 10 10:15:44 2019 @@ -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: cat %t.plist | %diff_plist %S/Inputs/expected-plists/path-notes.cpp.plist +// RUN: cat %t.plist | %diff_plist %S/Inputs/expected-plists/path-notes.cpp.plist - class Foo { public: Modified: cfe/trunk/test/Analysis/inlining/path-notes.m URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/inlining/path-notes.m?rev=350866&r1=350865&r2=350866&view=diff ============================================================================== --- cfe/trunk/test/Analysis/inlining/path-notes.m (original) +++ cfe/trunk/test/Analysis/inlining/path-notes.m Thu Jan 10 10:15:44 2019 @@ -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: cat %t.plist | %diff_plist %S/Inputs/expected-plists/path-notes.m.plist +// RUN: cat %t.plist | %diff_plist %S/Inputs/expected-plists/path-notes.m.plist - typedef struct dispatch_queue_s *dispatch_queue_t; typedef void (^dispatch_block_t)(void); Modified: cfe/trunk/test/Analysis/lit.local.cfg URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/lit.local.cfg?rev=350866&r1=350865&r2=350866&view=diff ============================================================================== --- cfe/trunk/test/Analysis/lit.local.cfg (original) +++ cfe/trunk/test/Analysis/lit.local.cfg Thu Jan 10 10:15:44 2019 @@ -12,11 +12,11 @@ config.test_format = analyzer_test.Analy # Diff command used by Clang Analyzer tests (when comparing .plist files # with reference output) config.substitutions.append(('%diff_plist', - 'diff -u -w -I "<string>/" -I "<string>.:" -I "version" -')) + 'diff -u -w -I "<string>/" -I "<string>.:" -I "version"')) # Diff command for testing SARIF output to reference output. config.substitutions.append(('%diff_sarif', - '''diff -U1 -w -I ".*file:.*%basename_t" -I '"version":' -I "2\.0\.0\-csd\.[0-9]*\.beta\." -''')) + '''diff -U1 -w -I ".*file:.*%basename_t" -I '"version":' -I "2\.0\.0\-csd\.[0-9]*\.beta\."''')) if not config.root.clang_staticanalyzer: config.unsupported = True Modified: cfe/trunk/test/Analysis/method-call-path-notes.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/method-call-path-notes.cpp?rev=350866&r1=350865&r2=350866&view=diff ============================================================================== --- cfe/trunk/test/Analysis/method-call-path-notes.cpp (original) +++ cfe/trunk/test/Analysis/method-call-path-notes.cpp Thu Jan 10 10:15:44 2019 @@ -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: cat %t.plist | %diff_plist %S/Inputs/expected-plists/method-call-path-notes.cpp.plist +// RUN: cat %t.plist | %diff_plist %S/Inputs/expected-plists/method-call-path-notes.cpp.plist - // Test warning about null or uninitialized pointer values used as instance member // calls. Modified: cfe/trunk/test/Analysis/model-file.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/model-file.cpp?rev=350866&r1=350865&r2=350866&view=diff ============================================================================== --- cfe/trunk/test/Analysis/model-file.cpp (original) +++ cfe/trunk/test/Analysis/model-file.cpp Thu Jan 10 10:15:44 2019 @@ -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: cat %t | %diff_plist %S/Inputs/expected-plists/model-file.cpp.plist +// RUN: cat %t | %diff_plist %S/Inputs/expected-plists/model-file.cpp.plist - typedef int* intptr; Modified: cfe/trunk/test/Analysis/null-deref-path-notes.m URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/null-deref-path-notes.m?rev=350866&r1=350865&r2=350866&view=diff ============================================================================== --- cfe/trunk/test/Analysis/null-deref-path-notes.m (original) +++ cfe/trunk/test/Analysis/null-deref-path-notes.m Thu Jan 10 10:15:44 2019 @@ -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: cat %t | %diff_plist %S/Inputs/expected-plists/null-deref-path-notes.m.plist +// RUN: cat %t | %diff_plist %S/Inputs/expected-plists/null-deref-path-notes.m.plist - @interface Root { @public Modified: cfe/trunk/test/Analysis/nullability-notes.m URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/nullability-notes.m?rev=350866&r1=350865&r2=350866&view=diff ============================================================================== --- cfe/trunk/test/Analysis/nullability-notes.m (original) +++ cfe/trunk/test/Analysis/nullability-notes.m Thu Jan 10 10:15:44 2019 @@ -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: cat %t.plist | %diff_plist %S/Inputs/expected-plists/nullability-notes.m.plist +// RUN: cat %t.plist | %diff_plist %S/Inputs/expected-plists/nullability-notes.m.plist - #include "Inputs/system-header-simulator-for-nullability.h" Modified: cfe/trunk/test/Analysis/objc-arc.m URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/objc-arc.m?rev=350866&r1=350865&r2=350866&view=diff ============================================================================== --- cfe/trunk/test/Analysis/objc-arc.m (original) +++ cfe/trunk/test/Analysis/objc-arc.m Thu Jan 10 10:15:44 2019 @@ -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: cat %t.plist | %diff_plist %S/Inputs/expected-plists/objc-arc.m.plist +// RUN: cat %t.plist | %diff_plist %S/Inputs/expected-plists/objc-arc.m.plist - typedef signed char BOOL; typedef struct _NSZone NSZone; Modified: cfe/trunk/test/Analysis/plist-macros-with-expansion.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/plist-macros-with-expansion.cpp?rev=350866&r1=350865&r2=350866&view=diff ============================================================================== --- cfe/trunk/test/Analysis/plist-macros-with-expansion.cpp (original) +++ cfe/trunk/test/Analysis/plist-macros-with-expansion.cpp Thu Jan 10 10:15:44 2019 @@ -6,7 +6,7 @@ // // Check the actual plist output. // RUN: cat %t.plist | %diff_plist \ -// RUN: %S/Inputs/expected-plists/plist-macros-with-expansion.cpp.plist +// RUN: %S/Inputs/expected-plists/plist-macros-with-expansion.cpp.plist - // // Check the macro expansions from the plist output here, to make the test more // understandable. Modified: cfe/trunk/test/Analysis/plist-macros.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/plist-macros.cpp?rev=350866&r1=350865&r2=350866&view=diff ============================================================================== --- cfe/trunk/test/Analysis/plist-macros.cpp (original) +++ cfe/trunk/test/Analysis/plist-macros.cpp Thu Jan 10 10:15:44 2019 @@ -1,6 +1,6 @@ // RUN: %clang_analyze_cc1 -analyzer-checker=core,unix -verify %s // RUN: %clang_analyze_cc1 -analyzer-checker=core,unix -analyzer-output=plist-multi-file %s -o %t.plist -// RUN: cat %t.plist | %diff_plist %S/Inputs/expected-plists/plist-macros.cpp.plist +// RUN: cat %t.plist | %diff_plist %S/Inputs/expected-plists/plist-macros.cpp.plist - typedef __typeof(sizeof(int)) size_t; Modified: cfe/trunk/test/Analysis/plist-output-alternate.m URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/plist-output-alternate.m?rev=350866&r1=350865&r2=350866&view=diff ============================================================================== --- cfe/trunk/test/Analysis/plist-output-alternate.m (original) +++ cfe/trunk/test/Analysis/plist-output-alternate.m Thu Jan 10 10:15:44 2019 @@ -1,5 +1,5 @@ // RUN: %clang_analyze_cc1 -analyzer-checker=core,osx.cocoa.RetainCount,alpha.core -fblocks -analyzer-output=plist -o %t %s -// RUN: cat %t | %diff_plist %S/Inputs/expected-plists/plist-output-alternate.m.plist +// RUN: cat %t | %diff_plist %S/Inputs/expected-plists/plist-output-alternate.m.plist - void test_null_init(void) { int *p = 0; Modified: cfe/trunk/test/Analysis/plist-output.m URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/plist-output.m?rev=350866&r1=350865&r2=350866&view=diff ============================================================================== --- cfe/trunk/test/Analysis/plist-output.m (original) +++ cfe/trunk/test/Analysis/plist-output.m Thu Jan 10 10:15:44 2019 @@ -1,5 +1,5 @@ // RUN: %clang_analyze_cc1 -analyzer-config eagerly-assume=false %s -analyzer-checker=osx.cocoa.RetainCount,deadcode.DeadStores,core -analyzer-output=plist -o %t.plist -// RUN: cat %t.plist | %diff_plist %S/Inputs/expected-plists/plist-output.m.plist +// RUN: cat %t.plist | %diff_plist %S/Inputs/expected-plists/plist-output.m.plist - void test_null_init(void) { int *p = 0; Modified: cfe/trunk/test/Analysis/retain-release-path-notes.m URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/retain-release-path-notes.m?rev=350866&r1=350865&r2=350866&view=diff ============================================================================== --- cfe/trunk/test/Analysis/retain-release-path-notes.m (original) +++ cfe/trunk/test/Analysis/retain-release-path-notes.m Thu Jan 10 10:15:44 2019 @@ -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: cat %t | %diff_plist %S/Inputs/expected-plists/retain-release-path-notes.m.plist +// RUN: cat %t | %diff_plist %S/Inputs/expected-plists/retain-release-path-notes.m.plist - /*** This file is for testing the path-sensitive notes for retain/release errors. Modified: cfe/trunk/test/Analysis/unix-fns.c URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/unix-fns.c?rev=350866&r1=350865&r2=350866&view=diff ============================================================================== --- cfe/trunk/test/Analysis/unix-fns.c (original) +++ cfe/trunk/test/Analysis/unix-fns.c Thu Jan 10 10:15:44 2019 @@ -1,5 +1,5 @@ // RUN: %clang_analyze_cc1 -triple x86_64-apple-darwin10 -analyzer-checker=core,unix.API,osx.API,optin.portability %s -analyzer-store=region -analyzer-output=plist -analyzer-config faux-bodies=true -fblocks -verify -o %t.plist -// RUN: cat %t.plist | %diff_plist %S/Inputs/expected-plists/unix-fns.c.plist +// RUN: cat %t.plist | %diff_plist %S/Inputs/expected-plists/unix-fns.c.plist - // RUN: mkdir -p %t.dir // RUN: %clang_analyze_cc1 -analyzer-checker=core,unix.API,osx.API,optin.portability -analyzer-output=html -analyzer-config faux-bodies=true -fblocks -o %t.dir %s // RUN: rm -fR %t.dir _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits