[zorg] r183691 - Patch by Alexey Samsonov!

[Galina Kistanova]

Author: gkistanova
Date: Mon Jun 10 15:27:23 2013
New Revision: 183691

URL: http://llvm.org/viewvc/llvm-project?rev=183691&view=rev
Log:
Patch by Alexey Samsonov!
Added builder and slave for running sanitizer tests.

Modified:
    zorg/trunk/buildbot/osuosl/master/config/builders.py
    zorg/trunk/buildbot/osuosl/master/config/slaves.py
    zorg/trunk/buildbot/osuosl/master/master.cfg

Modified: zorg/trunk/buildbot/osuosl/master/config/builders.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/config/builders.py?rev=183691&r1=183690&r2=183691&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Mon Jun 10 15:27:23 2013
@@ -42,6 +42,10 @@ from zorg.buildbot.builders import Clang
 reload(ClangAndLLDBuilder)
 from zorg.buildbot.builders import ClangAndLLDBuilder
 
+from zorg.buildbot.builders import SanitizerBuilder
+reload(SanitizerBuilder)
+from zorg.buildbot.builders import SanitizerBuilder
+
 from buildbot.steps.source import SVN
 
 # Plain LLVM builders.
@@ -597,6 +601,15 @@ def _get_lld_builders():
          'category'   : 'lld'},
          ]
 
+# Sanitizer builders.
+def _get_sanitizer_builders():
+      return [
+          {'name': "sanitizer-x86_64-linux",
+           'slavenames' :["sanitizer-buildbot1"],
+           'builddir': "sanitizer-x86_64-linux",
+           'factory': SanitizerBuilder.getSanitizerBuildFactory()},
+          ]
+
 # Experimental and stopped builders
 def _get_experimental_builders():
 
@@ -709,6 +722,10 @@ def get_builders():
         b['category'] = 'lldb'
         yield b
 
+    for b in _get_sanitizer_builders():
+        b['category'] = 'sanitizer'
+        yield b
+
     for b in _get_experimental_builders():
         yield b
 

Modified: zorg/trunk/buildbot/osuosl/master/config/slaves.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/config/slaves.py?rev=183691&r1=183690&r2=183691&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/slaves.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/slaves.py Mon Jun 10 15:27:23 2013
@@ -199,6 +199,9 @@ def get_build_slaves():
         # Aarch64 Foundation Model
         create_slave("aarch64-foundation", properties={'jobs': 4}, max_builds=1),
 
+        # Ubuntu x86-64, 12x Intel(R) Xeon(R) CPU X5650 @ 2.67GHz
+        create_slave("sanitizer-buildbot1", properties={'jobs': 8}, max_builds=1),
+
         # Defunct.
         # Pentium Dual CPU T3400 @ 2.1GHz
         #create_slave("dumitrescu1", properties={'jobs' : 2}, max_builds=1),

Modified: zorg/trunk/buildbot/osuosl/master/master.cfg
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/master.cfg?rev=183691&r1=183690&r2=183691&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/master.cfg (original)
+++ zorg/trunk/buildbot/osuosl/master/master.cfg Mon Jun 10 15:27:23 2013
@@ -160,6 +160,14 @@ c['schedulers'].append(SingleBranchSched
                                 "cfe",
                                 "lldb"])))
 
+c['schedulers'].append(SingleBranchScheduler(name="sanitizer_scheduler",
+                            treeStableTimer=2*60,
+                            builderNames=get_all_for("sanitizer"),
+                            change_filter=depends_on([
+                                "llvm",
+                                "cfe",
+                                "compiler-rt"])))
+
 ####### PROJECT IDENTITY
 
 c['title'] = "LLVM"