[zorg] r248766 - Made "nice" command optional for builders which could handle the load.

[Galina Kistanova via llvm-commits]

Author: gkistanova
Date: Mon Sep 28 19:18:50 2015
New Revision: 248766

URL: http://llvm.org/viewvc/llvm-project?rev=248766&view=rev
Log:
Made "nice" command optional for builders which could handle the load.

Modified:
    zorg/trunk/buildbot/osuosl/master/config/builders.py
    zorg/trunk/zorg/buildbot/builders/ClangAndLLDBuilder.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=248766&r1=248765&r2=248766&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Mon Sep 28 19:18:50 2015
@@ -137,6 +137,7 @@ def _get_clang_fast_builders():
                                         "-DLLVM_TOOL_COMPILER_RT_BUILD:BOOL=OFF",
                                         "-DLLVM_TARGETS_TO_BUILD=X86"],
                      triple="x86_64-scei-ps4",
+                     prefixCommand=None, # This is a designaed builder, so no need to be nice.
                      env={'PATH':'/opt/llvm_37/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'})},
 
         ]

Modified: zorg/trunk/zorg/buildbot/builders/ClangAndLLDBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/ClangAndLLDBuilder.py?rev=248766&r1=248765&r2=248766&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/ClangAndLLDBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/ClangAndLLDBuilder.py Mon Sep 28 19:18:50 2015
@@ -16,7 +16,9 @@ def getClangAndLLDBuildFactory(
            extraCmakeOptions=None,
            extraCompilerOptions=None,
            buildWithSanitizerOptions=None,
-           triple=None):
+           triple=None,
+           prefixCommand=["nice", "-n", "10"] # For backward compatibility.
+    ):
 
     llvm_srcdir = "llvm.src"
     llvm_objdir = "llvm.obj"
@@ -140,7 +142,7 @@ def getClangAndLLDBuildFactory(
 
     # Build everything.
     f.addStep(NinjaCommand(name="build",
-                           prefixCommand=["nice", "-n", "10"],
+                           prefixCommand=prefixCommand,
                            haltOnFailure=True,
                            description=["build"],
                            workdir=llvm_objdir,
@@ -148,7 +150,7 @@ def getClangAndLLDBuildFactory(
 
     # Test everything.
     f.addStep(NinjaCommand(name="test",
-                           prefixCommand=["nice", "-n", "10"],
+                           prefixCommand=prefixCommand,
                            targets=["check-all"],
                            haltOnFailure=True,
                            description=["test"],