hubert.reinterpretcast updated this revision to Diff 203706.
hubert.reinterpretcast added a comment.
Update based on review comments, building from rL362877
<https://reviews.llvm.org/rL362877> and D63041 <https://reviews.llvm.org/D63041>
Repository:
rC Clang
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D62949/new/
https://reviews.llvm.org/D62949
Files:
test/Analysis/lit.local.cfg
test/Analysis/unix-fns.c
Index: test/Analysis/unix-fns.c
===================================================================
--- test/Analysis/unix-fns.c
+++ test/Analysis/unix-fns.c
@@ -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: %normalize_plist <%t.plist | diff -u
%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
Index: test/Analysis/lit.local.cfg
===================================================================
--- test/Analysis/lit.local.cfg
+++ test/Analysis/lit.local.cfg
@@ -14,6 +14,14 @@
config.substitutions.append(('%diff_plist',
'diff -u -w -I "<string>/" -I "<string>.:" -I "version"'))
+# Filtering command used by Clang Analyzer tests (when comparing .plist files
+# with reference output)
+config.substitutions.append(('%normalize_plist',
+ "grep -Ev '%s|%s|%s'" %
+ ('^[[:space:]]*<string>.* version .*</string>$',
+ '^[[:space:]]*<string>/.*</string>$',
+ '^[[:space:]]*<string>.:.*</string>$')))
+
# 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\."'''))
Index: test/Analysis/unix-fns.c
===================================================================
--- test/Analysis/unix-fns.c
+++ test/Analysis/unix-fns.c
@@ -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: %normalize_plist <%t.plist | diff -u %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
Index: test/Analysis/lit.local.cfg
===================================================================
--- test/Analysis/lit.local.cfg
+++ test/Analysis/lit.local.cfg
@@ -14,6 +14,14 @@
config.substitutions.append(('%diff_plist',
'diff -u -w -I "<string>/" -I "<string>.:" -I "version"'))
+# Filtering command used by Clang Analyzer tests (when comparing .plist files
+# with reference output)
+config.substitutions.append(('%normalize_plist',
+ "grep -Ev '%s|%s|%s'" %
+ ('^[[:space:]]*<string>.* version .*</string>$',
+ '^[[:space:]]*<string>/.*</string>$',
+ '^[[:space:]]*<string>.:.*</string>$')))
+
# 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\."'''))
_______________________________________________
cfe-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
