Author: dcoughlin Date: Tue Sep 15 20:52:32 2015 New Revision: 247767 URL: http://llvm.org/viewvc/llvm-project?rev=247767&view=rev Log: [analyzer] SATestBuild.py: Move additional checkers logic so SATestAdd.py can use it as well.
Move the logic looking for additional checkers in the SA_ADDITIONAL_CHECKERS environmental variable from SATestBuild's main() to runScanBuild(). This allows SATestAdd.py to use the variable as well. Without it, we won't include additional checkers when building reference results for the build bot. Differential Revision: http://reviews.llvm.org/D12891 Modified: cfe/trunk/utils/analyzer/SATestBuild.py Modified: cfe/trunk/utils/analyzer/SATestBuild.py URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/utils/analyzer/SATestBuild.py?rev=247767&r1=247766&r2=247767&view=diff ============================================================================== --- cfe/trunk/utils/analyzer/SATestBuild.py (original) +++ cfe/trunk/utils/analyzer/SATestBuild.py Tue Sep 15 20:52:32 2015 @@ -210,9 +210,14 @@ def runScanBuild(Dir, SBOutputDir, PBuil if not os.path.exists(BuildScriptPath): print "Error: build script is not defined: %s" % BuildScriptPath sys.exit(-1) + + AllCheckers = Checkers + if os.environ.has_key('SA_ADDITIONAL_CHECKERS'): + AllCheckers = AllCheckers + ',' + os.environ['SA_ADDITIONAL_CHECKERS'] + SBOptions = "--use-analyzer " + Clang + " " SBOptions += "-plist-html -o " + SBOutputDir + " " - SBOptions += "-enable-checker " + Checkers + " " + SBOptions += "-enable-checker " + AllCheckers + " " SBOptions += "--keep-empty " # Always use ccc-analyze to ensure that we can locate the failures # directory. @@ -614,7 +619,4 @@ if __name__ == '__main__': IsReference = True UpdateSVN = True - if os.environ.has_key('SA_ADDITIONAL_CHECKERS'): - Checkers = Checkers + ',' + os.environ['SA_ADDITIONAL_CHECKERS'] - testAll(IsReference, UpdateSVN, Strictness) _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
