[zorg] r261414 - Added few missing things to ClangLTOBuilder3Stage builder.

Galina Kistanova via llvm-commits llvm-commits at lists.llvm.org
Fri Feb 19 20:54:25 PST 2016


Author: gkistanova
Date: Fri Feb 19 22:54:25 2016
New Revision: 261414

URL: http://llvm.org/viewvc/llvm-project?rev=261414&view=rev
Log:
Added few missing things to ClangLTOBuilder3Stage builder.

Modified:
    zorg/trunk/zorg/buildbot/builders/ClangLTOBuilder3Stage.py

Modified: zorg/trunk/zorg/buildbot/builders/ClangLTOBuilder3Stage.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/ClangLTOBuilder3Stage.py?rev=261414&r1=261413&r2=261414&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/ClangLTOBuilder3Stage.py (original)
+++ zorg/trunk/zorg/buildbot/builders/ClangLTOBuilder3Stage.py Fri Feb 19 22:54:25 2016
@@ -4,6 +4,7 @@ from buildbot.steps.shell import ShellCo
 from buildbot.steps.shell import WarningCountingShellCommand
 from buildbot.process.factory import BuildFactory
 from buildbot.process.properties import WithProperties
+from zorg.buildbot.commands.NinjaCommand import NinjaCommand
 
 def get3StageClangLTOBuildFactory(
            clean=True,
@@ -59,13 +60,15 @@ def get3StageClangLTOBuildFactory(
     # Clean directory, if requested.
     cleanBuildRequested = lambda step: step.build.getProperty("clean") or clean
     f.addStep(
-        doStepIf=cleanBuildRequested,
-        name="rm-llvm_objdir",
-        command=["rm", "-rf", llvm_objdir],
-        haltOnFailure=True,
-        description=["rm build dir", "llvm"],
-        workdir=".",
-        env=merged_env
+        ShellCommand(
+            doStepIf=cleanBuildRequested,
+            name="rm-llvm_objdir",
+            command=["rm", "-rf", llvm_objdir],
+            haltOnFailure=True,
+            description=["rm build dir", "llvm"],
+            workdir=".",
+            env=merged_env
+        )
     )
 
     cmake_command = ["cmake"]




More information about the llvm-commits mailing list