Author: hubert.reinterpretcast Date: Mon Jun 10 15:37:31 2019 New Revision: 362996
URL: http://llvm.org/viewvc/llvm-project?rev=362996&view=rev Log: [analyzer][tests] Use normalize_plist in place of diff_plist (`cat` cases) Summary: The `%diff_plist` lit substitution invokes `diff` with a non-portable `-I` option. The intended effect can be achieved by normalizing the inputs to `diff` beforehand. Such normalization can be done with `grep -Ev`, which is also used by other tests. This patch applies the change (adjusted for review comments) described in http://lists.llvm.org/pipermail/cfe-dev/2019-April/061904.html mechanically to the cases where the output file is piped to `%diff_plist` via `cat`. The changes were applied via a script, except that `clang/test/Analysis/NewDelete-path-notes.cpp` and `clang/test/Analysis/plist-macros-with-expansion.cpp` were each adjusted for the line-continuation on the relevant `RUN` step. Reviewers: NoQ, sfertile, xingxue, jasonliu, daltenty Subscribers: xazax.hun, baloghadamsoftware, szepet, a.sidorin, mikhail.ramalho, Szelethus, donat.nagy, dkrupp, Charusso, jsji, cfe-commits Tags: #clang Differential Revision: https://reviews.llvm.org/D62950 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/deref-track-symbolic-region.c cfe/trunk/test/Analysis/diagnostics/report-issues-within-main-file.cpp 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/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/objc-radar17039661.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/retain-release.m 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=362996&r1=362995&r2=362996&view=diff ============================================================================== --- cfe/trunk/test/Analysis/NewDelete-path-notes.cpp (original) +++ cfe/trunk/test/Analysis/NewDelete-path-notes.cpp Mon Jun 10 15:37:31 2019 @@ -11,7 +11,7 @@ // RUN: -analyzer-checker=cplusplus.NewDelete,unix.Malloc \ // RUN: -analyzer-config add-pop-up-notes=false \ // RUN: -analyzer-output=plist %s -o %t.plist -// RUN: cat %t.plist | %diff_plist \ +// RUN: %normalize_plist <%t.plist | diff -u \ // RUN: %S/Inputs/expected-plists/NewDelete-path-notes.cpp.plist - void test() { 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=362996&r1=362995&r2=362996&view=diff ============================================================================== --- cfe/trunk/test/Analysis/conditional-path-notes.c (original) +++ cfe/trunk/test/Analysis/conditional-path-notes.c Mon Jun 10 15:37:31 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: %normalize_plist <%t | diff -u %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=362996&r1=362995&r2=362996&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 Mon Jun 10 15:37:31 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: %normalize_plist <%t.plist | diff -u %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=362996&r1=362995&r2=362996&view=diff ============================================================================== --- cfe/trunk/test/Analysis/copypaste/plist-diagnostics.cpp (original) +++ cfe/trunk/test/Analysis/copypaste/plist-diagnostics.cpp Mon Jun 10 15:37:31 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: %normalize_plist <%t.plist | diff -u %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=362996&r1=362995&r2=362996&view=diff ============================================================================== --- cfe/trunk/test/Analysis/cxx-for-range.cpp (original) +++ cfe/trunk/test/Analysis/cxx-for-range.cpp Mon Jun 10 15:37:31 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: %normalize_plist <%t.plist | diff -u %S/Inputs/expected-plists/cxx-for-range.cpp.plist - extern void work(); 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=362996&r1=362995&r2=362996&view=diff ============================================================================== --- cfe/trunk/test/Analysis/diagnostics/deref-track-symbolic-region.c (original) +++ cfe/trunk/test/Analysis/diagnostics/deref-track-symbolic-region.c Mon Jun 10 15:37:31 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: %normalize_plist <%t.plist | diff -u %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=362996&r1=362995&r2=362996&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 Mon Jun 10 15:37:31 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: %normalize_plist <%t.plist | diff -u %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/undef-value-caller.c URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/diagnostics/undef-value-caller.c?rev=362996&r1=362995&r2=362996&view=diff ============================================================================== --- cfe/trunk/test/Analysis/diagnostics/undef-value-caller.c (original) +++ cfe/trunk/test/Analysis/diagnostics/undef-value-caller.c Mon Jun 10 15:37:31 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: %normalize_plist <%t | diff -u %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=362996&r1=362995&r2=362996&view=diff ============================================================================== --- cfe/trunk/test/Analysis/diagnostics/undef-value-param.c (original) +++ cfe/trunk/test/Analysis/diagnostics/undef-value-param.c Mon Jun 10 15:37:31 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: %normalize_plist <%t.plist | diff -u %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=362996&r1=362995&r2=362996&view=diff ============================================================================== --- cfe/trunk/test/Analysis/diagnostics/undef-value-param.m (original) +++ cfe/trunk/test/Analysis/diagnostics/undef-value-param.m Mon Jun 10 15:37:31 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: %normalize_plist <%t.plist | diff -u %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=362996&r1=362995&r2=362996&view=diff ============================================================================== --- cfe/trunk/test/Analysis/edges-new.mm (original) +++ cfe/trunk/test/Analysis/edges-new.mm Mon Jun 10 15:37:31 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: %normalize_plist <%t | diff -u %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=362996&r1=362995&r2=362996&view=diff ============================================================================== --- cfe/trunk/test/Analysis/generics.m (original) +++ cfe/trunk/test/Analysis/generics.m Mon Jun 10 15:37:31 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: %normalize_plist <%t.plist | diff -u %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=362996&r1=362995&r2=362996&view=diff ============================================================================== --- cfe/trunk/test/Analysis/inline-plist.c (original) +++ cfe/trunk/test/Analysis/inline-plist.c Mon Jun 10 15:37:31 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: %normalize_plist <%t | diff -u %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=362996&r1=362995&r2=362996&view=diff ============================================================================== --- cfe/trunk/test/Analysis/inline-unique-reports.c (original) +++ cfe/trunk/test/Analysis/inline-unique-reports.c Mon Jun 10 15:37:31 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: %normalize_plist <%t | diff -u %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=362996&r1=362995&r2=362996&view=diff ============================================================================== --- cfe/trunk/test/Analysis/inlining/eager-reclamation-path-notes.c (original) +++ cfe/trunk/test/Analysis/inlining/eager-reclamation-path-notes.c Mon Jun 10 15:37:31 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: %normalize_plist <%t.plist | diff -u %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=362996&r1=362995&r2=362996&view=diff ============================================================================== --- cfe/trunk/test/Analysis/inlining/eager-reclamation-path-notes.cpp (original) +++ cfe/trunk/test/Analysis/inlining/eager-reclamation-path-notes.cpp Mon Jun 10 15:37:31 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: %normalize_plist <%t.plist | diff -u %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=362996&r1=362995&r2=362996&view=diff ============================================================================== --- cfe/trunk/test/Analysis/inlining/path-notes.c (original) +++ cfe/trunk/test/Analysis/inlining/path-notes.c Mon Jun 10 15:37:31 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: %normalize_plist <%t.plist | diff -u %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=362996&r1=362995&r2=362996&view=diff ============================================================================== --- cfe/trunk/test/Analysis/inlining/path-notes.cpp (original) +++ cfe/trunk/test/Analysis/inlining/path-notes.cpp Mon Jun 10 15:37:31 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: %normalize_plist <%t.plist | diff -u %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=362996&r1=362995&r2=362996&view=diff ============================================================================== --- cfe/trunk/test/Analysis/inlining/path-notes.m (original) +++ cfe/trunk/test/Analysis/inlining/path-notes.m Mon Jun 10 15:37:31 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: %normalize_plist <%t.plist | diff -u %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/method-call-path-notes.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/method-call-path-notes.cpp?rev=362996&r1=362995&r2=362996&view=diff ============================================================================== --- cfe/trunk/test/Analysis/method-call-path-notes.cpp (original) +++ cfe/trunk/test/Analysis/method-call-path-notes.cpp Mon Jun 10 15:37:31 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: %normalize_plist <%t.plist | diff -u %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=362996&r1=362995&r2=362996&view=diff ============================================================================== --- cfe/trunk/test/Analysis/model-file.cpp (original) +++ cfe/trunk/test/Analysis/model-file.cpp Mon Jun 10 15:37:31 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: %normalize_plist <%t | diff -u %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=362996&r1=362995&r2=362996&view=diff ============================================================================== --- cfe/trunk/test/Analysis/null-deref-path-notes.m (original) +++ cfe/trunk/test/Analysis/null-deref-path-notes.m Mon Jun 10 15:37:31 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: %normalize_plist <%t | diff -u %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=362996&r1=362995&r2=362996&view=diff ============================================================================== --- cfe/trunk/test/Analysis/nullability-notes.m (original) +++ cfe/trunk/test/Analysis/nullability-notes.m Mon Jun 10 15:37:31 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: %normalize_plist <%t.plist | diff -u %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=362996&r1=362995&r2=362996&view=diff ============================================================================== --- cfe/trunk/test/Analysis/objc-arc.m (original) +++ cfe/trunk/test/Analysis/objc-arc.m Mon Jun 10 15:37:31 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: %normalize_plist <%t.plist | diff -u %S/Inputs/expected-plists/objc-arc.m.plist - typedef signed char BOOL; typedef struct _NSZone NSZone; Modified: cfe/trunk/test/Analysis/objc-radar17039661.m URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/objc-radar17039661.m?rev=362996&r1=362995&r2=362996&view=diff ============================================================================== --- cfe/trunk/test/Analysis/objc-radar17039661.m (original) +++ cfe/trunk/test/Analysis/objc-radar17039661.m Mon Jun 10 15:37:31 2019 @@ -1,6 +1,6 @@ // RUN: %clang_analyze_cc1 -analyzer-checker=core,osx.cocoa.RetainCount -fblocks -verify %s // RUN: %clang_analyze_cc1 -analyzer-checker=core,osx.cocoa.RetainCount -fblocks -analyzer-output=plist-multi-file %s -o %t -// RUN: cat %t | %diff_plist %S/Inputs/expected-plists/objc-radar17039661.m.plist - +// RUN: %normalize_plist <%t | diff -u %S/Inputs/expected-plists/objc-radar17039661.m.plist - @class NSString; typedef long NSInteger; 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=362996&r1=362995&r2=362996&view=diff ============================================================================== --- cfe/trunk/test/Analysis/plist-macros-with-expansion.cpp (original) +++ cfe/trunk/test/Analysis/plist-macros-with-expansion.cpp Mon Jun 10 15:37:31 2019 @@ -5,7 +5,7 @@ // RUN: -analyzer-config expand-macros=true // // Check the actual plist output. -// RUN: cat %t.plist | %diff_plist \ +// RUN: %normalize_plist <%t.plist | diff -u \ // 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 Modified: cfe/trunk/test/Analysis/plist-macros.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/plist-macros.cpp?rev=362996&r1=362995&r2=362996&view=diff ============================================================================== --- cfe/trunk/test/Analysis/plist-macros.cpp (original) +++ cfe/trunk/test/Analysis/plist-macros.cpp Mon Jun 10 15:37:31 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: %normalize_plist <%t.plist | diff -u %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=362996&r1=362995&r2=362996&view=diff ============================================================================== --- cfe/trunk/test/Analysis/plist-output-alternate.m (original) +++ cfe/trunk/test/Analysis/plist-output-alternate.m Mon Jun 10 15:37:31 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: %normalize_plist <%t | diff -u %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=362996&r1=362995&r2=362996&view=diff ============================================================================== --- cfe/trunk/test/Analysis/plist-output.m (original) +++ cfe/trunk/test/Analysis/plist-output.m Mon Jun 10 15:37:31 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: %normalize_plist <%t.plist | diff -u %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=362996&r1=362995&r2=362996&view=diff ============================================================================== --- cfe/trunk/test/Analysis/retain-release-path-notes.m (original) +++ cfe/trunk/test/Analysis/retain-release-path-notes.m Mon Jun 10 15:37:31 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: %normalize_plist <%t | diff -u %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/retain-release.m URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/retain-release.m?rev=362996&r1=362995&r2=362996&view=diff ============================================================================== --- cfe/trunk/test/Analysis/retain-release.m (original) +++ cfe/trunk/test/Analysis/retain-release.m Mon Jun 10 15:37:31 2019 @@ -17,8 +17,8 @@ // RUN: -Wno-objc-root-class -x objective-c++ -std=gnu++98\ // RUN: -analyzer-config osx.cocoa.RetainCount:TrackNSCFStartParam=true\ // RUN: -DTRACK_START_PARAM -// RUN: cat %t.objcpp.plist | %diff_plist %S/Inputs/expected-plists/retain-release.m.objcpp.plist - -// RUN: cat %t.objc.plist | %diff_plist %S/Inputs/expected-plists/retain-release.m.objc.plist - +// RUN: %normalize_plist <%t.objcpp.plist | diff -u %S/Inputs/expected-plists/retain-release.m.objcpp.plist - +// RUN: %normalize_plist <%t.objc.plist | diff -u %S/Inputs/expected-plists/retain-release.m.objc.plist - void clang_analyzer_eval(int); _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
