[Analyzer] [Tests] Do not discard output from CmpRuns.py when running integration tests

[george.karpenkov]

Summary

Contrary to the deleted comment, in most cases CmpRuns.py produces a fairly small amount of output, which is useful to see straight away to see what has changed when executing the integration tests.

[zaks.anna]

What kind of output will this start displaying?

(I believe currently the script does print the summary of the objects that are added or deleted.)

[george.karpenkov]

@zaks.anna prints "XXX added / XXX removed" for every report which has appeared or disappeared.

utils/analyzer/SATestBuild.py

for P in PairList:
 
         assert(RefDir != NewDir)
         if Verbose == 1:
             print "  Comparing Results: %s %s" % (RefDir, NewDir)
 
         DiffsPath = os.path.join(NewDir, DiffsSummaryFileName)
         PatchedSourceDirPath = os.path.join(Dir, PatchedSourceDirName)
         Opts = CmpRuns.CmpOptions(DiffsPath, "", PatchedSourceDirPath)
-        # Discard everything coming out of stdout
-        # (CmpRun produces a lot of them).
-        OLD_STDOUT = sys.stdout
-        sys.stdout = SATestUtils.Discarder()
         # Scan the results, delete empty plist files.
         NumDiffs, ReportsInRef, ReportsInNew = \
             CmpRuns.dumpScanBuildResultsDiff(RefDir, NewDir, Opts, False)
-        sys.stdout = OLD_STDOUT
         if (NumDiffs > 0):
             print "Warning: %r differences in diagnostics. See %s" % \
                   (NumDiffs, DiffsPath,)
         if Strictness >= 2 and NumDiffs > 0:
             print "Error: Diffs found in strict mode (2)."
             TestsPassed = False
         elif Strictness >= 1 and ReportsInRef != ReportsInNew:
             print "Error: The number of results are different in "\

utils/analyzer/SATestUtils.py

if os.path.exists(ScriptPath):
                        stdout=PBuildLogFile,
                        shell=True)
         except:
             print "Error: Running %s failed. See %s for details." % (
                   ScriptPath, PBuildLogFile.name)
             sys.exit(-1)
 
 
-class Discarder(object):
-    """
-    Auxiliary object to discard stdout.
-    """
-    def write(self, text):
-        pass  # do nothing
-
-
 def isCommentCSVLine(Entries):
     """
     Treat CSV lines starting with a '#' as a comment.
     """
     return len(Entries) > 0 and Entries[0].startswith("#")