[zorg] r263728 - Try to make taskkill exit successfully if there are no stale processes

[Reid Kleckner via llvm-commits]

Author: rnk
Date: Thu Mar 17 12:17:32 2016
New Revision: 263728

URL: http://llvm.org/viewvc/llvm-project?rev=263728&view=rev
Log:
Try to make taskkill exit successfully if there are no stale processes

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

Modified: zorg/trunk/zorg/buildbot/builders/SanitizerBuilderWindows.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/SanitizerBuilderWindows.py?rev=263728&r1=263727&r2=263728&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/SanitizerBuilderWindows.py (original)
+++ zorg/trunk/zorg/buildbot/builders/SanitizerBuilderWindows.py Thu Mar 17 12:17:32 2016
@@ -49,9 +49,10 @@ def getSanitizerWindowsBuildFactory(
     # stale processes, the build will fail during linking. This can happen to
     # any process, but it is most likely to happen to llvm-symbolizer if its
     # pipe isn't closed.
+    taskkill_cmd = 'taskkill /f /im llvm-symbolizer || exit /b 0'
     f.addStep(ShellCommand(name='taskkill',
                            description='kill stale processes',
-                           command=['taskkill', '/f', '/im', 'llvm-symbolizer'],
+                           command=['cmd', '/c', taskkill_cmd],
                            haltOnFailure=False))
 
     # Determine Slave Environment and Set MSVC environment.