[zorg] r259982 - Relax the warnings escalation for now, and let ninja decide jobs for lld-x86_64-win7 builder.

[Galina Kistanova via llvm-commits]

Author: gkistanova
Date: Fri Feb  5 22:53:51 2016
New Revision: 259982

URL: http://llvm.org/viewvc/llvm-project?rev=259982&view=rev
Log:
Relax the warnings escalation for now, and let ninja decide jobs for lld-x86_64-win7 builder.

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

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=259982&r1=259981&r2=259982&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Fri Feb  5 22:53:51 2016
@@ -569,7 +569,10 @@ def _get_lld_builders():
         {'name': "lld-x86_64-win7",
          'slavenames' :["as-bldslv4"],
          'builddir':"lld-x86_64-win7",
-         'factory': LLDBuilder.getLLDWinBuildFactory(),
+         'factory': LLDBuilder.getLLDWinBuildFactory(
+                        extra_configure_args = [
+                          '-DLLVM_ENABLE_WERROR=OFF'
+                        ]),
          'category'   : 'lld'},
 
         {'name': "lld-x86_64-freebsd",

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=259982&r1=259981&r2=259982&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/slaves.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/slaves.py Fri Feb  5 22:53:51 2016
@@ -11,7 +11,7 @@ def create_slave(name, *args, **kwargs):
 def get_build_slaves():
     return [
         # Windows 7 Professional x64
-        create_slave("as-bldslv4", properties={'jobs' : 2}, max_builds=1),
+        create_slave("as-bldslv4"),
 
         # FreeBSD 11.0-CURRENT
         create_slave("as-bldslv5", properties={'jobs' : 24}, max_builds=2),