[zorg] r285373 - Reverted r285335, as some of recent Windows buildslaves do not handle RemoveDirectory well.

[Galina Kistanova via llvm-commits]

Author: gkistanova
Date: Thu Oct 27 20:18:05 2016
New Revision: 285373

URL: http://llvm.org/viewvc/llvm-project?rev=285373&view=rev
Log:
Reverted r285335, as some of recent Windows buildslaves do not handle RemoveDirectory well.

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

Modified: zorg/trunk/zorg/buildbot/builders/ClangAndLLDBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/ClangAndLLDBuilder.py?rev=285373&r1=285372&r2=285373&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/ClangAndLLDBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/ClangAndLLDBuilder.py Thu Oct 27 20:18:05 2016
@@ -6,7 +6,6 @@ from buildbot.steps.source import SVN
 from buildbot.steps.shell import ShellCommand
 from buildbot.steps.shell import WarningCountingShellCommand
 from buildbot.process.properties import WithProperties
-from buildbot.steps.slave import RemoveDirectory
 from zorg.buildbot.commands.LitTestCommand import LitTestCommand
 from zorg.buildbot.commands.NinjaCommand import NinjaCommand
 
@@ -76,16 +75,16 @@ def getClangAndLLDBuildFactory(
                       workdir='%s/tools/lld' % llvm_srcdir))
 
     # Clean directory, if requested.
-    cleanBuildRequested = lambda step: step.build.getProperty("clean") or clean
-
-    # This is an incremental build, unless otherwise has been requested.
-    # Remove obj and install dirs for a clean build.
-    f.addStep(RemoveDirectory(name='rm-llvm_objdir',
-              dir=llvm_objdir,
-              haltOnFailure=False,
-              flunkOnFailure=False,
-              doStepIf=cleanBuildRequested,
-              ))
+    if clean:
+        shellCommand = ["rm", "-rf", llvm_objdir]
+        if isMSVC:
+            shellCommand = ["rmdir", "/S", "/Q", llvm_objdir]
+        f.addStep(ShellCommand(name="rm-llvm_objdir",
+                               command=shellCommand,
+                               haltOnFailure=False,
+                               description=["rm build dir", "llvm"],
+                               workdir=".",
+                               env=merged_env))
 
     # Create configuration files with cmake.
     options = ["-Wdocumentation", "-Wno-documentation-deprecated-sync"]