From: Hubert Tong Date: Sat, 8 Jun 2019 13:51:37 +0000 (+0000) Subject: [analyzer][NFC][tests] Pre-normalize expected-plists X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6befa3fb7e3f6baef21f138c222598edee46a2c9;p=clang [analyzer][NFC][tests] Pre-normalize expected-plists As suggested in the review for D62949, this patch pre-normalizes the reference expected output plist files by removing lines containing fields for which we expect differences that should be ignored. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@362877 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/test/Analysis/Inputs/expected-plists/NewDelete-path-notes.cpp.plist b/test/Analysis/Inputs/expected-plists/NewDelete-path-notes.cpp.plist index fb7a03d928..59c180e5df 100644 --- a/test/Analysis/Inputs/expected-plists/NewDelete-path-notes.cpp.plist +++ b/test/Analysis/Inputs/expected-plists/NewDelete-path-notes.cpp.plist @@ -3,7 +3,6 @@ clang_version -clang version 8.0.0 diagnostics @@ -492,7 +491,6 @@ files - /clang/test/Analysis/NewDelete-path-notes.cpp diff --git a/test/Analysis/Inputs/expected-plists/conditional-path-notes.c.plist b/test/Analysis/Inputs/expected-plists/conditional-path-notes.c.plist index 2cc68feb5c..528e965dcd 100644 --- a/test/Analysis/Inputs/expected-plists/conditional-path-notes.c.plist +++ b/test/Analysis/Inputs/expected-plists/conditional-path-notes.c.plist @@ -3,7 +3,6 @@ clang_version -clang version 8.0.0 diagnostics @@ -1766,7 +1765,6 @@ files - /clang/test/Analysis/conditional-path-notes.c diff --git a/test/Analysis/Inputs/expected-plists/cxx-for-range.cpp.plist b/test/Analysis/Inputs/expected-plists/cxx-for-range.cpp.plist index f6bfc87db5..e7f6dba2fa 100644 --- a/test/Analysis/Inputs/expected-plists/cxx-for-range.cpp.plist +++ b/test/Analysis/Inputs/expected-plists/cxx-for-range.cpp.plist @@ -3,7 +3,6 @@ clang_version -clang version 8.0.0 diagnostics @@ -2140,7 +2139,6 @@ files - /clang/test/Analysis/cxx-for-range.cpp diff --git a/test/Analysis/Inputs/expected-plists/generics.m.plist b/test/Analysis/Inputs/expected-plists/generics.m.plist index acee117720..ad01828a35 100644 --- a/test/Analysis/Inputs/expected-plists/generics.m.plist +++ b/test/Analysis/Inputs/expected-plists/generics.m.plist @@ -3,7 +3,6 @@ clang_version -clang version 8.0.0 diagnostics @@ -7190,7 +7189,6 @@ files - /clang/test/Analysis/generics.m diff --git a/test/Analysis/Inputs/expected-plists/inline-plist.c.plist b/test/Analysis/Inputs/expected-plists/inline-plist.c.plist index 1d64cd796b..db6b5af0d5 100644 --- a/test/Analysis/Inputs/expected-plists/inline-plist.c.plist +++ b/test/Analysis/Inputs/expected-plists/inline-plist.c.plist @@ -3,7 +3,6 @@ clang_version -clang version 8.0.0 diagnostics @@ -2042,7 +2041,6 @@ files - /clang/test/Analysis/inline-plist.c diff --git a/test/Analysis/Inputs/expected-plists/inline-unique-reports.c.plist b/test/Analysis/Inputs/expected-plists/inline-unique-reports.c.plist index 73c8707520..8f8bde7f74 100644 --- a/test/Analysis/Inputs/expected-plists/inline-unique-reports.c.plist +++ b/test/Analysis/Inputs/expected-plists/inline-unique-reports.c.plist @@ -3,7 +3,6 @@ clang_version -clang version 8.0.0 diagnostics @@ -272,7 +271,6 @@ files - /clang/test/Analysis/inline-unique-reports.c diff --git a/test/Analysis/Inputs/expected-plists/lambda-notes.cpp.plist b/test/Analysis/Inputs/expected-plists/lambda-notes.cpp.plist index ad3ebad2e1..5c7768cb97 100644 --- a/test/Analysis/Inputs/expected-plists/lambda-notes.cpp.plist +++ b/test/Analysis/Inputs/expected-plists/lambda-notes.cpp.plist @@ -199,7 +199,6 @@ files - /clang/test/Analysis/lambda-notes.cpp diff --git a/test/Analysis/Inputs/expected-plists/malloc-plist.c.plist b/test/Analysis/Inputs/expected-plists/malloc-plist.c.plist index 98a783435a..15af3f37f9 100644 --- a/test/Analysis/Inputs/expected-plists/malloc-plist.c.plist +++ b/test/Analysis/Inputs/expected-plists/malloc-plist.c.plist @@ -5256,7 +5256,6 @@ files - /clang/test/Analysis/malloc-plist.c diff --git a/test/Analysis/Inputs/expected-plists/method-call-path-notes.cpp.plist b/test/Analysis/Inputs/expected-plists/method-call-path-notes.cpp.plist index 9c6fd13d81..51296dff2f 100644 --- a/test/Analysis/Inputs/expected-plists/method-call-path-notes.cpp.plist +++ b/test/Analysis/Inputs/expected-plists/method-call-path-notes.cpp.plist @@ -3,7 +3,6 @@ clang_version -clang version 8.0.0 diagnostics @@ -839,7 +838,6 @@ files - /clang/test/Analysis/method-call-path-notes.cpp diff --git a/test/Analysis/Inputs/expected-plists/model-file.cpp.plist b/test/Analysis/Inputs/expected-plists/model-file.cpp.plist index f7965488f2..4404893e3c 100644 --- a/test/Analysis/Inputs/expected-plists/model-file.cpp.plist +++ b/test/Analysis/Inputs/expected-plists/model-file.cpp.plist @@ -3,7 +3,6 @@ clang_version -clang version 8.0.0 diagnostics @@ -302,8 +301,6 @@ files - /clang/test/Analysis/model-file.cpp - /clang/test/Analysis/Inputs/Models/notzero.model diff --git a/test/Analysis/Inputs/expected-plists/null-deref-path-notes.m.plist b/test/Analysis/Inputs/expected-plists/null-deref-path-notes.m.plist index f2b6392433..a6dba0bb47 100644 --- a/test/Analysis/Inputs/expected-plists/null-deref-path-notes.m.plist +++ b/test/Analysis/Inputs/expected-plists/null-deref-path-notes.m.plist @@ -3,7 +3,6 @@ clang_version -clang version 8.0.0 diagnostics @@ -1022,7 +1021,6 @@ files - /clang/test/Analysis/null-deref-path-notes.m diff --git a/test/Analysis/Inputs/expected-plists/nullability-notes.m.plist b/test/Analysis/Inputs/expected-plists/nullability-notes.m.plist index 661cd651cf..314af1e4c9 100644 --- a/test/Analysis/Inputs/expected-plists/nullability-notes.m.plist +++ b/test/Analysis/Inputs/expected-plists/nullability-notes.m.plist @@ -3,7 +3,6 @@ clang_version -clang version 8.0.0 diagnostics @@ -199,7 +198,6 @@ files - /clang/test/Analysis/nullability-notes.m diff --git a/test/Analysis/Inputs/expected-plists/plist-macros-with-expansion.cpp.plist b/test/Analysis/Inputs/expected-plists/plist-macros-with-expansion.cpp.plist index 259ce77aba..2988f8504f 100644 --- a/test/Analysis/Inputs/expected-plists/plist-macros-with-expansion.cpp.plist +++ b/test/Analysis/Inputs/expected-plists/plist-macros-with-expansion.cpp.plist @@ -6115,7 +6115,6 @@ files - /home/szelethus/Documents/macro_expansion/clang/test/Analysis/plist-macros-with-expansion.cpp diff --git a/test/Analysis/Inputs/expected-plists/plist-macros.cpp.plist b/test/Analysis/Inputs/expected-plists/plist-macros.cpp.plist index 2cc1604ca8..9981fc6a1f 100644 --- a/test/Analysis/Inputs/expected-plists/plist-macros.cpp.plist +++ b/test/Analysis/Inputs/expected-plists/plist-macros.cpp.plist @@ -3,7 +3,6 @@ clang_version -clang version 8.0.0 diagnostics @@ -1846,7 +1845,6 @@ files - /clang/test/Analysis/plist-macros.cpp diff --git a/test/Analysis/Inputs/expected-plists/retain-release.m.objc.plist b/test/Analysis/Inputs/expected-plists/retain-release.m.objc.plist index 3b3bce1084..74e8dd606a 100644 --- a/test/Analysis/Inputs/expected-plists/retain-release.m.objc.plist +++ b/test/Analysis/Inputs/expected-plists/retain-release.m.objc.plist @@ -3,7 +3,6 @@ clang_version -clang version 9.0.0 diagnostics @@ -26231,7 +26230,6 @@ files - /Volumes/Transcend/code/monorepo/llvm-project/clang/test/Analysis/retain-release.m diff --git a/test/Analysis/Inputs/expected-plists/retain-release.m.objcpp.plist b/test/Analysis/Inputs/expected-plists/retain-release.m.objcpp.plist index 539b33e7c6..79145156f2 100644 --- a/test/Analysis/Inputs/expected-plists/retain-release.m.objcpp.plist +++ b/test/Analysis/Inputs/expected-plists/retain-release.m.objcpp.plist @@ -3,7 +3,6 @@ clang_version -clang version 9.0.0 diagnostics @@ -26300,7 +26299,6 @@ files - /Volumes/Transcend/code/monorepo/llvm-project/clang/test/Analysis/retain-release.m diff --git a/test/Analysis/Inputs/expected-plists/unix-fns.c.plist b/test/Analysis/Inputs/expected-plists/unix-fns.c.plist index e0c64dd37c..3063969432 100644 --- a/test/Analysis/Inputs/expected-plists/unix-fns.c.plist +++ b/test/Analysis/Inputs/expected-plists/unix-fns.c.plist @@ -3,7 +3,6 @@ clang_version -clang version 8.0.0 diagnostics @@ -3015,7 +3014,6 @@ files - /home/szelethus/Documents/analyzer_opts/clang/test/Analysis/unix-fns.c diff --git a/test/Analysis/copypaste/Inputs/expected-plists/MismatchedDeallocator-path-notes.cpp.plist b/test/Analysis/copypaste/Inputs/expected-plists/MismatchedDeallocator-path-notes.cpp.plist index 94d925edae..e15c10a23b 100644 --- a/test/Analysis/copypaste/Inputs/expected-plists/MismatchedDeallocator-path-notes.cpp.plist +++ b/test/Analysis/copypaste/Inputs/expected-plists/MismatchedDeallocator-path-notes.cpp.plist @@ -297,7 +297,6 @@ files - /clang/test/Analysis/MismatchedDeallocator-path-notes.cpp diff --git a/test/Analysis/copypaste/Inputs/expected-plists/plist-diagnostics-notes-as-events.cpp.plist b/test/Analysis/copypaste/Inputs/expected-plists/plist-diagnostics-notes-as-events.cpp.plist index ecdf3216b9..a4503f0fa5 100644 --- a/test/Analysis/copypaste/Inputs/expected-plists/plist-diagnostics-notes-as-events.cpp.plist +++ b/test/Analysis/copypaste/Inputs/expected-plists/plist-diagnostics-notes-as-events.cpp.plist @@ -3,7 +3,6 @@ clang_version -clang version 8.0.0 diagnostics @@ -92,7 +91,6 @@ files - /clang/test/Analysis/copypaste/plist-diagnostics-notes-as-events.cpp diff --git a/test/Analysis/copypaste/Inputs/expected-plists/plist-diagnostics.cpp.plist b/test/Analysis/copypaste/Inputs/expected-plists/plist-diagnostics.cpp.plist index 2813377cf0..d70e07d8b0 100644 --- a/test/Analysis/copypaste/Inputs/expected-plists/plist-diagnostics.cpp.plist +++ b/test/Analysis/copypaste/Inputs/expected-plists/plist-diagnostics.cpp.plist @@ -3,7 +3,6 @@ clang_version -clang version 8.0.0 diagnostics @@ -93,7 +92,6 @@ files - /clang/test/Analysis/copypaste/plist-diagnostics.cpp diff --git a/test/Analysis/diagnostics/Inputs/expected-plists/deref-track-symbolic-region.c.plist b/test/Analysis/diagnostics/Inputs/expected-plists/deref-track-symbolic-region.c.plist index 47c3b8df09..e090bb172e 100644 --- a/test/Analysis/diagnostics/Inputs/expected-plists/deref-track-symbolic-region.c.plist +++ b/test/Analysis/diagnostics/Inputs/expected-plists/deref-track-symbolic-region.c.plist @@ -3,7 +3,6 @@ clang_version -clang version 8.0.0 diagnostics @@ -651,7 +650,6 @@ files - /clang/test/Analysis/diagnostics/deref-track-symbolic-region.c diff --git a/test/Analysis/diagnostics/Inputs/expected-plists/plist-diagnostics-include-check.cpp.plist b/test/Analysis/diagnostics/Inputs/expected-plists/plist-diagnostics-include-check.cpp.plist index 802534d0c1..ee300371dd 100644 --- a/test/Analysis/diagnostics/Inputs/expected-plists/plist-diagnostics-include-check.cpp.plist +++ b/test/Analysis/diagnostics/Inputs/expected-plists/plist-diagnostics-include-check.cpp.plist @@ -139,9 +139,6 @@ files - /clang/test/Analysis/diagnostics/plist-diagnostics-include-check.cpp - /clang/test/Analysis/diagnostics/Inputs/include/plist-diagnostics-include-check-macro.h - /clang/test/Analysis/diagnostics/Inputs/include/plist-diagnostics-include-check-macro.def diff --git a/test/Analysis/diagnostics/Inputs/expected-plists/plist-multi-file.c.plist b/test/Analysis/diagnostics/Inputs/expected-plists/plist-multi-file.c.plist index 74ccc7903c..b0eb72d8b1 100644 --- a/test/Analysis/diagnostics/Inputs/expected-plists/plist-multi-file.c.plist +++ b/test/Analysis/diagnostics/Inputs/expected-plists/plist-multi-file.c.plist @@ -201,8 +201,6 @@ files - /clang/test/Analysis/diagnostics/plist-multi-file.c - /clang/test/Analysis/diagnostics/plist-multi-file.h diff --git a/test/Analysis/diagnostics/Inputs/expected-plists/report-issues-within-main-file.cpp.plist b/test/Analysis/diagnostics/Inputs/expected-plists/report-issues-within-main-file.cpp.plist index e0959e719a..37d80573d4 100644 --- a/test/Analysis/diagnostics/Inputs/expected-plists/report-issues-within-main-file.cpp.plist +++ b/test/Analysis/diagnostics/Inputs/expected-plists/report-issues-within-main-file.cpp.plist @@ -3,7 +3,6 @@ clang_version -clang version 8.0.0 diagnostics @@ -1828,8 +1827,6 @@ files - /clang/test/Analysis/diagnostics/report-issues-within-main-file.cpp - /clang/test/Analysis/diagnostics/Inputs/include/report-issues-within-main-file.h diff --git a/test/Analysis/diagnostics/Inputs/expected-plists/undef-value-caller.c.plist b/test/Analysis/diagnostics/Inputs/expected-plists/undef-value-caller.c.plist index 867807be84..40de92f06a 100644 --- a/test/Analysis/diagnostics/Inputs/expected-plists/undef-value-caller.c.plist +++ b/test/Analysis/diagnostics/Inputs/expected-plists/undef-value-caller.c.plist @@ -3,7 +3,6 @@ clang_version -clang version 8.0.0 diagnostics @@ -135,8 +134,6 @@ files - /clang/test/Analysis/diagnostics/undef-value-caller.c - /clang/test/Analysis/diagnostics/undef-value-callee.h diff --git a/test/Analysis/diagnostics/Inputs/expected-plists/undef-value-param.c.plist b/test/Analysis/diagnostics/Inputs/expected-plists/undef-value-param.c.plist index 5d351624f1..daa69be141 100644 --- a/test/Analysis/diagnostics/Inputs/expected-plists/undef-value-param.c.plist +++ b/test/Analysis/diagnostics/Inputs/expected-plists/undef-value-param.c.plist @@ -3,7 +3,6 @@ clang_version -clang version 8.0.0 diagnostics @@ -1338,7 +1337,6 @@ files - /clang/test/Analysis/diagnostics/undef-value-param.c diff --git a/test/Analysis/diagnostics/Inputs/expected-plists/undef-value-param.m.plist b/test/Analysis/diagnostics/Inputs/expected-plists/undef-value-param.m.plist index bc88cf7c54..b201bf97ba 100644 --- a/test/Analysis/diagnostics/Inputs/expected-plists/undef-value-param.m.plist +++ b/test/Analysis/diagnostics/Inputs/expected-plists/undef-value-param.m.plist @@ -3,7 +3,6 @@ clang_version -clang version 8.0.0 diagnostics @@ -1021,7 +1020,6 @@ files - /clang/test/Analysis/diagnostics/undef-value-param.m diff --git a/test/Analysis/inlining/Inputs/expected-plists/eager-reclamation-path-notes.c.plist b/test/Analysis/inlining/Inputs/expected-plists/eager-reclamation-path-notes.c.plist index 184aa195e3..f52d91827f 100644 --- a/test/Analysis/inlining/Inputs/expected-plists/eager-reclamation-path-notes.c.plist +++ b/test/Analysis/inlining/Inputs/expected-plists/eager-reclamation-path-notes.c.plist @@ -3,7 +3,6 @@ clang_version -clang version 8.0.0 diagnostics @@ -647,7 +646,6 @@ files - /clang/test/Analysis/inlining/eager-reclamation-path-notes.c diff --git a/test/Analysis/inlining/Inputs/expected-plists/eager-reclamation-path-notes.cpp.plist b/test/Analysis/inlining/Inputs/expected-plists/eager-reclamation-path-notes.cpp.plist index cc699ae1d1..5af4e1f093 100644 --- a/test/Analysis/inlining/Inputs/expected-plists/eager-reclamation-path-notes.cpp.plist +++ b/test/Analysis/inlining/Inputs/expected-plists/eager-reclamation-path-notes.cpp.plist @@ -3,7 +3,6 @@ clang_version -clang version 8.0.0 diagnostics @@ -371,7 +370,6 @@ files - /clang/test/Analysis/inlining/eager-reclamation-path-notes.cpp diff --git a/test/Analysis/inlining/Inputs/expected-plists/path-notes.c.plist b/test/Analysis/inlining/Inputs/expected-plists/path-notes.c.plist index d9001556a2..c28316de6c 100644 --- a/test/Analysis/inlining/Inputs/expected-plists/path-notes.c.plist +++ b/test/Analysis/inlining/Inputs/expected-plists/path-notes.c.plist @@ -3,7 +3,6 @@ clang_version -clang version 8.0.0 diagnostics @@ -3774,7 +3773,6 @@ files - /clang/test/Analysis/inlining/path-notes.c diff --git a/test/Analysis/inlining/Inputs/expected-plists/path-notes.cpp.plist b/test/Analysis/inlining/Inputs/expected-plists/path-notes.cpp.plist index c9fd8c848b..a857fd8b94 100644 --- a/test/Analysis/inlining/Inputs/expected-plists/path-notes.cpp.plist +++ b/test/Analysis/inlining/Inputs/expected-plists/path-notes.cpp.plist @@ -3,7 +3,6 @@ clang_version -clang version 8.0.0 diagnostics @@ -5221,7 +5220,6 @@ files - /clang/test/Analysis/inlining/path-notes.cpp