diff options
| author | George Karpenkov <ekarpenkov@apple.com> | 2017-10-25 21:49:46 +0000 |
|---|---|---|
| committer | George Karpenkov <ekarpenkov@apple.com> | 2017-10-25 21:49:46 +0000 |
| commit | d67bfb9c5a824cda77728809d0e86fce71c364ae (patch) | |
| tree | bfdb15dddc2388990e936231d2dd2b29e365d124 /utils | |
| parent | a535f1e292c1266239723115754e4060d25f2ffb (diff) | |
[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.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@316618 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'utils')
| -rwxr-xr-x | utils/analyzer/SATestBuild.py | 8 | ||||
| -rw-r--r-- | utils/analyzer/SATestUtils.py | 8 |
2 files changed, 1 insertions, 15 deletions
diff --git a/utils/analyzer/SATestBuild.py b/utils/analyzer/SATestBuild.py index 5853cf438a..2cf02ea64a 100755 --- a/utils/analyzer/SATestBuild.py +++ b/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/utils/analyzer/SATestUtils.py b/utils/analyzer/SATestUtils.py index 961ebfac13..9220acc1bd 100644 --- a/utils/analyzer/SATestUtils.py +++ b/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. |