]> granicus.if.org Git - clang/commitdiff
[analyzer][NFC][tests] Pre-normalize expected-plists
authorHubert Tong <hubert.reinterpretcast@gmail.com>
Sat, 8 Jun 2019 13:51:37 +0000 (13:51 +0000)
committerHubert Tong <hubert.reinterpretcast@gmail.com>
Sat, 8 Jun 2019 13:51:37 +0000 (13:51 +0000)
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

31 files changed:
test/Analysis/Inputs/expected-plists/NewDelete-path-notes.cpp.plist
test/Analysis/Inputs/expected-plists/conditional-path-notes.c.plist
test/Analysis/Inputs/expected-plists/cxx-for-range.cpp.plist
test/Analysis/Inputs/expected-plists/generics.m.plist
test/Analysis/Inputs/expected-plists/inline-plist.c.plist
test/Analysis/Inputs/expected-plists/inline-unique-reports.c.plist
test/Analysis/Inputs/expected-plists/lambda-notes.cpp.plist
test/Analysis/Inputs/expected-plists/malloc-plist.c.plist
test/Analysis/Inputs/expected-plists/method-call-path-notes.cpp.plist
test/Analysis/Inputs/expected-plists/model-file.cpp.plist
test/Analysis/Inputs/expected-plists/null-deref-path-notes.m.plist
test/Analysis/Inputs/expected-plists/nullability-notes.m.plist
test/Analysis/Inputs/expected-plists/plist-macros-with-expansion.cpp.plist
test/Analysis/Inputs/expected-plists/plist-macros.cpp.plist
test/Analysis/Inputs/expected-plists/retain-release.m.objc.plist
test/Analysis/Inputs/expected-plists/retain-release.m.objcpp.plist
test/Analysis/Inputs/expected-plists/unix-fns.c.plist
test/Analysis/copypaste/Inputs/expected-plists/MismatchedDeallocator-path-notes.cpp.plist
test/Analysis/copypaste/Inputs/expected-plists/plist-diagnostics-notes-as-events.cpp.plist
test/Analysis/copypaste/Inputs/expected-plists/plist-diagnostics.cpp.plist
test/Analysis/diagnostics/Inputs/expected-plists/deref-track-symbolic-region.c.plist
test/Analysis/diagnostics/Inputs/expected-plists/plist-diagnostics-include-check.cpp.plist
test/Analysis/diagnostics/Inputs/expected-plists/plist-multi-file.c.plist
test/Analysis/diagnostics/Inputs/expected-plists/report-issues-within-main-file.cpp.plist
test/Analysis/diagnostics/Inputs/expected-plists/undef-value-caller.c.plist
test/Analysis/diagnostics/Inputs/expected-plists/undef-value-param.c.plist
test/Analysis/diagnostics/Inputs/expected-plists/undef-value-param.m.plist
test/Analysis/inlining/Inputs/expected-plists/eager-reclamation-path-notes.c.plist
test/Analysis/inlining/Inputs/expected-plists/eager-reclamation-path-notes.cpp.plist
test/Analysis/inlining/Inputs/expected-plists/path-notes.c.plist
test/Analysis/inlining/Inputs/expected-plists/path-notes.cpp.plist

index fb7a03d928ae667823d0f23e7adaa1d76d95b5d6..59c180e5df7e82289b9c466cd4fbb2dfedfaccd2 100644 (file)
@@ -3,7 +3,6 @@
 <plist version="1.0">
 <dict>
  <key>clang_version</key>
-<string>clang version 8.0.0 </string>
  <key>diagnostics</key>
  <array>
   <dict>
  </array>
  <key>files</key>
  <array>
-   <string>/clang/test/Analysis/NewDelete-path-notes.cpp</string>
  </array>
 </dict>
 </plist>
index 2cc68feb5c5cfa06bee11b8c7a7149223803fb15..528e965dcde8c1852e583be5994536a8d2098955 100644 (file)
@@ -3,7 +3,6 @@
 <plist version="1.0">
 <dict>
  <key>clang_version</key>
-<string>clang version 8.0.0 </string>
  <key>diagnostics</key>
  <array>
   <dict>
  </array>
  <key>files</key>
  <array>
-   <string>/clang/test/Analysis/conditional-path-notes.c</string>
  </array>
 </dict>
 </plist>
index f6bfc87db57af7f8195148897b4e77ed751b023c..e7f6dba2fa43fa18bf60170f16800d699e13c631 100644 (file)
@@ -3,7 +3,6 @@
 <plist version="1.0">
 <dict>
  <key>clang_version</key>
-<string>clang version 8.0.0 </string>
  <key>diagnostics</key>
  <array>
   <dict>
  </array>
  <key>files</key>
  <array>
-   <string>/clang/test/Analysis/cxx-for-range.cpp</string>
  </array>
 </dict>
 </plist>
index acee11772013ad5e8659c454e44f8a6dcb640134..ad01828a350e18ec95ff8a01e3b33eda5dec5787 100644 (file)
@@ -3,7 +3,6 @@
 <plist version="1.0">
 <dict>
  <key>clang_version</key>
-<string>clang version 8.0.0 </string>
  <key>diagnostics</key>
  <array>
   <dict>
  </array>
  <key>files</key>
  <array>
-   <string>/clang/test/Analysis/generics.m</string>
  </array>
 </dict>
 </plist>
index 1d64cd796ba56b482c083e6ff76d4169cb44fb67..db6b5af0d56844e15181d231f6d74b70fd3e5bf6 100644 (file)
@@ -3,7 +3,6 @@
 <plist version="1.0">
 <dict>
  <key>clang_version</key>
-<string>clang version 8.0.0 </string>
  <key>diagnostics</key>
  <array>
   <dict>
  </array>
  <key>files</key>
  <array>
-   <string>/clang/test/Analysis/inline-plist.c</string>
  </array>
 </dict>
 </plist>
index 73c8707520bd7148409989c57155b9a1852ea296..8f8bde7f743584ae6298fa75af9c9fa6f74a53ad 100644 (file)
@@ -3,7 +3,6 @@
 <plist version="1.0">
 <dict>
  <key>clang_version</key>
-<string>clang version 8.0.0 </string>
  <key>diagnostics</key>
  <array>
   <dict>
  </array>
  <key>files</key>
  <array>
-   <string>/clang/test/Analysis/inline-unique-reports.c</string>
  </array>
 </dict>
 </plist>
index ad3ebad2e1a993214aa29e8498ffc290f09feb27..5c7768cb97ef42866a0e4447a4a8a54891c85714 100644 (file)
  </array>
  <key>files</key>
  <array>
-  <string>/clang/test/Analysis/lambda-notes.cpp</string>
  </array>
 </dict>
 </plist>
index 98a783435a52ea6c68356954710bb02ae77c54e8..15af3f37f9474a821bb449e5090224f087426b39 100644 (file)
  </array>
  <key>files</key>
  <array>
-  <string>/clang/test/Analysis/malloc-plist.c</string>
  </array>
 </dict>
 </plist>
index 9c6fd13d811edf42cb6c121f8dce61e8e004b063..51296dff2f61828572a766e0472bc6021515a368 100644 (file)
@@ -3,7 +3,6 @@
 <plist version="1.0">
 <dict>
  <key>clang_version</key>
-<string>clang version 8.0.0 </string>
  <key>diagnostics</key>
  <array>
   <dict>
  </array>
  <key>files</key>
  <array>
-   <string>/clang/test/Analysis/method-call-path-notes.cpp</string>
  </array>
 </dict>
 </plist>
index f7965488f25ea4c33e116df5b63d85f296030368..4404893e3cdcd0d8beb0cf5a0870b3b6dacad681 100644 (file)
@@ -3,7 +3,6 @@
 <plist version="1.0">
 <dict>
  <key>clang_version</key>
-<string>clang version 8.0.0 </string>
  <key>diagnostics</key>
  <array>
   <dict>
  </array>
  <key>files</key>
  <array>
-   <string>/clang/test/Analysis/model-file.cpp</string>
-   <string>/clang/test/Analysis/Inputs/Models/notzero.model</string>
  </array>
 </dict>
 </plist>
index f2b6392433eb02fa965b94e0d0f3eabce828757f..a6dba0bb475fa9dee4925ac4ef2d1d27ef5bf31f 100644 (file)
@@ -3,7 +3,6 @@
 <plist version="1.0">
 <dict>
  <key>clang_version</key>
-<string>clang version 8.0.0 </string>
  <key>diagnostics</key>
  <array>
   <dict>
  </array>
  <key>files</key>
  <array>
-   <string>/clang/test/Analysis/null-deref-path-notes.m</string>
  </array>
 </dict>
 </plist>
index 661cd651cfc2b28728b6af7ead29202d1b71ef07..314af1e4c952b7da81cc8347c8463969b374bceb 100644 (file)
@@ -3,7 +3,6 @@
 <plist version="1.0">
 <dict>
  <key>clang_version</key>
-<string>clang version 8.0.0 </string>
  <key>diagnostics</key>
  <array>
   <dict>
  </array>
  <key>files</key>
  <array>
-   <string>/clang/test/Analysis/nullability-notes.m</string>
  </array>
 </dict>
 </plist>
index 259ce77aba725312ba8e39ade636afdf0077e774..2988f8504fcf74a389ff270547afc44a9ffcbfb7 100644 (file)
  </array>
  <key>files</key>
  <array>
-  <string>/home/szelethus/Documents/macro_expansion/clang/test/Analysis/plist-macros-with-expansion.cpp</string>
  </array>
 </dict>
 </plist>
index 2cc1604ca88e34ecdd8857bf4f1d50edb07b2fda..9981fc6a1f5179c63926d5f6051ceabc8183b415 100644 (file)
@@ -3,7 +3,6 @@
 <plist version="1.0">
 <dict>
  <key>clang_version</key>
-<string>clang version 8.0.0 </string>
  <key>diagnostics</key>
  <array>
   <dict>
  </array>
  <key>files</key>
  <array>
-   <string>/clang/test/Analysis/plist-macros.cpp</string>
  </array>
 </dict>
 </plist>
index 3b3bce10844ec810f9a5bf282c19a65f609eea3e..74e8dd606a2d94b729aa7fc896686dd485b7e1ef 100644 (file)
@@ -3,7 +3,6 @@
 <plist version="1.0">
 <dict>
  <key>clang_version</key>
-<string>clang version 9.0.0 </string>
  <key>diagnostics</key>
  <array>
   <dict>
  </array>
  <key>files</key>
  <array>
-  <string>/Volumes/Transcend/code/monorepo/llvm-project/clang/test/Analysis/retain-release.m</string>
  </array>
 </dict>
 </plist>
index 539b33e7c63e74f2089ec07763bfe6601bea2307..79145156f26492f18e0dab8e5f9428796cdc504f 100644 (file)
@@ -3,7 +3,6 @@
 <plist version="1.0">
 <dict>
  <key>clang_version</key>
-<string>clang version 9.0.0 </string>
  <key>diagnostics</key>
  <array>
   <dict>
  </array>
  <key>files</key>
  <array>
-  <string>/Volumes/Transcend/code/monorepo/llvm-project/clang/test/Analysis/retain-release.m</string>
  </array>
 </dict>
 </plist>
index e0c64dd37ce108f885518766f1c3f2e93b995c34..3063969432b39ec5b7adf550269fd6dd5386f5bd 100644 (file)
@@ -3,7 +3,6 @@
 <plist version="1.0">
 <dict>
  <key>clang_version</key>
-<string>clang version 8.0.0</string>
  <key>diagnostics</key>
  <array>
   <dict>
  </array>
  <key>files</key>
  <array>
-  <string>/home/szelethus/Documents/analyzer_opts/clang/test/Analysis/unix-fns.c</string>
  </array>
 </dict>
 </plist>
index 94d925edaeb59886a56f812d433383ccf72c7c60..e15c10a23bf4730e0ff1fcc4a3d18cd2cc7fd412 100644 (file)
  </array>
  <key>files</key>
  <array>
-  <string>/clang/test/Analysis/MismatchedDeallocator-path-notes.cpp</string>
  </array>
 </dict>
 </plist>
index ecdf3216b9656c95613ff22794405622c4d31490..a4503f0fa5133a9d4f0b0392f74fc71734a04a12 100644 (file)
@@ -3,7 +3,6 @@
 <plist version="1.0">
 <dict>
  <key>clang_version</key>
-<string>clang version 8.0.0 </string>
  <key>diagnostics</key>
  <array>
   <dict>
@@ -92,7 +91,6 @@
  </array>
  <key>files</key>
  <array>
-   <string>/clang/test/Analysis/copypaste/plist-diagnostics-notes-as-events.cpp</string>
  </array>
 </dict>
 </plist>
index 2813377cf00cc7721bf250d487f19e65726f9a10..d70e07d8b01679cd1e4f3d9f3f6b00a770820fdc 100644 (file)
@@ -3,7 +3,6 @@
 <plist version="1.0">
 <dict>
  <key>clang_version</key>
-<string>clang version 8.0.0 </string>
  <key>diagnostics</key>
  <array>
   <dict>
@@ -93,7 +92,6 @@
  </array>
  <key>files</key>
  <array>
-   <string>/clang/test/Analysis/copypaste/plist-diagnostics.cpp</string>
  </array>
 </dict>
 </plist>
index 47c3b8df09c9fac7d007563fee4ca6279ab2b081..e090bb172e8af98dbb409a436ae95882ab960094 100644 (file)
@@ -3,7 +3,6 @@
 <plist version="1.0">
 <dict>
  <key>clang_version</key>
-<string>clang version 8.0.0 </string>
  <key>diagnostics</key>
  <array>
   <dict>
  </array>
  <key>files</key>
  <array>
-   <string>/clang/test/Analysis/diagnostics/deref-track-symbolic-region.c</string>
  </array>
 </dict>
 </plist>
index 802534d0c16543ccee727d38400755a122e49668..ee300371dd6e5f74cca3904a20b1f9db27073aee 100644 (file)
  </array>
  <key>files</key>
  <array>
-  <string>/clang/test/Analysis/diagnostics/plist-diagnostics-include-check.cpp</string>
-  <string>/clang/test/Analysis/diagnostics/Inputs/include/plist-diagnostics-include-check-macro.h</string>
-  <string>/clang/test/Analysis/diagnostics/Inputs/include/plist-diagnostics-include-check-macro.def</string>
  </array>
 </dict>
 </plist>
index 74ccc7903c1f8b8dec5747933b47a10b9544c61e..b0eb72d8b1b419050d9348082588dba4a5f8fdcb 100644 (file)
  </array>
  <key>files</key>
  <array>
-  <string>/clang/test/Analysis/diagnostics/plist-multi-file.c</string>
-  <string>/clang/test/Analysis/diagnostics/plist-multi-file.h</string>
  </array>
 </dict>
 </plist>
index e0959e719a7422f89499a95c765e4efeeccfee8c..37d80573d4412a1d4c5550bd314b802fc928e722 100644 (file)
@@ -3,7 +3,6 @@
 <plist version="1.0">
 <dict>
  <key>clang_version</key>
-<string>clang version 8.0.0 </string>
  <key>diagnostics</key>
  <array>
   <dict>
  </array>
  <key>files</key>
  <array>
-  <string>/clang/test/Analysis/diagnostics/report-issues-within-main-file.cpp</string>
-  <string>/clang/test/Analysis/diagnostics/Inputs/include/report-issues-within-main-file.h</string>
  </array>
 </dict>
 </plist>
index 867807be846abf9f50de803337ae82d7d5e8838c..40de92f06a06d2cec97d926e6ba432c16f31667d 100644 (file)
@@ -3,7 +3,6 @@
 <plist version="1.0">
 <dict>
  <key>clang_version</key>
-<string>clang version 8.0.0 </string>
  <key>diagnostics</key>
  <array>
   <dict>
  </array>
  <key>files</key>
  <array>
-   <string>/clang/test/Analysis/diagnostics/undef-value-caller.c</string>
-   <string>/clang/test/Analysis/diagnostics/undef-value-callee.h</string>
  </array>
 </dict>
 </plist>
index 5d351624f1833ec842793306b90963c4c262d812..daa69be14199cc142c1778fe8f99e233692911ed 100644 (file)
@@ -3,7 +3,6 @@
 <plist version="1.0">
 <dict>
  <key>clang_version</key>
-<string>clang version 8.0.0 </string>
  <key>diagnostics</key>
  <array>
   <dict>
  </array>
  <key>files</key>
  <array>
-   <string>/clang/test/Analysis/diagnostics/undef-value-param.c</string>
  </array>
 </dict>
 </plist>
index bc88cf7c546f043631a755fd615bf7feb820a1b7..b201bf97babf95d46c58b8edb7ebb41897b6da51 100644 (file)
@@ -3,7 +3,6 @@
 <plist version="1.0">
 <dict>
  <key>clang_version</key>
-<string>clang version 8.0.0 </string>
  <key>diagnostics</key>
  <array>
   <dict>
  </array>
  <key>files</key>
  <array>
-   <string>/clang/test/Analysis/diagnostics/undef-value-param.m</string>
  </array>
 </dict>
 </plist>
index 184aa195e376db6868b6afa0e44564408dc8183f..f52d91827f7aa89c49c4382f4cf9a464c7d32615 100644 (file)
@@ -3,7 +3,6 @@
 <plist version="1.0">
 <dict>
  <key>clang_version</key>
-<string>clang version 8.0.0 </string>
  <key>diagnostics</key>
  <array>
   <dict>
  </array>
  <key>files</key>
  <array>
-   <string>/clang/test/Analysis/inlining/eager-reclamation-path-notes.c</string>
  </array>
 </dict>
 </plist>
index cc699ae1d154ff4c17bdfe832ca9206a72f62c8a..5af4e1f093e9b27bd58d3f91b56c897304e838cc 100644 (file)
@@ -3,7 +3,6 @@
 <plist version="1.0">
 <dict>
  <key>clang_version</key>
-<string>clang version 8.0.0 </string>
  <key>diagnostics</key>
  <array>
   <dict>
  </array>
  <key>files</key>
  <array>
-   <string>/clang/test/Analysis/inlining/eager-reclamation-path-notes.cpp</string>
  </array>
 </dict>
 </plist>
index d9001556a2a866ae8f1ebb16689e3e52ba808db8..c28316de6c169b92d01d48d0c1832c1e38842d2c 100644 (file)
@@ -3,7 +3,6 @@
 <plist version="1.0">
 <dict>
  <key>clang_version</key>
-<string>clang version 8.0.0 </string>
  <key>diagnostics</key>
  <array>
   <dict>
  </array>
  <key>files</key>
  <array>
-   <string>/clang/test/Analysis/inlining/path-notes.c</string>
  </array>
 </dict>
 </plist>
index c9fd8c848bdcaeefb8ea54d45d5e1bae87be819c..a857fd8b94c3f0e5a1bf15b7908331575af19d71 100644 (file)
@@ -3,7 +3,6 @@
 <plist version="1.0">
 <dict>
  <key>clang_version</key>
-<string>clang version 8.0.0 </string>
  <key>diagnostics</key>
  <array>
   <dict>
  </array>
  <key>files</key>
  <array>
-   <string>/clang/test/Analysis/inlining/path-notes.cpp</string>
  </array>
 </dict>
 </plist>