[zorg] r260119 - Windows handles removing directories differently than other operating systems. Because of this, we need to send a slightly modified command to the shell to correctly execute the Clean step in the ClangAndLLDBuilder.py build factory definition.

[Galina Kistanova via llvm-commits]

Author: gkistanova
Date: Mon Feb  8 12:26:57 2016
New Revision: 260119

URL: http://llvm.org/viewvc/llvm-project?rev=260119&view=rev
Log:
Windows handles removing directories differently than other operating systems.  Because of this, we need to send a slightly modified command to the shell to correctly execute the Clean step in the ClangAndLLDBuilder.py build factory definition. 

Patch by Mike Edwards.

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=260119&r1=260118&r2=260119&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/ClangAndLLDBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/ClangAndLLDBuilder.py Mon Feb  8 12:26:57 2016
@@ -75,8 +75,11 @@ def getClangAndLLDBuildFactory(
 
     # Clean directory, if requested.
     if clean:
+        shellCommand = ["rm", "-rf", llvm_objdir]
+        if isMSVC:
+            shellCommand = ["rmdir", "/S", "/Q", llvm_objdir]
         f.addStep(ShellCommand(name="rm-llvm_objdir",
-                               command=["rm", "-rf", llvm_objdir],
+                               command=shellCommand,
                                haltOnFailure=True,
                                description=["rm build dir", "llvm"],
                                workdir=".",