diff options
| -rwxr-xr-x | clang/utils/analyzer/SATestBuild.py | 15 | ||||
| -rw-r--r-- | clang/utils/analyzer/SATestUtils.py | 14 |
2 files changed, 6 insertions, 23 deletions
diff --git a/clang/utils/analyzer/SATestBuild.py b/clang/utils/analyzer/SATestBuild.py index 1c96cd88381..691ded80a1e 100755 --- a/clang/utils/analyzer/SATestBuild.py +++ b/clang/utils/analyzer/SATestBuild.py @@ -343,18 +343,13 @@ def runAnalyzePreprocessed(Args, Dir, SBOutputDir, Mode): BuildScript)) raise Exception() - CmdPrefix = Clang + " -cc1 " + CmdPrefix = Clang + " --analyze " - # For now, we assume the preprocessed files should be analyzed - # with the OS X SDK. - SDKPath = SATestUtils.getSDKPath("macosx") - if SDKPath is not None: - CmdPrefix += "-isysroot " + SDKPath + " " - - CmdPrefix += "-analyze -analyzer-output=plist -w " - CmdPrefix += "-analyzer-checker=" + Checkers + CmdPrefix += "--analyzer-output plist " + CmdPrefix += " -Xclang -analyzer-checker=" + Checkers CmdPrefix += " -fcxx-exceptions -fblocks " - CmdPrefix += " -analyzer-config %s " % generateAnalyzerConfig(Args) + CmdPrefix += " -Xclang -analyzer-config -Xclang %s "\ + % generateAnalyzerConfig(Args) if (Mode == 2): CmdPrefix += "-std=c++11 " diff --git a/clang/utils/analyzer/SATestUtils.py b/clang/utils/analyzer/SATestUtils.py index 2320652619e..0ed4a4b02f7 100644 --- a/clang/utils/analyzer/SATestUtils.py +++ b/clang/utils/analyzer/SATestUtils.py @@ -1,5 +1,5 @@ import os -from subprocess import check_output, check_call +from subprocess import check_call import sys @@ -47,18 +47,6 @@ def isValidSingleInputFile(FileName): return Ext in (".i", ".ii", ".c", ".cpp", ".m", "") -def getSDKPath(SDKName): - """ - Get the path to the SDK for the given SDK name. Returns None if - the path cannot be determined. - """ - if which("xcrun") is None: - return None - - Cmd = "xcrun --sdk " + SDKName + " --show-sdk-path" - return check_output(Cmd, shell=True).rstrip() - - def runScript(ScriptPath, PBuildLogFile, Cwd, Stdout=sys.stdout, Stderr=sys.stderr): """ |
