[PATCH] [zorg] Adjusting Clean Step in ClangAndLLDBuilder.py

[Mike Edwards via llvm-commits]

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,
Hi, would you please review this patch and apply it when you have time.

Thanks,
Mike
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20160208/99072fac/attachment.html>
-------------- next part --------------
Index: zorg/buildbot/builders/ClangAndLLDBuilder.py
===================================================================
--- zorg/buildbot/builders/ClangAndLLDBuilder.py	(revision 260115)
+++ zorg/buildbot/builders/ClangAndLLDBuilder.py	(working copy)
@@ -75,8 +75,11 @@
 
     # 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=".",