From a932c8745c778b03ffb8f6e7fb2e7d8134d40be3 Mon Sep 17 00:00:00 2001 From: George Karpenkov Date: Wed, 25 Oct 2017 21:49:46 +0000 Subject: [PATCH] [Analyzer] [Tests] Do not discard output from CmpRuns.py when running integration tests 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. llvm-svn: 316618 --- clang/utils/analyzer/SATestBuild.py | 8 +------- clang/utils/analyzer/SATestUtils.py | 8 -------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/clang/utils/analyzer/SATestBuild.py b/clang/utils/analyzer/SATestBuild.py index 5853cf438af5..2cf02ea64afd 100755 --- a/clang/utils/analyzer/SATestBuild.py +++ b/clang/utils/analyzer/SATestBuild.py @@ -526,17 +526,11 @@ def runCmpResults(Dir, Strictness=0): 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,) + print "Warning: %s differences in diagnostics." % NumDiffs if Strictness >= 2 and NumDiffs > 0: print "Error: Diffs found in strict mode (2)." TestsPassed = False diff --git a/clang/utils/analyzer/SATestUtils.py b/clang/utils/analyzer/SATestUtils.py index 961ebfac1322..9220acc1bdbe 100644 --- a/clang/utils/analyzer/SATestUtils.py +++ b/clang/utils/analyzer/SATestUtils.py @@ -93,14 +93,6 @@ def runScript(ScriptPath, PBuildLogFile, Cwd): 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. -- 2.34.1