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

[george.karpenkov]

Summary

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

[NoQ]

Yeah, this trick is nicer than the old one.

utils/analyzer/CmpRuns.py

def getReadableName(self):
                                        self.getDescription())
 
     # Note, the data format is not an API and may change from one analyzer
     # version to another.
     def getRawData(self):
         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:
     def __init__(self, run, files):
         self.run = run
         self.files = files
         self.diagnostics = []
 
 
 class AnalysisRun:
def dumpScanBuildResultsDiff(dirA, dirB, opts, deleteEmpty=True):
     print "TOTAL ADDED: %r" % totalAdded
     print "TOTAL REMOVED: %r" % totalRemoved
     if auxLog:
         print >>auxLog, "('TOTAL NEW REPORTS', %r)" % TotalReports
         print >>auxLog, "('TOTAL DIFFERENCES', %r)" % foundDiffs
 
     return foundDiffs, len(resultsA.diagnostics), len(resultsB.diagnostics)
 
-
-def main():
-    from optparse import OptionParser
+def generate_option_parser():
     parser = OptionParser("usage: %prog [options] [dir A] [dir B]")
     parser.add_option("", "--rootA", dest="rootA",
                       help="Prefix to ignore on source files for directory A",
                       action="store", type=str, default="")
     parser.add_option("", "--rootB", dest="rootB",
                       help="Prefix to ignore on source files for directory B",
                       action="store", type=str, default="")
     parser.add_option("", "--verbose-log", dest="verboseLog",
                       help="Write additional information to LOG \
                            [default=None]",
                       action="store", type=str, default=None,
                       metavar="LOG")
     parser.add_option("--relative-path-differences-histogram",
                       action="store_true", dest="relative_path_histogram",
                       default=False,
                       help="Show histogram of relative paths differences. \
                             Requires matplotlib")
     parser.add_option("--relative-log-path-differences-histogram",
                       action="store_true", dest="relative_log_path_histogram",
                       default=False,
                       help="Show histogram of log relative paths differences. \
                             Requires matplotlib")
     parser.add_option("--absolute-path-differences-histogram",
                       action="store_true", dest="absolute_path_histogram",
                       default=False,
                       help="Show histogram of absolute paths differences. \
                             Requires matplotlib")
+    return parser
+
+
+def main():
+    parser = generate_option_parser()
     (opts, args) = parser.parse_args()
 
     if len(args) != 2:
         parser.error("invalid number of arguments")
 
     dirA, dirB = args
 
     dumpScanBuildResultsDiff(dirA, dirB, opts)
 
 
 if __name__ == '__main__':
     main()

utils/analyzer/SATestBuild.py

for P in PairList:
         NewDir = P[1]
 
         assert(RefDir != NewDir)
         if Verbose == 1:
             Local.stdout.write("  Comparing Results: %s %s\n" % (
                                RefDir, NewDir))
 
         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.
         NumDiffs, ReportsInRef, ReportsInNew = \
             CmpRuns.dumpScanBuildResultsDiff(RefDir, NewDir, Opts, False)
         if (NumDiffs > 0):
             Local.stdout.write("Warning: %s differences in diagnostics.\n"
                                % NumDiffs)
         if Strictness >= 2 and NumDiffs > 0:
             Local.stdout.write("Error: Diffs found in strict mode (2).\n")