[analyzer][tests] Use normalize_plist in place of diff_plist (`tail` cases)

[hubert.reinterpretcast]

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 tail. %diff_plist is then, being unused, removed.

The changes were applied via a script.

[hubert.reinterpretcast]

Update based on review comments, building from rL362877 and D63041

test/Analysis/MismatchedDeallocator-path-notes.cpp

 // RUN: %clang_analyze_cc1 -analyzer-checker=core,unix.MismatchedDeallocator -analyzer-output=text -verify %s
 // RUN: %clang_analyze_cc1 -analyzer-checker=core,unix.MismatchedDeallocator -analyzer-output=plist %s -o %t.plist
-// RUN: tail -n +11 %t.plist | %diff_plist %S/copypaste/Inputs/expected-plists/MismatchedDeallocator-path-notes.cpp.plist -
+// RUN: %normalize_plist <%S/copypaste/Inputs/expected-plists/MismatchedDeallocator-path-notes.cpp.plist >%t.expected.sed.plist && echo >>%t.plist && tail -n +11 %t.plist | %normalize_plist | diff -u %t.expected.sed.plist -
 
 void changePointee(int *p);
 int *allocIntArray(unsigned c) {
   return new int[c]; // expected-note {{Memory is allocated}}
 }
 void test() {
   int *p = allocIntArray(1); // expected-note {{Calling 'allocIntArray'}}
   // expected-note@-1 {{Returned allocated memory}}
   changePointee(p);
   delete p; // expected-warning {{Memory allocated by 'new[]' should be deallocated by 'delete[]', not 'delete'}}
   // expected-note@-1 {{Memory allocated by 'new[]' should be deallocated by 'delete[]', not 'delete'}}
 }

test/Analysis/diagnostics/plist-diagnostics-include-check.cpp

 // RUN: %clang_analyze_cc1 -analyzer-checker=debug.ExprInspection -analyzer-output=plist-multi-file %s -o %t.plist
-// RUN: tail -n +11 %t.plist | %diff_plist %S/Inputs/expected-plists/plist-diagnostics-include-check.cpp.plist -
+// RUN: %normalize_plist <%S/Inputs/expected-plists/plist-diagnostics-include-check.cpp.plist >%t.expected.sed.plist && echo >>%t.plist && tail -n +11 %t.plist | %normalize_plist | diff -u %t.expected.sed.plist -
 
 #include "Inputs/include/plist-diagnostics-include-check-macro.h"
 
 void foo() {
   PlistCheckMacro()
 #define PLIST_DEF_MACRO .run();
 #include "Inputs/include/plist-diagnostics-include-check-macro.def"
 }

test/Analysis/diagnostics/plist-multi-file.c

 // RUN: %clang_analyze_cc1 -analyzer-checker=core -analyzer-output=plist-multi-file -o %t.plist -verify %s
-// RUN: tail -n +11 %t.plist | %diff_plist %S/Inputs/expected-plists/plist-multi-file.c.plist -
+// RUN: %normalize_plist <%S/Inputs/expected-plists/plist-multi-file.c.plist >%t.expected.sed.plist && echo >>%t.plist && tail -n +11 %t.plist | %normalize_plist | diff -u %t.expected.sed.plist -
 
 #include "plist-multi-file.h"
 
 void bar() {
   foo(0);
 }

test/Analysis/lambda-notes.cpp

 // RUN: %clang_analyze_cc1 -std=c++11 -analyzer-checker=core.DivideZero -analyzer-config inline-lambdas=true -analyzer-output plist -verify %s -o %t
-// RUN: tail -n +11 %t | %diff_plist %S/Inputs/expected-plists/lambda-notes.cpp.plist -
+// RUN: %normalize_plist <%S/Inputs/expected-plists/lambda-notes.cpp.plist >%t.expected.sed && echo >>%t && tail -n +11 %t | %normalize_plist | diff -u %t.expected.sed -
 
 
 // Diagnostic inside a lambda
 
 void diagnosticFromLambda() {
   int i = 0;
   [=] {
     int p = 5/i; // expected-warning{{Division by zero}}
     (void)p;
   }();
 }

test/Analysis/lit.local.cfg

 # -*- Python -*- vim: set ft=python ts=4 sw=4 expandtab tw=79:
 
 import site
 
 # Load the custom analyzer test format, which runs the test again with Z3 if it
 # is available.
 site.addsitedir(os.path.dirname(__file__))
 import analyzer_test
 config.test_format = analyzer_test.AnalyzerTest(
         config.test_format.execute_external, config.use_z3_solver)
 
-# 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 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\."'''))
 
 if not config.root.clang_staticanalyzer:
     config.unsupported = True

test/Analysis/malloc-plist.c

 // RUN: rm -f %t
 // RUN: %clang_analyze_cc1 -fblocks -analyzer-checker=core,unix.Malloc -analyzer-output=plist -verify -o %t -analyzer-config eagerly-assume=false %s
-// RUN: tail -n +11 %t | %diff_plist %S/Inputs/expected-plists/malloc-plist.c.plist -
+// RUN: %normalize_plist <%S/Inputs/expected-plists/malloc-plist.c.plist >%t.expected.sed && echo >>%t && tail -n +11 %t | %normalize_plist | diff -u %t.expected.sed -
 
 typedef __typeof(sizeof(int)) size_t;
 void *malloc(size_t);
 void free(void *);
 void *realloc(void *ptr, size_t size);
 
 void diagnosticTest(int in) {
     if (in > 5) {