AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[recipes] Remove build environment vars from default_env

Browse Source 
BUG=skia:5578
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2209423002

Review-Url: https://codereview.chromium.org/2209423002
This commit is contained in:
borenet 2016-08-05 05:18:05 -07:00 committed by Commit bot
parent ac09554dce
commit d460a3c256
60 changed files with 55 additions and 483 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
infra/bots/recipe_modules/flavor/android_flavor.py
View File

@ -79,7 +79,7 @@ class AndroidFlavorUtils(default_flavor.DefaultFlavorUtils):
infra_step=True).stdout.rstrip()
except self.m.step.StepFailure:
path_to_adb = self.m.path.join(self._android_sdk_root,
'platform-tools', 'adb')
'platform-tools', 'adb')
self._adb = _ADBWrapper(
self.m, path_to_adb, self.serial_args, self)
self._default_env = {'ANDROID_SDK_ROOT': self._android_sdk_root,
@ -102,9 +102,10 @@ class AndroidFlavorUtils(default_flavor.DefaultFlavorUtils):
return self.m.run(self.m.step, name=name, cmd=args + cmd,
env=env, **kwargs)
def compile(self, target):
def compile(self, target, **kwargs):
"""Build the given target."""
env = dict(self._default_env)
env = kwargs.pop('env', {})
env.update(dict(self._default_env))
ccache = self.m.run.ccache()
if ccache:
env['ANDROID_MAKE_CCACHE'] = ccache
@ -117,7 +118,7 @@ class AndroidFlavorUtils(default_flavor.DefaultFlavorUtils):
if 'Vulkan' in self.m.vars.builder_name:
cmd.append('--vulkan')
self.m.run(self.m.step, 'build %s' % target, cmd=cmd,
env=env, cwd=self.m.path['checkout'])
env=env, cwd=self.m.path['checkout'], **kwargs)
def device_path_join(self, *args):
"""Like os.path.join(), but for paths on a connected Android device."""

4
infra/bots/recipe_modules/flavor/api.py
View File

@ -89,8 +89,8 @@ class SkiaFlavorApi(recipe_api.RecipeApi):
def step(self, name, cmd, **kwargs):
return self._f.step(name, cmd, **kwargs)
def compile(self, target):
return self._f.compile(target)
def compile(self, target, **kwargs):
return self._f.compile(target, **kwargs)
def copy_extra_build_products(self, swarming_out_dir):
return self._f.copy_extra_build_products(swarming_out_dir)

4
infra/bots/recipe_modules/flavor/cmake_flavor.py
View File

@ -7,8 +7,8 @@ import default_flavor
"""CMake flavor utils, used for building Skia with CMake."""
class CMakeFlavorUtils(default_flavor.DefaultFlavorUtils):
def compile(self, target):
def compile(self, target, **kwargs):
"""Build Skia with CMake. Ignores `target`."""
cmake_build = self.m.vars.skia_dir.join('cmake', 'cmake_build')
self.m.run(self.m.step, 'cmake_build', cmd=[cmake_build],
cwd=self.m.path['checkout'])
cwd=self.m.path['checkout'], **kwargs)

16
infra/bots/recipe_modules/flavor/default_flavor.py
View File

@ -111,7 +111,7 @@ class DefaultFlavorUtils(object):
'--depot_tools_parent_dir',
self._win_toolchain_dir])
def build_command_buffer(self):
def build_command_buffer(self, **kwargs):
"""Build command_buffer."""
script = self.m.vars.skia_dir.join('tools', 'build_command_buffer.py')
self.m.run(
@ -120,13 +120,15 @@ class DefaultFlavorUtils(object):
args=['--chrome-dir', self.m.vars.checkout_root,
'--output-dir', self.out_dir,
'--chrome-build-type', self.m.vars.configuration,
'--no-sync'])
'--no-sync'],
**kwargs)
def compile(self, target):
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}
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)
@ -137,16 +139,16 @@ class DefaultFlavorUtils(object):
cmd = make_cmd + [target]
try:
self.m.run(self.m.step, 'build %s' % target, cmd=cmd,
env=env, cwd=self.m.path['checkout'])
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'])
env=env, cwd=self.m.path['checkout'], **kwargs)
else:
raise
if 'CommandBuffer' in self.m.vars.builder_name:
self.m.run.run_once(self.build_command_buffer)
self.m.run.run_once(self.build_command_buffer, env=env)
def copy_extra_build_products(self, swarming_out_dir):
"""Copy extra build products to specified directory.

10
infra/bots/recipe_modules/flavor/gn_flavor.py
View File

@ -6,13 +6,14 @@ import default_flavor
"""GN flavor utils, used for building Skia with GN."""
class GNFlavorUtils(default_flavor.DefaultFlavorUtils):
def compile(self, target):
def compile(self, target, **kwargs):
"""Build Skia with GN."""
# Get the gn executable.
fetch_gn = self.m.vars.skia_dir.join('bin', 'fetch-gn')
self.m.run(self.m.step, 'fetch-gn',
cmd=[fetch_gn],
cwd=self.m.vars.skia_dir)
cwd=self.m.vars.skia_dir,
**kwargs)
is_debug = 'is_debug=true'
if self.m.vars.configuration != 'Debug':
@ -44,10 +45,11 @@ class GNFlavorUtils(default_flavor.DefaultFlavorUtils):
gn_exe = 'gn.exe'
gn_gen = [gn_exe, 'gen', self.out_dir, '--args=%s' % ' '.join(gn_args)]
self.m.run(self.m.step, 'gn_gen', cmd=gn_gen,
cwd=self.m.vars.skia_dir)
cwd=self.m.vars.skia_dir, **kwargs)
# Run ninja.
ninja_cmd = ['ninja', '-C', self.out_dir]
self.m.run(self.m.step, 'compile %s' % target,
cmd=ninja_cmd,
cwd=self.m.vars.skia_dir)
cwd=self.m.vars.skia_dir,
**kwargs)

4
infra/bots/recipe_modules/flavor/ios_flavor.py
View File

@ -35,11 +35,11 @@ class iOSFlavorUtils(default_flavor.DefaultFlavorUtils):
return self.m.run(self.m.step, name=name, cmd=args + cmd,
env=env, **kwargs)
def compile(self, target):
def compile(self, target, **kwargs):
"""Build the given target."""
cmd = [self.ios_bin.join('ios_ninja')]
self.m.run(self.m.step, 'build iOSShell', cmd=cmd,
cwd=self.m.path['checkout'])
cwd=self.m.path['checkout'], **kwargs)
def device_path_join(self, *args):
"""Like os.path.join(), but for paths on a connected iOS device."""

15
infra/bots/recipe_modules/flavor/pdfium_flavor.py
View File

@ -12,7 +12,7 @@ import default_flavor
class PDFiumFlavorUtils(default_flavor.DefaultFlavorUtils):
def compile(self, target):
def compile(self, target, **kwargs):
"""Build PDFium with Skia."""
pdfium_dir = self.m.vars.checkout_root.join('pdfium')
@ -21,17 +21,20 @@ class PDFiumFlavorUtils(default_flavor.DefaultFlavorUtils):
self.m.step,
'runhook',
cmd=['gclient', 'runhook', 'gn_linux64'],
cwd=pdfium_dir)
cwd=pdfium_dir,
**kwargs)
# Setup gn args.
gn_args = ['pdf_use_skia=true', 'pdf_is_standalone=true',
'clang_use_chrome_plugins=false']
env = kwargs.pop('env', {})
env['CHROMIUM_BUILDTOOLS_PATH'] = str(pdfium_dir.join('buildtools'))
self.m.run(
self.m.step,
'gn_gen',
cmd=['gn', 'gen', 'out/skia', '--args=%s' % ' '.join(gn_args)],
cwd=pdfium_dir,
env={'CHROMIUM_BUILDTOOLS_PATH': str(pdfium_dir.join('buildtools'))})
env=env)
# Modify DEPS file to contain the current Skia revision.
skia_revision = self.m.vars.got_revision
@ -47,7 +50,7 @@ class PDFiumFlavorUtils(default_flavor.DefaultFlavorUtils):
patched_contents = re.sub(deps_skia_regexp, str(skia_revision),
original_contents)
self.m.file.write('write PDFium DEPs', deps_file,
patched_contents, infra_step=True)
patched_contents, infra_step=True)
# gclient sync after updating DEPS.
self.m.run(
@ -61,4 +64,6 @@ class PDFiumFlavorUtils(default_flavor.DefaultFlavorUtils):
self.m.step,
'build_pdfium',
cmd=['ninja', '-C', 'out/skia', '-j100'],
cwd=pdfium_dir)
cwd=pdfium_dir,
env=env,
**kwargs)

4
infra/bots/recipe_modules/flavor/xsan_flavor.py
View File

@ -26,11 +26,11 @@ class XSanFlavorUtils(default_flavor.DefaultFlavorUtils):
'TSAN': 'thread',
}[self.m.vars.builder_cfg['extra_config'].replace('Swarming', '')]
def compile(self, target):
def compile(self, target, **kwargs):
cmd = [self.m.vars.skia_dir.join('tools', 'xsan_build'),
self._sanitizer, target]
self.m.run(self.m.step, 'build %s' % target, cmd=cmd,
cwd=self.m.vars.skia_dir)
cwd=self.m.vars.skia_dir, **kwargs)
def copy_extra_build_products(self, swarming_out_dir):
# Include msan_out if MSAN.

4
infra/bots/recipe_modules/vars/api.py
View File

@ -787,8 +787,6 @@ class SkiaVarsApi(recipe_api.RecipeApi):
self.configuration = self.builder_spec['configuration']
self.default_env.update({'SKIA_OUT': self.skia_out,
'BUILDTYPE': self.configuration})
self.default_env.update(self.builder_spec['env'])
self.build_targets = [str(t) for t in self.builder_spec['build_targets']]
self.do_compile_steps = self.builder_spec.get('do_compile_steps', True)
self.do_test_steps = self.builder_spec['do_test_steps']
self.do_perf_steps = self.builder_spec['do_perf_steps']
@ -806,5 +804,3 @@ class SkiaVarsApi(recipe_api.RecipeApi):
self.swarming_out_dir, 'dm')
self.perf_data_dir = self.m.path.join(self.swarming_out_dir,
'perfdata', self.builder_name, 'data')
self.dm_flags = self.builder_spec['dm_flags']
self.nanobench_flags = self.builder_spec['nanobench_flags']

2
infra/bots/recipes/swarm_RecreateSKPs.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json
View File

@ -34,7 +34,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_shared_lib=1 skia_warnings_as_errors=0",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -61,7 +60,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_shared_lib=1 skia_warnings_as_errors=0",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},

2
infra/bots/recipes/swarm_RecreateSKPs.expected/Housekeeper-Weekly-RecreateSKPs.json
View File

@ -34,7 +34,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_shared_lib=1 skia_warnings_as_errors=0",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -61,7 +60,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_shared_lib=1 skia_warnings_as_errors=0",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},

9
infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-Arm7-Debug-Android.json
View File

@ -33,10 +33,7 @@
"cwd": "[CUSTOM_/_B_WORK]",
"env": {
"BUILDTYPE": "Debug",
"CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"CXX": "/usr/bin/clang++",
"GYP_DEFINES": "skia_arch_type=arm skia_clang_build=1 skia_warnings_as_errors=0",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-Arm7-Debug-Android"
},
@ -60,10 +57,7 @@
"cwd": "[CUSTOM_/_B_WORK]",
"env": {
"BUILDTYPE": "Debug",
"CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"CXX": "/usr/bin/clang++",
"GYP_DEFINES": "skia_arch_type=arm skia_clang_build=1 skia_warnings_as_errors=0",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-Arm7-Debug-Android"
},
@ -100,10 +94,7 @@
],
"env": {
"BUILDTYPE": "Debug",
"CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"CXX": "/usr/bin/clang++",
"GYP_DEFINES": "skia_arch_type=arm skia_clang_build=1 skia_warnings_as_errors=0",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-Arm7-Debug-Android"
},

6
infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-Arm7-Release-iOS.json
View File

@ -33,10 +33,7 @@
"cwd": "[CUSTOM_/_B_WORK]",
"env": {
"BUILDTYPE": "Release",
"CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"CXX": "/usr/bin/clang++",
"GYP_DEFINES": "skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-Arm7-Release-iOS"
},
@ -60,10 +57,7 @@
"cwd": "[CUSTOM_/_B_WORK]",
"env": {
"BUILDTYPE": "Release",
"CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"CXX": "/usr/bin/clang++",
"GYP_DEFINES": "skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-Arm7-Release-iOS"
},

7
infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json
View File

@ -33,10 +33,7 @@
"cwd": "[CUSTOM_/_B_WORK]",
"env": {
"BUILDTYPE": "Debug",
"CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"CXX": "/usr/bin/clang++",
"GYP_DEFINES": "skia_arch_type=x86_64 skia_clang_build=1 skia_command_buffer=1 skia_warnings_as_errors=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer"
},
@ -62,10 +59,7 @@
"cwd": "[CUSTOM_/_B_WORK]",
"env": {
"BUILDTYPE": "Debug",
"CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"CXX": "/usr/bin/clang++",
"GYP_DEFINES": "skia_arch_type=x86_64 skia_clang_build=1 skia_command_buffer=1 skia_warnings_as_errors=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer"
},
@ -134,6 +128,7 @@
"BUILDTYPE": "Debug",
"CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"CHROME_PATH": "[SLAVE_BUILD]/src",
"CXX": "/usr/bin/clang++",
"GYP_DEFINES": "skia_arch_type=x86_64 skia_clang_build=1 skia_command_buffer=1 skia_warnings_as_errors=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]",

6
infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-x86_64-Release-CMake.json
View File

@ -33,10 +33,7 @@
"cwd": "[CUSTOM_/_B_WORK]",
"env": {
"BUILDTYPE": "Release",
"CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"CXX": "/usr/bin/clang++",
"GYP_DEFINES": "skia_arch_type=x86_64 skia_clang_build=1 skia_warnings_as_errors=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Release-CMake"
},
@ -60,10 +57,7 @@
"cwd": "[CUSTOM_/_B_WORK]",
"env": {
"BUILDTYPE": "Release",
"CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"CXX": "/usr/bin/clang++",
"GYP_DEFINES": "skia_arch_type=x86_64 skia_clang_build=1 skia_warnings_as_errors=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Release-CMake"
},

9
infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-x86_64-Debug-GN.json
View File

@ -33,10 +33,7 @@
"cwd": "[CUSTOM_/_B_WORK]",
"env": {
"BUILDTYPE": "Debug",
"CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"CXX": "/usr/bin/clang++",
"GYP_DEFINES": "skia_arch_type=x86_64 skia_clang_build=1 skia_warnings_as_errors=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-GN"
},
@ -60,10 +57,7 @@
"cwd": "[CUSTOM_/_B_WORK]",
"env": {
"BUILDTYPE": "Debug",
"CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"CXX": "/usr/bin/clang++",
"GYP_DEFINES": "skia_arch_type=x86_64 skia_clang_build=1 skia_warnings_as_errors=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-GN"
},
@ -104,10 +98,7 @@
],
"env": {
"BUILDTYPE": "Debug",
"CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"CXX": "/usr/bin/clang++",
"GYP_DEFINES": "skia_arch_type=x86_64 skia_clang_build=1 skia_warnings_as_errors=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-GN"
},

3
infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-Arm7-Debug-Android-Trybot.json
View File

@ -34,7 +34,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-Arm7-Debug-Android-Trybot"
},
@ -59,7 +58,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-Arm7-Debug-Android-Trybot"
},
@ -117,7 +115,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-Arm7-Debug-Android-Trybot"
},

3
infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-Arm7-Release-Android.json
View File

@ -34,7 +34,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-Arm7-Release-Android"
},
@ -59,7 +58,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-Arm7-Release-Android"
},
@ -97,7 +95,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-Arm7-Release-Android"
},

3
infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-Arm7-Release-Android_Vulkan.json
View File

@ -34,7 +34,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-Arm7-Release-Android_Vulkan"
},
@ -59,7 +58,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-Arm7-Release-Android_Vulkan"
},
@ -97,7 +95,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-Arm7-Release-Android_Vulkan"
},

2
infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86-Debug.json
View File

@ -34,7 +34,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=x86 skia_warnings_as_errors=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86-Debug"
},
@ -59,7 +58,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=x86 skia_warnings_as_errors=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86-Debug"
},

3
infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-GN.json
View File

@ -34,7 +34,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=x86_64 skia_warnings_as_errors=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug-GN"
},
@ -59,7 +58,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=x86_64 skia_warnings_as_errors=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug-GN"
},
@ -99,7 +97,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=x86_64 skia_warnings_as_errors=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug-GN"
},

2
infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-MSAN.json
View File

@ -34,7 +34,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=x86_64 skia_warnings_as_errors=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug-MSAN"
},
@ -61,7 +60,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=x86_64 skia_warnings_as_errors=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug-MSAN"
},

2
infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-CMake.json
View File

@ -34,7 +34,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=x86_64 skia_warnings_as_errors=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-CMake"
},
@ -59,7 +58,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=x86_64 skia_warnings_as_errors=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-CMake"
},

4
infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium.json
View File

@ -34,7 +34,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=x86_64 skia_warnings_as_errors=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-PDFium"
},
@ -61,7 +60,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=x86_64 skia_warnings_as_errors=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-PDFium"
},
@ -144,7 +142,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=x86_64 skia_warnings_as_errors=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-PDFium"
},
@ -161,6 +158,7 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools",
"GYP_DEFINES": "skia_arch_type=x86_64 skia_warnings_as_errors=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-PDFium"

2
infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Shared.json
View File

@ -34,7 +34,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=x86_64 skia_shared_lib=1 skia_warnings_as_errors=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-Shared"
},
@ -59,7 +58,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=x86_64 skia_shared_lib=1 skia_warnings_as_errors=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-Shared"
},

2
infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Valgrind.json
View File

@ -34,7 +34,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=x86_64 skia_release_optimization_level=1 skia_warnings_as_errors=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-Valgrind"
},
@ -59,7 +58,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=x86_64 skia_release_optimization_level=1 skia_warnings_as_errors=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-Valgrind"
},

2
infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Debug.json
View File

@ -34,7 +34,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "qt_sdk=C:/Qt/4.8.5/ 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]",
"SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug"
},
@ -59,7 +58,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "qt_sdk=C:/Qt/4.8.5/ 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]",
"SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug"
},

2
infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GN.json
View File

@ -34,7 +34,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "qt_sdk=C:/Qt/4.8.5/ 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]",
"SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Release-GN"
},
@ -59,7 +58,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "qt_sdk=C:/Qt/4.8.5/ 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]",
"SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Release-GN"
},

2
infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json
View File

@ -34,7 +34,6 @@
"env": {
"BUILDTYPE": "Release_x64",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "qt_sdk=C:/Qt/4.8.5/ skia_arch_type=x86_64 skia_vulkan=1 skia_vulkan_debug_layers=0 skia_warnings_as_errors=1 skia_win_debuggers_path=c:/DbgHelp skia_win_ltcg=0",
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86_64-Release-Vulkan"
},
@ -59,7 +58,6 @@
"env": {
"BUILDTYPE": "Release_x64",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "qt_sdk=C:/Qt/4.8.5/ skia_arch_type=x86_64 skia_vulkan=1 skia_vulkan_debug_layers=0 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]",
"SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86_64-Release-Vulkan"
},

2
infra/bots/recipes/swarm_compile.expected/big_issue_number.json
View File

@ -34,7 +34,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "qt_sdk=C:/Qt/4.8.5/ 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]",
"SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug"
},
@ -59,7 +58,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "qt_sdk=C:/Qt/4.8.5/ 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]",
"SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug"
},

2
infra/bots/recipes/swarm_compile.expected/failed_compile.json
View File

@ -34,7 +34,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=x86 skia_warnings_as_errors=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86-Debug"
},
@ -59,7 +58,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=x86 skia_warnings_as_errors=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86-Debug"
},

2
infra/bots/recipes/swarm_compile.expected/win_retry_failed_compile.json
View File

@ -34,7 +34,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "qt_sdk=C:/Qt/4.8.5/ 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]",
"SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug"
},
@ -59,7 +58,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "qt_sdk=C:/Qt/4.8.5/ 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]",
"SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug"
},

8
infra/bots/recipes/swarm_compile.py
View File

@ -48,9 +48,13 @@ TEST_BUILDERS = {
def RunSteps(api):
api.core.setup()
env = api.vars.builder_spec['env']
build_targets = api.vars.builder_spec['build_targets']
try:
for target in api.vars.build_targets:
api.flavor.compile(target)
for target in build_targets:
api.flavor.compile(target, env=env)
api.run.copy_build_products(
api.flavor.out_dir,
api.vars.swarming_out_dir.join(

2
infra/bots/recipes/swarm_housekeeper.expected/Housekeeper-PerCommit-Trybot.json
View File

@ -30,7 +30,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_shared_lib=1 skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "android platform self-tests"
@ -52,7 +51,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_shared_lib=1 skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "generate and upload binary size data"

3
infra/bots/recipes/swarm_housekeeper.expected/Housekeeper-PerCommit.json
View File

@ -30,7 +30,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_shared_lib=1 skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "android platform self-tests"
@ -45,7 +44,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_shared_lib=1 skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "generate and upload doxygen"
@ -65,7 +63,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_shared_lib=1 skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "generate and upload binary size data"

26
infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release.json
View File

@ -20,7 +20,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -35,7 +34,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -51,7 +49,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "get EXTERNAL_STORAGE dir",
@ -65,7 +62,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "adb root",
@ -79,7 +75,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "wait"
@ -93,7 +88,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -108,7 +102,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -124,7 +117,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -139,7 +131,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "stop shell"
@ -154,7 +145,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "starting battery stats"
@ -169,7 +159,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "cat scaling_governor"
@ -184,7 +173,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "cat cpu_freq"
@ -201,7 +189,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -237,7 +224,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "read SKP_VERSION",
@ -273,7 +259,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "read SK_IMAGE_VERSION",
@ -290,7 +275,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "rmdir skia_perf"
@ -312,7 +296,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "exists skia_perf",
@ -329,7 +312,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "mkdir skia_perf"
@ -422,7 +404,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -462,7 +443,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -478,7 +458,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "final battery stats"
@ -491,7 +470,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "reboot"
@ -504,7 +482,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "wait for reboot"
@ -518,7 +495,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -533,7 +509,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -547,7 +522,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "kill-server"

2
infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json
View File

@ -175,7 +175,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=x86_64 skia_dump_stats=1 skia_release_optimization_level=1 skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "nanobench"
@ -274,7 +273,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=x86_64 skia_dump_stats=1 skia_release_optimization_level=1 skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "nanobench --abandonGpuContext"

1
infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench.json
View File

@ -163,7 +163,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=x86_64 skia_dump_stats=1 skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "visualbench"

1
infra/bots/recipes/swarm_perf.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug.json
View File

@ -93,7 +93,6 @@
"env": {
"BUILDTYPE": "Debug_x64",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "qt_sdk=C:/Qt/4.8.5/ skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0 skia_win_debuggers_path=c:/DbgHelp",
"SKIA_OUT": "[SLAVE_BUILD]\\out"
},
"name": "nanobench"

1
infra/bots/recipes/swarm_perf.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release.json
View File

@ -157,7 +157,6 @@
"env": {
"BUILDTYPE": "Release_x64",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "qt_sdk=C:/Qt/4.8.5/ skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0 skia_win_debuggers_path=c:/DbgHelp",
"SKIA_OUT": "[SLAVE_BUILD]\\out"
},
"name": "nanobench"

1
infra/bots/recipes/swarm_perf.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json
View File

@ -164,7 +164,6 @@
"env": {
"BUILDTYPE": "Release_x64",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "qt_sdk=C:/Qt/Qt5.1.0/5.1.0/msvc2012_64/ skia_arch_type=x86_64 skia_dump_stats=1 skia_warnings_as_errors=0 skia_win_debuggers_path=c:/DbgHelp",
"SKIA_OUT": "[SLAVE_BUILD]\\out"
},
"name": "nanobench"

1
infra/bots/recipes/swarm_perf.expected/big_issue_number.json
View File

@ -164,7 +164,6 @@
"env": {
"BUILDTYPE": "Release_x64",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "qt_sdk=C:/Qt/Qt5.1.0/5.1.0/msvc2012_64/ skia_arch_type=x86_64 skia_dump_stats=1 skia_warnings_as_errors=0 skia_win_debuggers_path=c:/DbgHelp",
"SKIA_OUT": "[SLAVE_BUILD]\\out"
},
"name": "nanobench"

12
infra/bots/recipes/swarm_perf.py
View File

@ -71,7 +71,7 @@ def perf_steps(api):
skip_flag = '--nocpu'
if skip_flag:
args.append(skip_flag)
args.extend(api.vars.nanobench_flags)
args.extend(api.vars.builder_spec['nanobench_flags'])
if api.vars.upload_perf_results:
json_path = api.flavor.device_path_join(
@ -87,8 +87,8 @@ def perf_steps(api):
args.extend([k, api.vars.builder_cfg[k]])
api.run(api.flavor.step, target, cmd=args,
abort_on_failure=False,
env=api.vars.default_env)
abort_on_failure=False,
env=api.vars.default_env)
# See skia:2789.
if ('Valgrind' in api.vars.builder_name and
@ -96,9 +96,9 @@ def perf_steps(api):
abandonGpuContext = list(args)
abandonGpuContext.extend(['--abandonGpuContext', '--nocpu'])
api.run(api.flavor.step,
'%s --abandonGpuContext' % target,
cmd=abandonGpuContext, abort_on_failure=False,
env=api.vars.default_env)
'%s --abandonGpuContext' % target,
cmd=abandonGpuContext, abort_on_failure=False,
env=api.vars.default_env)
# Copy results to swarming out dir.
if api.vars.upload_perf_results:

21
infra/bots/recipes/swarm_test.expected/Test-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Debug.json
View File

@ -20,7 +20,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -35,7 +34,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -51,7 +49,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "get EXTERNAL_STORAGE dir",
@ -67,7 +64,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -83,7 +79,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "starting battery stats"
@ -100,7 +95,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -136,7 +130,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "read SKP_VERSION",
@ -172,7 +165,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "read SK_IMAGE_VERSION",
@ -233,7 +225,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "rmdir skia_dm"
@ -255,7 +246,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "exists skia_dm",
@ -272,7 +262,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "mkdir skia_dm"
@ -310,7 +299,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "get uninteresting hashes",
@ -358,7 +346,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "push uninteresting_hashes.txt"
@ -722,7 +709,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -740,7 +726,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -756,7 +741,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "final battery stats"
@ -769,7 +753,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "reboot"
@ -782,7 +765,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "wait for reboot"
@ -796,7 +778,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -811,7 +792,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -825,7 +805,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "kill-server"

28
infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug.json
View File

@ -20,7 +20,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -35,7 +34,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -51,7 +49,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "get EXTERNAL_STORAGE dir",
@ -65,7 +62,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "adb root",
@ -79,7 +75,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "wait"
@ -93,7 +88,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -108,7 +102,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -124,7 +117,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -139,7 +131,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "stop shell"
@ -154,7 +145,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "starting battery stats"
@ -169,7 +159,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "cat scaling_governor"
@ -184,7 +173,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "cat cpu_freq"
@ -201,7 +189,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -237,7 +224,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "read SKP_VERSION",
@ -273,7 +259,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "read SK_IMAGE_VERSION",
@ -334,7 +319,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "rmdir skia_dm"
@ -356,7 +340,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "exists skia_dm",
@ -373,7 +356,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "mkdir skia_dm"
@ -411,7 +393,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "get uninteresting hashes",
@ -459,7 +440,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "push uninteresting_hashes.txt"
@ -817,7 +797,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -835,7 +814,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -851,7 +829,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "final battery stats"
@ -864,7 +841,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "reboot"
@ -877,7 +853,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "wait for reboot"
@ -891,7 +866,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -906,7 +880,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -920,7 +893,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "kill-server"

6
infra/bots/recipes/swarm_test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json
View File

@ -349,10 +349,7 @@
"cwd": "[SLAVE_BUILD]/skia",
"env": {
"BUILDTYPE": "Coverage",
"CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"CXX": "/usr/bin/clang++",
"GYP_DEFINES": "skia_arch_type=x86_64 skia_clang_build=1 skia_gpu=0 skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "dm"
@ -399,10 +396,7 @@
"cwd": "[SLAVE_BUILD]/skia",
"env": {
"BUILDTYPE": "Coverage",
"CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"CXX": "/usr/bin/clang++",
"GYP_DEFINES": "skia_arch_type=x86_64 skia_clang_build=1 skia_gpu=0 skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "Generate Coverage Data"

1
infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json
View File

@ -287,7 +287,6 @@
"ASAN_OPTIONS": "symbolize=1 detect_leaks=1",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0",
"LD_LIBRARY_PATH": "[SLAVE_BUILD]/third_party/externals/llvm/msan_out/lib",
"LSAN_OPTIONS": "symbolize=1 print_suppressions=1 suppressions=[SLAVE_BUILD]/skia/tools/lsan.supp",
"PATH": "%(PATH)s:[SLAVE_BUILD]/llvm-build/Release+Asserts/bin",

2
infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json
View File

@ -116,7 +116,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "get uninteresting hashes",
@ -401,7 +400,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "dm"

3
infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json
View File

@ -401,7 +401,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=x86_64 skia_release_optimization_level=1 skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "dm"
@ -769,7 +768,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=x86_64 skia_release_optimization_level=1 skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "dm --abandonGpuContext"
@ -1137,7 +1135,6 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=x86_64 skia_release_optimization_level=1 skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "dm --preAbandonGpuContext"

2
infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json
View File

@ -116,7 +116,6 @@
"env": {
"BUILDTYPE": "Release_x64",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "qt_sdk=C:/Qt/Qt5.1.0/5.1.0/msvc2012_64/ skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0 skia_win_debuggers_path=c:/DbgHelp",
"SKIA_OUT": "[SLAVE_BUILD]\\out"
},
"name": "get uninteresting hashes",
@ -461,7 +460,6 @@
"env": {
"BUILDTYPE": "Release_x64",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "qt_sdk=C:/Qt/Qt5.1.0/5.1.0/msvc2012_64/ skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0 skia_win_debuggers_path=c:/DbgHelp",
"SKIA_OUT": "[SLAVE_BUILD]\\out"
},
"name": "dm"

66
infra/bots/recipes/swarm_test.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json
View File

@ -5,10 +5,7 @@
],
"env": {
"BUILDTYPE": "Debug",
"CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"CXX": "/usr/bin/clang++",
"GYP_DEFINES": "skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out",
"XCODEBUILD": "[SLAVE_BUILD]/xcodebuild"
},
@ -22,10 +19,7 @@
],
"env": {
"BUILDTYPE": "Debug",
"CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"CXX": "/usr/bin/clang++",
"GYP_DEFINES": "skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out",
"XCODEBUILD": "[SLAVE_BUILD]/xcodebuild"
},
@ -58,10 +52,7 @@
],
"env": {
"BUILDTYPE": "Debug",
"CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"CXX": "/usr/bin/clang++",
"GYP_DEFINES": "skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out",
"XCODEBUILD": "[SLAVE_BUILD]/xcodebuild"
},
@ -75,10 +66,7 @@
],
"env": {
"BUILDTYPE": "Debug",
"CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"CXX": "/usr/bin/clang++",
"GYP_DEFINES": "skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out",
"XCODEBUILD": "[SLAVE_BUILD]/xcodebuild"
},
@ -91,10 +79,7 @@
],
"env": {
"BUILDTYPE": "Debug",
"CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"CXX": "/usr/bin/clang++",
"GYP_DEFINES": "skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out",
"XCODEBUILD": "[SLAVE_BUILD]/xcodebuild"
},
@ -107,10 +92,7 @@
],
"env": {
"BUILDTYPE": "Debug",
"CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"CXX": "/usr/bin/clang++",
"GYP_DEFINES": "skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out",
"XCODEBUILD": "[SLAVE_BUILD]/xcodebuild"
},
@ -124,10 +106,7 @@
],
"env": {
"BUILDTYPE": "Debug",
"CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"CXX": "/usr/bin/clang++",
"GYP_DEFINES": "skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out",
"XCODEBUILD": "[SLAVE_BUILD]/xcodebuild"
},
@ -141,10 +120,7 @@
],
"env": {
"BUILDTYPE": "Debug",
"CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"CXX": "/usr/bin/clang++",
"GYP_DEFINES": "skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out",
"XCODEBUILD": "[SLAVE_BUILD]/xcodebuild"
},
@ -177,10 +153,7 @@
],
"env": {
"BUILDTYPE": "Debug",
"CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"CXX": "/usr/bin/clang++",
"GYP_DEFINES": "skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out",
"XCODEBUILD": "[SLAVE_BUILD]/xcodebuild"
},
@ -194,10 +167,7 @@
],
"env": {
"BUILDTYPE": "Debug",
"CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"CXX": "/usr/bin/clang++",
"GYP_DEFINES": "skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out",
"XCODEBUILD": "[SLAVE_BUILD]/xcodebuild"
},
@ -210,10 +180,7 @@
],
"env": {
"BUILDTYPE": "Debug",
"CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"CXX": "/usr/bin/clang++",
"GYP_DEFINES": "skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out",
"XCODEBUILD": "[SLAVE_BUILD]/xcodebuild"
},
@ -226,10 +193,7 @@
],
"env": {
"BUILDTYPE": "Debug",
"CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"CXX": "/usr/bin/clang++",
"GYP_DEFINES": "skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out",
"XCODEBUILD": "[SLAVE_BUILD]/xcodebuild"
},
@ -243,10 +207,7 @@
],
"env": {
"BUILDTYPE": "Debug",
"CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"CXX": "/usr/bin/clang++",
"GYP_DEFINES": "skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out",
"XCODEBUILD": "[SLAVE_BUILD]/xcodebuild"
},
@ -260,10 +221,7 @@
],
"env": {
"BUILDTYPE": "Debug",
"CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"CXX": "/usr/bin/clang++",
"GYP_DEFINES": "skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out",
"XCODEBUILD": "[SLAVE_BUILD]/xcodebuild"
},
@ -320,10 +278,7 @@
],
"env": {
"BUILDTYPE": "Debug",
"CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"CXX": "/usr/bin/clang++",
"GYP_DEFINES": "skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out",
"XCODEBUILD": "[SLAVE_BUILD]/xcodebuild"
},
@ -336,10 +291,7 @@
],
"env": {
"BUILDTYPE": "Debug",
"CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"CXX": "/usr/bin/clang++",
"GYP_DEFINES": "skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out",
"XCODEBUILD": "[SLAVE_BUILD]/xcodebuild"
},
@ -377,10 +329,7 @@
"cwd": "[SLAVE_BUILD]/skia",
"env": {
"BUILDTYPE": "Debug",
"CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"CXX": "/usr/bin/clang++",
"GYP_DEFINES": "skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "get uninteresting hashes",
@ -426,10 +375,7 @@
],
"env": {
"BUILDTYPE": "Debug",
"CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"CXX": "/usr/bin/clang++",
"GYP_DEFINES": "skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out",
"XCODEBUILD": "[SLAVE_BUILD]/xcodebuild"
},
@ -816,10 +762,7 @@
],
"env": {
"BUILDTYPE": "Debug",
"CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"CXX": "/usr/bin/clang++",
"GYP_DEFINES": "skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out",
"XCODEBUILD": "[SLAVE_BUILD]/xcodebuild"
},
@ -833,10 +776,7 @@
],
"env": {
"BUILDTYPE": "Debug",
"CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"CXX": "/usr/bin/clang++",
"GYP_DEFINES": "skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out",
"XCODEBUILD": "[SLAVE_BUILD]/xcodebuild"
},
@ -848,10 +788,7 @@
],
"env": {
"BUILDTYPE": "Debug",
"CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"CXX": "/usr/bin/clang++",
"GYP_DEFINES": "skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out",
"XCODEBUILD": "[SLAVE_BUILD]/xcodebuild"
},
@ -864,10 +801,7 @@
],
"env": {
"BUILDTYPE": "Debug",
"CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
"CXX": "/usr/bin/clang++",
"GYP_DEFINES": "skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out",
"XCODEBUILD": "[SLAVE_BUILD]/xcodebuild"
},

28
infra/bots/recipes/swarm_test.expected/adb_in_path.json
View File

@ -16,7 +16,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -31,7 +30,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -47,7 +45,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "get EXTERNAL_STORAGE dir",
@ -61,7 +58,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "adb root",
@ -75,7 +71,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "wait"
@ -89,7 +84,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -104,7 +98,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -120,7 +113,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -135,7 +127,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "stop shell"
@ -150,7 +141,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "starting battery stats"
@ -165,7 +155,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "cat scaling_governor"
@ -180,7 +169,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "cat cpu_freq"
@ -197,7 +185,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -233,7 +220,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "read SKP_VERSION",
@ -269,7 +255,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "read SK_IMAGE_VERSION",
@ -330,7 +315,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "rmdir skia_dm"
@ -352,7 +336,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "exists skia_dm",
@ -369,7 +352,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "mkdir skia_dm"
@ -407,7 +389,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "get uninteresting hashes",
@ -455,7 +436,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "push uninteresting_hashes.txt"
@ -813,7 +793,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -831,7 +810,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -847,7 +825,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "final battery stats"
@ -860,7 +837,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "reboot"
@ -873,7 +849,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "wait for reboot"
@ -887,7 +862,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -902,7 +876,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -916,7 +889,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "kill-server"

2
infra/bots/recipes/swarm_test.expected/big_issue_number.json
View File

@ -116,7 +116,6 @@
"env": {
"BUILDTYPE": "Release_x64",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "qt_sdk=C:/Qt/Qt5.1.0/5.1.0/msvc2012_64/ skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0 skia_win_debuggers_path=c:/DbgHelp",
"SKIA_OUT": "[SLAVE_BUILD]\\out"
},
"name": "get uninteresting hashes",
@ -461,7 +460,6 @@
"env": {
"BUILDTYPE": "Release_x64",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "qt_sdk=C:/Qt/Qt5.1.0/5.1.0/msvc2012_64/ skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0 skia_win_debuggers_path=c:/DbgHelp",
"SKIA_OUT": "[SLAVE_BUILD]\\out"
},
"name": "dm"

34
infra/bots/recipes/swarm_test.expected/download_and_push_skimage.json
View File

@ -20,7 +20,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -35,7 +34,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -51,7 +49,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "get EXTERNAL_STORAGE dir",
@ -65,7 +62,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "adb root",
@ -79,7 +75,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "wait"
@ -93,7 +88,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -108,7 +102,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -124,7 +117,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -139,7 +131,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "stop shell"
@ -154,7 +145,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "starting battery stats"
@ -169,7 +159,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "cat scaling_governor"
@ -184,7 +173,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "cat cpu_freq"
@ -201,7 +189,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -237,7 +224,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "read SKP_VERSION",
@ -273,7 +259,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "read SK_IMAGE_VERSION",
@ -290,7 +275,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "rm SK_IMAGE_VERSION"
@ -306,7 +290,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "rmdir skia_images"
@ -328,7 +311,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "exists skia_images",
@ -345,7 +327,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "mkdir skia_images"
@ -362,7 +343,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -378,7 +358,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "push SK_IMAGE_VERSION"
@ -438,7 +417,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "rmdir skia_dm"
@ -460,7 +438,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "exists skia_dm",
@ -477,7 +454,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "mkdir skia_dm"
@ -515,7 +491,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "get uninteresting hashes",
@ -563,7 +538,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "push uninteresting_hashes.txt"
@ -921,7 +895,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -939,7 +912,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -955,7 +927,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "final battery stats"
@ -968,7 +939,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "reboot"
@ -981,7 +951,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "wait for reboot"
@ -995,7 +964,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -1010,7 +978,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -1024,7 +991,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "kill-server"

34
infra/bots/recipes/swarm_test.expected/download_and_push_skps.json
View File

@ -20,7 +20,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -35,7 +34,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -51,7 +49,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "get EXTERNAL_STORAGE dir",
@ -65,7 +62,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "adb root",
@ -79,7 +75,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "wait"
@ -93,7 +88,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -108,7 +102,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -124,7 +117,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -139,7 +131,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "stop shell"
@ -154,7 +145,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "starting battery stats"
@ -169,7 +159,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "cat scaling_governor"
@ -184,7 +173,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "cat cpu_freq"
@ -201,7 +189,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -237,7 +224,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "read SKP_VERSION",
@ -254,7 +240,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "rm SKP_VERSION"
@ -270,7 +255,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "rmdir skps"
@ -292,7 +276,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "exists skps",
@ -309,7 +292,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "mkdir skps"
@ -326,7 +308,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -342,7 +323,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "push SKP_VERSION"
@ -377,7 +357,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "read SK_IMAGE_VERSION",
@ -438,7 +417,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "rmdir skia_dm"
@ -460,7 +438,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "exists skia_dm",
@ -477,7 +454,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "mkdir skia_dm"
@ -515,7 +491,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "get uninteresting hashes",
@ -563,7 +538,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "push uninteresting_hashes.txt"
@ -921,7 +895,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -939,7 +912,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -955,7 +927,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "final battery stats"
@ -968,7 +939,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "reboot"
@ -981,7 +951,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "wait for reboot"
@ -995,7 +964,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -1010,7 +978,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -1024,7 +991,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "kill-server"

2
infra/bots/recipes/swarm_test.expected/failed_dm.json
View File

@ -116,7 +116,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "get uninteresting hashes",
@ -401,7 +400,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "dm",

28
infra/bots/recipes/swarm_test.expected/failed_get_hashes.json
View File

@ -20,7 +20,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -35,7 +34,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -51,7 +49,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "get EXTERNAL_STORAGE dir",
@ -65,7 +62,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "adb root",
@ -79,7 +75,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "wait"
@ -93,7 +88,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -108,7 +102,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -124,7 +117,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -139,7 +131,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "stop shell"
@ -154,7 +145,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "starting battery stats"
@ -169,7 +159,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "cat scaling_governor"
@ -184,7 +173,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "cat cpu_freq"
@ -201,7 +189,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -237,7 +224,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "read SKP_VERSION",
@ -273,7 +259,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "read SK_IMAGE_VERSION",
@ -334,7 +319,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "rmdir skia_dm"
@ -356,7 +340,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "exists skia_dm",
@ -373,7 +356,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "mkdir skia_dm"
@ -411,7 +393,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "get uninteresting hashes",
@ -461,7 +442,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "push uninteresting_hashes.txt"
@ -819,7 +799,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -837,7 +816,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -853,7 +831,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "final battery stats"
@ -866,7 +843,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "reboot"
@ -879,7 +855,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "wait for reboot"
@ -893,7 +868,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -908,7 +882,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -922,7 +895,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "kill-server"

34
infra/bots/recipes/swarm_test.expected/missing_SKP_VERSION_device.json
View File

@ -20,7 +20,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -35,7 +34,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -51,7 +49,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "get EXTERNAL_STORAGE dir",
@ -65,7 +62,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "adb root",
@ -79,7 +75,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "wait"
@ -93,7 +88,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -108,7 +102,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -124,7 +117,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -139,7 +131,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "stop shell"
@ -154,7 +145,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "starting battery stats"
@ -169,7 +159,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "cat scaling_governor"
@ -184,7 +173,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "cat cpu_freq"
@ -201,7 +189,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -237,7 +224,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "read SKP_VERSION",
@ -258,7 +244,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "rm SKP_VERSION"
@ -274,7 +259,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "rmdir skps"
@ -296,7 +280,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "exists skps",
@ -313,7 +296,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "mkdir skps"
@ -330,7 +312,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -346,7 +327,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "push SKP_VERSION"
@ -381,7 +361,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "read SK_IMAGE_VERSION",
@ -442,7 +421,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "rmdir skia_dm"
@ -464,7 +442,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "exists skia_dm",
@ -481,7 +458,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "mkdir skia_dm"
@ -519,7 +495,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "get uninteresting hashes",
@ -567,7 +542,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "push uninteresting_hashes.txt"
@ -925,7 +899,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -943,7 +916,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -959,7 +931,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "final battery stats"
@ -972,7 +943,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "reboot"
@ -985,7 +955,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "wait for reboot"
@ -999,7 +968,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -1014,7 +982,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -1028,7 +995,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "kill-server"

34
infra/bots/recipes/swarm_test.expected/missing_SK_IMAGE_VERSION_device.json
View File

@ -20,7 +20,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -35,7 +34,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -51,7 +49,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "get EXTERNAL_STORAGE dir",
@ -65,7 +62,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "adb root",
@ -79,7 +75,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "wait"
@ -93,7 +88,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -108,7 +102,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -124,7 +117,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -139,7 +131,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "stop shell"
@ -154,7 +145,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "starting battery stats"
@ -169,7 +159,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "cat scaling_governor"
@ -184,7 +173,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "cat cpu_freq"
@ -201,7 +189,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -237,7 +224,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "read SKP_VERSION",
@ -273,7 +259,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "read SK_IMAGE_VERSION",
@ -294,7 +279,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "rm SK_IMAGE_VERSION"
@ -310,7 +294,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "rmdir skia_images"
@ -332,7 +315,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "exists skia_images",
@ -349,7 +331,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "mkdir skia_images"
@ -366,7 +347,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -382,7 +362,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "push SK_IMAGE_VERSION"
@ -442,7 +421,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "rmdir skia_dm"
@ -464,7 +442,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "exists skia_dm",
@ -481,7 +458,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "mkdir skia_dm"
@ -519,7 +495,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "get uninteresting hashes",
@ -567,7 +542,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "push uninteresting_hashes.txt"
@ -925,7 +899,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -943,7 +916,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -959,7 +931,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "final battery stats"
@ -972,7 +943,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "reboot"
@ -985,7 +955,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "wait for reboot"
@ -999,7 +968,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -1014,7 +982,6 @@
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_ANDROID_VERBOSE_SETUP": "1",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
@ -1028,7 +995,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "kill-server"

6
infra/bots/recipes/swarm_test.py
View File

@ -163,11 +163,11 @@ def test_steps(api):
skip_flag = '--nocpu'
if skip_flag:
args.append(skip_flag)
args.extend(api.vars.dm_flags)
args.extend(api.vars.builder_spec['dm_flags'])
api.run(api.flavor.step, 'dm', cmd=args,
abort_on_failure=False,
env=api.vars.default_env)
abort_on_failure=False,
env=api.vars.default_env)
if api.vars.upload_dm_results:
# Copy images and JSON to host machine if needed.