[analyzer] SATestBuild.py: Move additional checkers logic so SATestAdd.py can use it as well.

[dcoughlin]

Summary

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.

cfe/trunk/utils/analyzer/SATestBuild.py

 
 # Build the project with scan-build by reading in the commands and
 # prefixing them with the scan-build options.
 def runScanBuild(Dir, SBOutputDir, PBuildLogFile):
     BuildScriptPath = os.path.join(Dir, BuildScript)
     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.
     SBOptions += "--override-compiler "
     try:
         SBCommandFile = open(BuildScriptPath, "r")
         SBPrefix = "scan-build " + SBOptions + " "
         for Command in SBCommandFile:
if __name__ == '__main__':
     UpdateSVN = False
     Strictness = Args.strictness
     if Args.regenerate:
         IsReference = True
     elif Args.update_reference:
         IsReference = True
         UpdateSVN = True
 
-    if os.environ.has_key('SA_ADDITIONAL_CHECKERS'):
-        Checkers = Checkers + ',' + os.environ['SA_ADDITIONAL_CHECKERS']
-
     testAll(IsReference, UpdateSVN, Strictness)