maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[analyzer] [tests] [NFC] Remove a fragile tightly-coupled component emulating parser output 

...when we can just use the real parser instead.

Differential Revision: https://reviews.llvm.org/D43098

llvm-svn: 324759
This commit is contained in:
George Karpenkov 2018-02-09 18:39:47 +00:00
parent d75805e0e9
commit fc782a341a
2 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
clang/utils/analyzer/CmpRuns.py
View File

@ -102,20 +102,6 @@ class AnalysisDiagnostic:
return self._data return self._data
class CmpOptions:
"""
Fake output of option parser with manually constructed options.
"""
def __init__(self, verboseLog=None, rootA="", rootB=""):
self.rootA = rootA
self.rootB = rootB
self.verboseLog = verboseLog
self.relative_path_histogram = False
self.relative_log_path_histogram = False
self.absolute_path_histogram = False
class AnalysisReport: class AnalysisReport:
def __init__(self, run, files): def __init__(self, run, files):
self.run = run self.run = run
@ -322,9 +308,7 @@ def dumpScanBuildResultsDiff(dirA, dirB, opts, deleteEmpty=True):
return foundDiffs, len(resultsA.diagnostics), len(resultsB.diagnostics) return foundDiffs, len(resultsA.diagnostics), len(resultsB.diagnostics)
def generate_option_parser():
def main():
from optparse import OptionParser
parser = OptionParser("usage: %prog [options] [dir A] [dir B]") parser = OptionParser("usage: %prog [options] [dir A] [dir B]")
parser.add_option("", "--rootA", dest="rootA", parser.add_option("", "--rootA", dest="rootA",
help="Prefix to ignore on source files for directory A", help="Prefix to ignore on source files for directory A",
@ -334,24 +318,29 @@ def main():
action="store", type=str, default="") action="store", type=str, default="")
parser.add_option("", "--verbose-log", dest="verboseLog", parser.add_option("", "--verbose-log", dest="verboseLog",
help="Write additional information to LOG \ help="Write additional information to LOG \
[default=None]", [default=None]",
action="store", type=str, default=None, action="store", type=str, default=None,
metavar="LOG") metavar="LOG")
parser.add_option("--relative-path-differences-histogram", parser.add_option("--relative-path-differences-histogram",
action="store_true", dest="relative_path_histogram", action="store_true", dest="relative_path_histogram",
default=False, default=False,
help="Show histogram of relative paths differences. \ help="Show histogram of relative paths differences. \
Requires matplotlib") Requires matplotlib")
parser.add_option("--relative-log-path-differences-histogram", parser.add_option("--relative-log-path-differences-histogram",
action="store_true", dest="relative_log_path_histogram", action="store_true", dest="relative_log_path_histogram",
default=False, default=False,
help="Show histogram of log relative paths differences. \ help="Show histogram of log relative paths differences. \
Requires matplotlib") Requires matplotlib")
parser.add_option("--absolute-path-differences-histogram", parser.add_option("--absolute-path-differences-histogram",
action="store_true", dest="absolute_path_histogram", action="store_true", dest="absolute_path_histogram",
default=False, default=False,
help="Show histogram of absolute paths differences. \ help="Show histogram of absolute paths differences. \
Requires matplotlib") Requires matplotlib")
return parser
def main():
parser = generate_option_parser()
(opts, args) = parser.parse_args() (opts, args) = parser.parse_args()
if len(args) != 2: if len(args) != 2:

3
clang/utils/analyzer/SATestBuild.py
View File

@ -566,7 +566,8 @@ def runCmpResults(Dir, Strictness=0):
RefDir, NewDir)) RefDir, NewDir))
PatchedSourceDirPath = os.path.join(Dir, PatchedSourceDirName) PatchedSourceDirPath = os.path.join(Dir, PatchedSourceDirName)
Opts = CmpRuns.CmpOptions(rootA="", rootB=PatchedSourceDirPath) Opts, Args = CmpRuns.generate_option_parser().parse_args(
["", PatchedSourceDirPath])
# Scan the results, delete empty plist files. # Scan the results, delete empty plist files.
NumDiffs, ReportsInRef, ReportsInNew = \ NumDiffs, ReportsInRef, ReportsInNew = \
CmpRuns.dumpScanBuildResultsDiff(RefDir, NewDir, Opts, False) CmpRuns.dumpScanBuildResultsDiff(RefDir, NewDir, Opts, False)