[zorg] r301675 - Added support for the 'clean' property.

[Galina Kistanova via llvm-commits]

Author: gkistanova
Date: Fri Apr 28 15:16:33 2017
New Revision: 301675

URL: http://llvm.org/viewvc/llvm-project?rev=301675&view=rev
Log:
Added support for the 'clean' property.

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

Modified: zorg/trunk/zorg/buildbot/builders/Libiomp5Builder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/Libiomp5Builder.py?rev=301675&r1=301674&r2=301675&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/Libiomp5Builder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/Libiomp5Builder.py Fri Apr 28 15:16:33 2017
@@ -50,13 +50,15 @@ def getLibompCMakeBuildFactory(clean=Tru
                       workdir='%s/tools/clang' % llvm_srcdir))
 
     # Clean directory, if requested.
-    if clean:
-        f.addStep(ShellCommand(name="clean",
-                               command=["rm", "-rf",openmp_builddir,llvm_builddir],
-                               warnOnFailure=True,
-                               description=["clean"],
-                               workdir='.',
-                               env=merged_env))
+    cleanBuildRequested = lambda step: clean or step.build.getProperty("clean")
+
+    f.addStep(ShellCommand(name="clean",
+                           command=["rm", "-rf",openmp_builddir,llvm_builddir],
+                           warnOnFailure=True,
+                           description=["clean"],
+                           doStepIf=cleanBuildRequested,
+                           workdir='.',
+                           env=merged_env))
 
     # CMake llvm
     f.addStep(ShellCommand(name='cmake llvm',