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

[Devin Coughlin via cfe-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL247767: [analyzer] SATestBuild.py: Move additional checkers 
logic so SATestAdd.py can… (authored by dcoughlin).

Changed prior to commit:
  http://reviews.llvm.org/D12891?vs=34853=34864#toc

Repository:
  rL LLVM

http://reviews.llvm.org/D12891

Files:
  cfe/trunk/utils/analyzer/SATestBuild.py

Index: cfe/trunk/utils/analyzer/SATestBuild.py
===
--- cfe/trunk/utils/analyzer/SATestBuild.py
+++ cfe/trunk/utils/analyzer/SATestBuild.py
@@ -210,9 +210,14 @@
 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 @@
 IsReference = True
 UpdateSVN = True
 
-if os.environ.has_key('SA_ADDITIONAL_CHECKERS'):
-Checkers = Checkers + ',' + os.environ['SA_ADDITIONAL_CHECKERS']
-
 testAll(IsReference, UpdateSVN, Strictness)


Index: cfe/trunk/utils/analyzer/SATestBuild.py
===
--- cfe/trunk/utils/analyzer/SATestBuild.py
+++ cfe/trunk/utils/analyzer/SATestBuild.py
@@ -210,9 +210,14 @@
 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 @@
 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

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

[Devin Coughlin via cfe-commits]

dcoughlin created this revision.
dcoughlin added reviewers: xazax.hun, zaks.anna.
dcoughlin added a subscriber: cfe-commits.

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.

http://reviews.llvm.org/D12891

Files:
  utils/analyzer/SATestBuild.py

Index: utils/analyzer/SATestBuild.py
===
--- utils/analyzer/SATestBuild.py
+++ utils/analyzer/SATestBuild.py
@@ -210,9 +210,14 @@
 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 @@
 IsReference = True
 UpdateSVN = True
 
-if os.environ.has_key('SA_ADDITIONAL_CHECKERS'):
-Checkers = Checkers + ',' + os.environ['SA_ADDITIONAL_CHECKERS']
-
 testAll(IsReference, UpdateSVN, Strictness)


Index: utils/analyzer/SATestBuild.py
===
--- utils/analyzer/SATestBuild.py
+++ utils/analyzer/SATestBuild.py
@@ -210,9 +210,14 @@
 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 @@
 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