From bfef399519ca9b8a4b4c6b563253bad7e0eeffe0 Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Sun, 22 Dec 2013 00:07:40 +0000 Subject: Vendor import of clang release_34 branch r197841 (effectively, 3.4 RC3): https://llvm.org/svn/llvm-project/cfe/branches/release_34@197841 --- utils/analyzer/SATestBuild.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'utils/analyzer') diff --git a/utils/analyzer/SATestBuild.py b/utils/analyzer/SATestBuild.py index e119155a9b46..51bc6e259378 100644 --- a/utils/analyzer/SATestBuild.py +++ b/utils/analyzer/SATestBuild.py @@ -208,10 +208,14 @@ def runScanBuild(Dir, SBOutputDir, PBuildLogFile): SBOptions += "-plist-html -o " + SBOutputDir + " " SBOptions += "-enable-checker " + Checkers + " " SBOptions += "--keep-empty " + # Always use ccc-analyze to ensure that we can locate the failures + # directory. + SBOptions += "--override-compiler " try: SBCommandFile = open(BuildScriptPath, "r") SBPrefix = "scan-build " + SBOptions + " " for Command in SBCommandFile: + Command = Command.strip() # If using 'make', auto imply a -jX argument # to speed up analysis. xcodebuild will # automatically use the maximum number of cores. @@ -410,8 +414,10 @@ def runCmpResults(Dir): RefList = glob.glob(RefDir + "/*") NewList = glob.glob(NewDir + "/*") - # Log folders are also located in the results dir, so ignore them. - RefList.remove(os.path.join(RefDir, LogFolderName)) + # Log folders are also located in the results dir, so ignore them. + RefLogDir = os.path.join(RefDir, LogFolderName) + if RefLogDir in RefList: + RefList.remove(RefLogDir) NewList.remove(os.path.join(NewDir, LogFolderName)) if len(RefList) == 0 or len(NewList) == 0: -- cgit v1.2.3