Switch Windows ANGLE bots to GN.
CQ_INCLUDE_TRYBOTS=master.client.skia.compile:Build-Win-MSVC-x86-Debug-ANGLE-Trybot;master.client.skia:Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE-Trybot
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=3539
Change-Id: I076c4c5972344b6688d648a8ea5e5618e87fd88d
Reviewed-on: https://skia-review.googlesource.com/3539
Commit-Queue: Mike Klein <mtklein@chromium.org>
Reviewed-by: Mike Klein <mtklein@chromium.org>
diff --git a/gn/BUILD.gn b/gn/BUILD.gn
index c972735..0ea41a8 100644
--- a/gn/BUILD.gn
+++ b/gn/BUILD.gn
@@ -455,7 +455,7 @@
tool("copy") {
cp_py = rebase_path("cp.py")
- command = "python.exe $cp_py {{source}} {{output}}"
+ command = "python.bat $cp_py {{source}} {{output}}"
description = "copy {{source}} {{output}}"
}
}
diff --git a/infra/bots/recipe_modules/flavor/default_flavor.py b/infra/bots/recipe_modules/flavor/default_flavor.py
index 64f35f1..9b148f4 100644
--- a/infra/bots/recipe_modules/flavor/default_flavor.py
+++ b/infra/bots/recipe_modules/flavor/default_flavor.py
@@ -104,41 +104,16 @@
"""Path to a checkout of Chrome on this machine."""
return self._win_toolchain_dir.join('src')
- def bootstrap_win_toolchain(self):
- """Run bootstrapping script for the Windows toolchain."""
- bootstrap_script = self.m.vars.infrabots_dir.join(
- 'bootstrap_win_toolchain_json.py')
- win_toolchain_json = self._win_toolchain_dir.join(
- 'src', 'build', 'win_toolchain.json')
- self.m.python(
- 'bootstrap win toolchain',
- script=bootstrap_script,
- args=['--win_toolchain_json', win_toolchain_json,
- '--depot_tools_parent_dir',
- self._win_toolchain_dir])
-
def compile(self, target, **kwargs):
"""Build the given target."""
env = kwargs.pop('env', {})
# The CHROME_PATH environment variable is needed for builders that use
# toolchains downloaded by Chrome.
env['CHROME_PATH'] = self.chrome_path
- if self.m.platform.is_win:
- make_cmd = ['python', 'make.py']
- self.m.run.run_once(self.bootstrap_win_toolchain)
- else:
- make_cmd = ['make']
+ make_cmd = ['make']
cmd = make_cmd + [target]
- try:
- self.m.run(self.m.step, 'build %s' % target, cmd=cmd,
- env=env, cwd=self.m.path['checkout'], **kwargs)
- except self.m.step.StepFailure:
- if self.m.platform.is_win:
- # The linker occasionally crashes on Windows. Try again.
- self.m.run(self.m.step, 'build %s' % target, cmd=cmd,
- env=env, cwd=self.m.path['checkout'], **kwargs)
- else:
- raise
+ self.m.run(self.m.step, 'build %s' % target, cmd=cmd,
+ env=env, cwd=self.m.path['checkout'], **kwargs)
def copy_extra_build_products(self, swarming_out_dir):
pass
diff --git a/infra/bots/recipe_modules/flavor/gn_flavor.py b/infra/bots/recipe_modules/flavor/gn_flavor.py
index 2d07b48..b7ef1dd 100644
--- a/infra/bots/recipe_modules/flavor/gn_flavor.py
+++ b/infra/bots/recipe_modules/flavor/gn_flavor.py
@@ -7,6 +7,7 @@
"""GN flavor utils, used for building Skia with GN."""
class GNFlavorUtils(default_flavor.DefaultFlavorUtils):
def supported(self):
+ # TODO: simplify!
extra_config = self.m.vars.builder_cfg.get('extra_config', '')
os = self.m.vars.builder_cfg.get('os', '')
target_arch = self.m.vars.builder_cfg.get('target_arch', '')
@@ -14,8 +15,7 @@
return any([
'CT' in extra_config,
'SAN' in extra_config,
- extra_config == 'ANGLE' and 'Win' not in os,
- extra_config != 'ANGLE' and 'Win' in os,
+ extra_config == 'ANGLE',
extra_config == 'CommandBuffer',
extra_config == 'Exceptions',
extra_config == 'Fast',
@@ -26,6 +26,7 @@
extra_config.startswith('SK'),
extra_config == 'Vulkan',
os == 'Ubuntu' and target_arch == 'x86',
+ 'Win' in os,
])
def _strip_environment(self):
diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Debug-ANGLE.json b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Debug-ANGLE.json
index 7fd18f9..a002b1c 100644
--- a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Debug-ANGLE.json
+++ b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Debug-ANGLE.json
@@ -123,30 +123,39 @@
"cmd": [
"python",
"-u",
- "[CUSTOM_C:\\_B_WORK]\\skia\\infra\\bots\\bootstrap_win_toolchain_json.py",
- "--win_toolchain_json",
- "[SLAVE_BUILD]\\src\\build\\win_toolchain.json",
- "--depot_tools_parent_dir",
- "[SLAVE_BUILD]"
- ],
- "name": "bootstrap win toolchain"
- },
- {
- "cmd": [
- "python",
- "make.py",
- "most"
+ "[CUSTOM_C:\\_B_WORK]\\skia\\bin\\fetch-gn"
],
"cwd": "[CUSTOM_C:\\_B_WORK]\\skia",
"env": {
- "BUILDTYPE": "Debug",
- "CHROME_HEADLESS": "1",
- "CHROME_PATH": "[SLAVE_BUILD]\\src",
- "GYP_DEFINES": "qt_sdk=C:/Qt/4.8.5/ skia_angle=1 skia_arch_type=x86 skia_warnings_as_errors=1 skia_win_debuggers_path=c:/DbgHelp skia_win_ltcg=0",
- "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-ANGLE"
+ "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]"
},
- "name": "build most"
+ "name": "fetch-gn"
+ },
+ {
+ "cmd": [
+ "gn.bat",
+ "gen",
+ "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-ANGLE\\Debug",
+ "--args=skia_use_angle=true target_cpu=\"x86\" windk=\"[SLAVE_BUILD]\\t\\depot_tools\\win_toolchain\\vs_files\\95ddda401ec5678f15eeed01d2bee08fcbc5ee97\""
+ ],
+ "cwd": "[CUSTOM_C:\\_B_WORK]\\skia",
+ "env": {
+ "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]"
+ },
+ "name": "gn gen"
+ },
+ {
+ "cmd": [
+ "ninja.exe",
+ "-C",
+ "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-ANGLE\\Debug"
+ ],
+ "cwd": "[CUSTOM_C:\\_B_WORK]\\skia",
+ "env": {
+ "NINJA_STATUS": "%%e [%%f/%%t] ",
+ "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]"
+ },
+ "name": "ninja"
},
{
"cmd": [
diff --git a/infra/bots/recipes/swarm_compile.expected/win_retry_failed_compile.json b/infra/bots/recipes/swarm_compile.expected/win_retry_failed_compile.json
deleted file mode 100644
index 1d0410a..0000000
--- a/infra/bots/recipes/swarm_compile.expected/win_retry_failed_compile.json
+++ /dev/null
@@ -1,232 +0,0 @@
-[
- {
- "cmd": [
- "python",
- "-u",
- "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
- "[CUSTOM_C:\\_B_WORK]",
- "511"
- ],
- "name": "makedirs checkout_path",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
- "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
- "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
- "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
- "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
- "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
- "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
- "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
- "config",
- "--spec",
- "cache_dir = '[CUSTOM_C:\\\\_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]"
- ],
- "cwd": "[CUSTOM_C:\\_B_WORK]",
- "env": {
- "BUILDTYPE": "Debug",
- "CHROME_HEADLESS": "1",
- "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-ANGLE"
- },
- "name": "gclient setup"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
- "sync",
- "--verbose",
- "--with_branch_heads",
- "--nohooks",
- "-j2",
- "--reset",
- "--force",
- "--upstream",
- "--no-nag-max",
- "--delete_unversioned_trees",
- "--revision",
- "skia@abc123",
- "--output-json",
- "/path/to/tmp/json"
- ],
- "cwd": "[CUSTOM_C:\\_B_WORK]",
- "env": {
- "BUILDTYPE": "Debug",
- "CHROME_HEADLESS": "1",
- "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-ANGLE"
- },
- "name": "gclient sync",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@",
- "@@@SET_BUILD_PROPERTY@got_revision@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
- "recurse",
- "git",
- "config",
- "user.name",
- "local_bot"
- ],
- "cwd": "[CUSTOM_C:\\_B_WORK]",
- "env": {
- "BUILDTYPE": "Debug",
- "CHROME_HEADLESS": "1",
- "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-ANGLE"
- },
- "name": "gclient recurse (git config user.name)"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
- "recurse",
- "git",
- "config",
- "user.email",
- "local_bot@example.com"
- ],
- "cwd": "[CUSTOM_C:\\_B_WORK]",
- "env": {
- "BUILDTYPE": "Debug",
- "CHROME_HEADLESS": "1",
- "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-ANGLE"
- },
- "name": "gclient recurse (git config user.email)"
- },
- {
- "cmd": [
- "python",
- "-u",
- "[CUSTOM_C:\\_B_WORK]\\skia\\infra\\bots\\bootstrap_win_toolchain_json.py",
- "--win_toolchain_json",
- "[SLAVE_BUILD]\\src\\build\\win_toolchain.json",
- "--depot_tools_parent_dir",
- "[SLAVE_BUILD]"
- ],
- "name": "bootstrap win toolchain"
- },
- {
- "cmd": [
- "python",
- "make.py",
- "most"
- ],
- "cwd": "[CUSTOM_C:\\_B_WORK]\\skia",
- "env": {
- "BUILDTYPE": "Debug",
- "CHROME_HEADLESS": "1",
- "CHROME_PATH": "[SLAVE_BUILD]\\src",
- "GYP_DEFINES": "qt_sdk=C:/Qt/4.8.5/ skia_angle=1 skia_arch_type=x86 skia_warnings_as_errors=1 skia_win_debuggers_path=c:/DbgHelp skia_win_ltcg=0",
- "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-ANGLE"
- },
- "name": "build most",
- "~followup_annotations": [
- "step returned non-zero exit code: 1",
- "@@@STEP_FAILURE@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "make.py",
- "most"
- ],
- "cwd": "[CUSTOM_C:\\_B_WORK]\\skia",
- "env": {
- "BUILDTYPE": "Debug",
- "CHROME_HEADLESS": "1",
- "CHROME_PATH": "[SLAVE_BUILD]\\src",
- "GYP_DEFINES": "qt_sdk=C:/Qt/4.8.5/ skia_angle=1 skia_arch_type=x86 skia_warnings_as_errors=1 skia_win_debuggers_path=c:/DbgHelp skia_win_ltcg=0",
- "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-ANGLE"
- },
- "name": "build most (2)"
- },
- {
- "cmd": [
- "python",
- "-u",
- "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['dm', 'dm.exe', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'lib/*.so', 'iOSShell.app', 'iOSShell.ipa', 'visualbench', 'visualbench.exe', 'vulkan-1.dll']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n",
- "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-ANGLE\\Debug",
- "[CUSTOM_[SWARM_OUT_DIR]]\\out\\Debug"
- ],
- "name": "copy build products",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@import errno@@@",
- "@@@STEP_LOG_LINE@python.inline@import glob@@@",
- "@@@STEP_LOG_LINE@python.inline@import os@@@",
- "@@@STEP_LOG_LINE@python.inline@import shutil@@@",
- "@@@STEP_LOG_LINE@python.inline@import sys@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@src = sys.argv[1]@@@",
- "@@@STEP_LOG_LINE@python.inline@dst = sys.argv[2]@@@",
- "@@@STEP_LOG_LINE@python.inline@build_products_whitelist = ['dm', 'dm.exe', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'lib/*.so', 'iOSShell.app', 'iOSShell.ipa', 'visualbench', 'visualbench.exe', 'vulkan-1.dll']@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@try:@@@",
- "@@@STEP_LOG_LINE@python.inline@ os.makedirs(dst)@@@",
- "@@@STEP_LOG_LINE@python.inline@except OSError as e:@@@",
- "@@@STEP_LOG_LINE@python.inline@ if e.errno != errno.EEXIST:@@@",
- "@@@STEP_LOG_LINE@python.inline@ raise@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@for pattern in build_products_whitelist:@@@",
- "@@@STEP_LOG_LINE@python.inline@ path = os.path.join(src, pattern)@@@",
- "@@@STEP_LOG_LINE@python.inline@ for f in glob.glob(path):@@@",
- "@@@STEP_LOG_LINE@python.inline@ dst_path = os.path.join(dst, os.path.relpath(f, src))@@@",
- "@@@STEP_LOG_LINE@python.inline@ if not os.path.isdir(os.path.dirname(dst_path)):@@@",
- "@@@STEP_LOG_LINE@python.inline@ os.makedirs(os.path.dirname(dst_path))@@@",
- "@@@STEP_LOG_LINE@python.inline@ print 'Copying build product %s to %s' % (f, dst_path)@@@",
- "@@@STEP_LOG_LINE@python.inline@ shutil.move(f, dst_path)@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "import psutil\nfor p in psutil.process_iter():\n try:\n if p.name in ('mspdbsrv.exe', 'vctip.exe', 'cl.exe', 'link.exe'):\n p.kill()\n except psutil._error.AccessDenied:\n pass\n"
- ],
- "name": "cleanup",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@import psutil@@@",
- "@@@STEP_LOG_LINE@python.inline@for p in psutil.process_iter():@@@",
- "@@@STEP_LOG_LINE@python.inline@ try:@@@",
- "@@@STEP_LOG_LINE@python.inline@ if p.name in ('mspdbsrv.exe', 'vctip.exe', 'cl.exe', 'link.exe'):@@@",
- "@@@STEP_LOG_LINE@python.inline@ p.kill()@@@",
- "@@@STEP_LOG_LINE@python.inline@ except psutil._error.AccessDenied:@@@",
- "@@@STEP_LOG_LINE@python.inline@ pass@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "name": "$result",
- "recipe_result": null,
- "status_code": 0
- }
-]
\ No newline at end of file
diff --git a/infra/bots/recipes/swarm_compile.py b/infra/bots/recipes/swarm_compile.py
index e422129..4f6aed2 100644
--- a/infra/bots/recipes/swarm_compile.py
+++ b/infra/bots/recipes/swarm_compile.py
@@ -266,23 +266,6 @@
api.step_data('build most', retcode=1)
)
- buildername = 'Build-Win-MSVC-x86-Debug-ANGLE'
- yield (
- api.test('win_retry_failed_compile') +
- api.properties(buildername=buildername,
- mastername=mastername,
- slavename=slavename,
- buildnumber=5,
- revision='abc123',
- path_config='kitchen',
- swarm_out_dir='[SWARM_OUT_DIR]') +
- api.path.exists(
- api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
- ) +
- api.platform('win', 64) +
- api.step_data('build most', retcode=1)
- )
-
buildername = 'Build-Win-MSVC-x86-Debug'
yield (
api.test('big_issue_number') +
diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json b/infra/bots/recipes/swarm_perf.expected/Perf-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json
index 8495cb7..fed704e 100644
--- a/infra/bots/recipes/swarm_perf.expected/Perf-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json
+++ b/infra/bots/recipes/swarm_perf.expected/Perf-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json
@@ -114,11 +114,7 @@
"~inc0.webp",
"~inc1.webp"
],
- "env": {
- "BUILDTYPE": "Debug_x64",
- "CHROME_HEADLESS": "1",
- "SKIA_OUT": "[SLAVE_BUILD]\\out"
- },
+ "cwd": "[SLAVE_BUILD]\\skia",
"name": "nanobench"
},
{
diff --git a/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json b/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json
index 6fb2e1a..871aa4a 100644
--- a/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json
+++ b/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json
@@ -544,11 +544,7 @@
"~GLPrograms",
"--noRAW_threading"
],
- "env": {
- "BUILDTYPE": "Debug_x64",
- "CHROME_HEADLESS": "1",
- "SKIA_OUT": "[SLAVE_BUILD]\\out"
- },
+ "cwd": "[SLAVE_BUILD]\\skia",
"name": "dm"
},
{