perfetto: don't try to kill mspdbsrv
As we are actually building using clang-cl.exe rather than cl.exe, we
don't actually startup this process so don't try and kill it.
Change-Id: Iac61374d9eceb8ebaf7773b97f66cf412b884c10
Bug: 177349647
diff --git a/infra/luci/recipe_modules/windows_sdk/api.py b/infra/luci/recipe_modules/windows_sdk/api.py
index 5bd1c8a..921f37a 100644
--- a/infra/luci/recipe_modules/windows_sdk/api.py
+++ b/infra/luci/recipe_modules/windows_sdk/api.py
@@ -39,16 +39,10 @@
yield
return
- try:
- with self.m.context(infra_steps=True):
- sdk_dir = self._ensure_sdk()
- with self.m.context(**self._sdk_env(sdk_dir)):
- yield
- finally:
- # cl.exe automatically starts background mspdbsrv.exe daemon which
- # needs to be manually stopped so Swarming can tidy up after itself.
- self.m.step('taskkill mspdbsrv',
- ['taskkill.exe', '/f', '/t', '/im', 'mspdbsrv.exe'])
+ with self.m.context(infra_steps=True):
+ sdk_dir = self._ensure_sdk()
+ with self.m.context(**self._sdk_env(sdk_dir)):
+ yield
def _ensure_sdk(self):
"""Ensures the Windows SDK CIPD package is installed.
diff --git a/infra/luci/recipe_modules/windows_sdk/examples/full.expected/win.json b/infra/luci/recipe_modules/windows_sdk/examples/full.expected/win.json
index f6c937f..b325275 100644
--- a/infra/luci/recipe_modules/windows_sdk/examples/full.expected/win.json
+++ b/infra/luci/recipe_modules/windows_sdk/examples/full.expected/win.json
@@ -93,16 +93,6 @@
"name": "ninja"
},
{
- "cmd": [
- "taskkill.exe",
- "/f",
- "/t",
- "/im",
- "mspdbsrv.exe"
- ],
- "name": "taskkill mspdbsrv"
- },
- {
"name": "$result"
}
]
\ No newline at end of file
diff --git a/infra/luci/recipes/perfetto.expected/ci_win.json b/infra/luci/recipes/perfetto.expected/ci_win.json
index 1efd91e..ff77115 100644
--- a/infra/luci/recipes/perfetto.expected/ci_win.json
+++ b/infra/luci/recipes/perfetto.expected/ci_win.json
@@ -172,17 +172,6 @@
"name": "ninja"
},
{
- "cmd": [
- "taskkill.exe",
- "/f",
- "/t",
- "/im",
- "mspdbsrv.exe"
- ],
- "cwd": "[CACHE]\\builder\\perfetto",
- "name": "taskkill mspdbsrv"
- },
- {
"name": "$result"
}
]
\ No newline at end of file
