diff options
Diffstat (limited to 'infra/bots')
81 files changed, 6257 insertions, 5246 deletions
diff --git a/infra/bots/gen_buildbot_specs.py b/infra/bots/gen_buildbot_specs.py deleted file mode 100755 index 6a2a91a623..0000000000 --- a/infra/bots/gen_buildbot_specs.py +++ /dev/null @@ -1,172 +0,0 @@ -#!/usr/bin/env python -# -# Copyright 2015 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - - -'''Generate buildbot specs for all buildbots.''' - - -import datetime -import imp -import json -import os -import re -import subprocess -import sys -import tempfile - - -SKIA_DIR = os.path.abspath(os.path.join( - os.path.dirname(os.path.realpath(__file__)), - os.pardir, os.pardir)) - -BUILDBOT_SPEC_FILE = os.path.join(SKIA_DIR, 'tools', 'buildbot_spec.py') - -SKIA_RECIPES = [ - 'swarm_compile.py', - 'swarm_housekeeper.py', - 'swarm_perf.py', - 'swarm_RecreateSKPs.py', - 'swarm_test.py', - 'swarm_trigger.py' -] - - -def prettier_print(obj, indent, stream=sys.stdout, max_line_length=80): - """Pretty-print the object, in a nicer format than pprint.""" - - def _breakline(line): - """Break the line to fit under N characters.""" - # If we're under the limit, just return. - if len(line) <= max_line_length: - return [line] - - # Dict entries. - m = re.match(r'^(\s+)(.+): (.+)$', line) - if m: - return (_breakline(m.groups()[0] + m.groups()[1] + ':') + - _breakline(m.groups()[0] + ' ' + m.groups()[2])) - - # List entries and dict keys. - m = re.match(r"^(\s+)'(.+)'([:,])$", line) - if m: - prefix = m.groups()[0] - content = m.groups()[1] - max_len = max_line_length - len(prefix) - len("(''):") - parts = [] - while len(content) > max_len: - parts.append(content[:max_len]) - content = content[max_len:] - parts.append(content) - lines = _breakline(prefix + "('" + parts[0] + "'") - for p in parts[1:-1]: - lines.extend(_breakline(prefix + " '" + p + "'")) - lines.extend(_breakline(prefix + " '" + parts[-1] + "')" + m.groups()[2])) - return lines - - class LineBreakingStream(object): - """Stream wrapper which writes line-by-line, breaking them as needed.""" - def __init__(self, backing_stream): - self._backing_stream = backing_stream - self._current_line = '' - - def _writeline(self, line): - for l in _breakline(line): - self._backing_stream.write(l + '\n') - - def write(self, s): - self._current_line += s - split = self._current_line.split('\n') - for w in split[:-1]: - self._writeline(w) - self._current_line = split[len(split)-1] - - def flush(self): - self._writeline(self._current_line) - - def _pprint(obj, indent, stream): - indent_str = ' ' * indent - if isinstance(obj, dict): - stream.write('{\n') - for k in sorted(obj.iterkeys()): - stream.write(indent_str + '\'%s\': ' % k) - _pprint(obj[k], indent + 2, stream=stream) - stream.write(',\n') - stream.write(' ' * (indent-2) + '}') - elif isinstance(obj, list): - stream.write('[\n') - for v in obj: - stream.write(indent_str) - _pprint(v, indent + 2, stream=stream) - stream.write(',\n') - stream.write(' ' * (indent-2) + ']') - elif isinstance(obj, basestring): - stream.write('\'%s\'' % obj) - elif isinstance(obj, bool): - if obj: - stream.write('True') - else: - stream.write('False') - else: - stream.write(obj) - - s = LineBreakingStream(stream) - _pprint(obj, indent, stream=s) - s.flush() - - -def get_bots(): - """Find all of the bots referenced in Skia recipes.""" - recipes = os.path.join(SKIA_DIR, 'infra', 'bots', 'recipes') - bots = [] - for skia_recipe in SKIA_RECIPES: - skia_recipe = os.path.join(recipes, skia_recipe) - skia = imp.load_source('skia', skia_recipe) - for _, slaves in skia.TEST_BUILDERS.iteritems(): - for _, builders in slaves.iteritems(): - bots.extend(builders) - bots.sort() - return bots - - -def main(): - """Generate a spec for each of the above bots. Dump them all to a file.""" - # Get the list of bots. - bots = get_bots() - - # Create the fake specs. - specs = {} - tmp_spec_file = tempfile.NamedTemporaryFile(delete=False) - tmp_spec_file.close() - try: - for bot in bots: - subprocess.check_call(['python', BUILDBOT_SPEC_FILE, - tmp_spec_file.name, bot]) - with open(tmp_spec_file.name) as f: - spec = json.load(f) - spec['dm_flags'] = ['--dummy-flags'] - spec['nanobench_flags'] = ['--dummy-flags'] - specs[bot] = spec - finally: - os.remove(tmp_spec_file.name) - - out = os.path.join( - SKIA_DIR, 'infra', 'bots', 'recipe_modules', 'core', 'fake_specs.py') - - with open(out, 'w') as f: - f.write('''# Copyright 2016 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -# This file is generated by the %s script. - -FAKE_SPECS = ''' % sys.argv[0]) - prettier_print(specs, indent=2, stream=f) - - print 'Wrote output to %s' % out - - -if __name__ == '__main__': - main() diff --git a/infra/bots/infrabots.isolate b/infra/bots/infrabots.isolate index 7415411c36..d7248f240e 100644 --- a/infra/bots/infrabots.isolate +++ b/infra/bots/infrabots.isolate @@ -1,13 +1,7 @@ { 'variables': { 'files': [ - '../../tools/__init__.py', - '../../tools/buildbot_spec.py', - '../../tools/builder_name_schema.json', - '../../tools/builder_name_schema.py', - '../../tools/dm_flags.py', '../../tools/lsan.supp', - '../../tools/nanobench_flags.py', '../../tools/tsan.supp', '../../tools/ubsan.supp', '../../tools/valgrind.supp', diff --git a/infra/bots/recipe_modules/builder_name_schema/__init__.py b/infra/bots/recipe_modules/builder_name_schema/__init__.py new file mode 100644 index 0000000000..a3c9297009 --- /dev/null +++ b/infra/bots/recipe_modules/builder_name_schema/__init__.py @@ -0,0 +1,6 @@ +# Copyright 2016 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +DEPS = [ +] diff --git a/infra/bots/recipe_modules/builder_name_schema/api.py b/infra/bots/recipe_modules/builder_name_schema/api.py new file mode 100644 index 0000000000..09228aa4b7 --- /dev/null +++ b/infra/bots/recipe_modules/builder_name_schema/api.py @@ -0,0 +1,39 @@ +# Copyright 2016 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + + +# pylint: disable=W0201 + + +from recipe_engine import recipe_api + +from . import builder_name_schema + + +class BuilderNameSchemaApi(recipe_api.RecipeApi): + def __init__(self, *args, **kwargs): + super(BuilderNameSchemaApi, self).__init__(*args, **kwargs) + + # See builder_name_schema.py for documentation. + self.BUILDER_NAME_SCHEMA = builder_name_schema.BUILDER_NAME_SCHEMA + self.BUILDER_NAME_SEP = builder_name_schema.BUILDER_NAME_SEP + + self.BUILDER_ROLE_CANARY = builder_name_schema.BUILDER_ROLE_CANARY + self.BUILDER_ROLE_BUILD = builder_name_schema.BUILDER_ROLE_BUILD + self.BUILDER_ROLE_HOUSEKEEPER = builder_name_schema.BUILDER_ROLE_HOUSEKEEPER + self.BUILDER_ROLE_INFRA = builder_name_schema.BUILDER_ROLE_INFRA + self.BUILDER_ROLE_PERF = builder_name_schema.BUILDER_ROLE_PERF + self.BUILDER_ROLE_TEST = builder_name_schema.BUILDER_ROLE_TEST + self.BUILDER_ROLES = builder_name_schema.BUILDER_ROLES + + self.TRYBOT_NAME_SUFFIX = builder_name_schema.TRYBOT_NAME_SUFFIX + + def MakeBuilderName(self, *args, **kwargs): + return builder_name_schema.MakeBuilderName(*args, **kwargs) + + def IsTrybot(self, *args, **kwargs): + return builder_name_schema.IsTrybot(*args, **kwargs) + + def DictForBuilderName(self, *args, **kwargs): + return builder_name_schema.DictForBuilderName(*args, **kwargs) diff --git a/infra/bots/recipe_modules/builder_name_schema/builder_name_schema.json b/infra/bots/recipe_modules/builder_name_schema/builder_name_schema.json new file mode 100644 index 0000000000..6a8c92175b --- /dev/null +++ b/infra/bots/recipe_modules/builder_name_schema/builder_name_schema.json @@ -0,0 +1,43 @@ +{ + "builder_name_schema": { + "Test": [ + "os", + "compiler", + "model", + "cpu_or_gpu", + "cpu_or_gpu_value", + "arch", + "configuration" + ], + "Housekeeper": [ + "frequency" + ], + "Infra": [ + "frequency" + ], + "Build": [ + "os", + "compiler", + "target_arch", + "configuration" + ], + "Perf": [ + "os", + "compiler", + "model", + "cpu_or_gpu", + "cpu_or_gpu_value", + "arch", + "configuration" + ], + "Canary": [ + "project", + "os", + "compiler", + "target_arch", + "configuration" + ] + }, + "builder_name_sep": "-", + "trybot_name_suffix": "Trybot" +} diff --git a/infra/bots/recipe_modules/builder_name_schema/builder_name_schema.py b/infra/bots/recipe_modules/builder_name_schema/builder_name_schema.py new file mode 100644 index 0000000000..125a51061e --- /dev/null +++ b/infra/bots/recipe_modules/builder_name_schema/builder_name_schema.py @@ -0,0 +1,167 @@ +# Copyright 2014 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + + +""" Utilities for dealing with builder names. This module obtains its attributes +dynamically from builder_name_schema.json. """ + + +import json +import os + + +# All of these global variables are filled in by _LoadSchema(). + +# The full schema. +BUILDER_NAME_SCHEMA = None + +# Character which separates parts of a builder name. +BUILDER_NAME_SEP = None + +# Builder roles. +BUILDER_ROLE_CANARY = 'Canary' +BUILDER_ROLE_BUILD = 'Build' +BUILDER_ROLE_HOUSEKEEPER = 'Housekeeper' +BUILDER_ROLE_INFRA = 'Infra' +BUILDER_ROLE_PERF = 'Perf' +BUILDER_ROLE_TEST = 'Test' +BUILDER_ROLES = (BUILDER_ROLE_CANARY, + BUILDER_ROLE_BUILD, + BUILDER_ROLE_HOUSEKEEPER, + BUILDER_ROLE_INFRA, + BUILDER_ROLE_PERF, + BUILDER_ROLE_TEST) + +# Suffix which distinguishes trybots from normal bots. +TRYBOT_NAME_SUFFIX = None + + +def _LoadSchema(): + """ Load the builder naming schema from the JSON file. """ + + def _UnicodeToStr(obj): + """ Convert all unicode strings in obj to Python strings. """ + if isinstance(obj, unicode): + return str(obj) + elif isinstance(obj, dict): + return dict(map(_UnicodeToStr, obj.iteritems())) + elif isinstance(obj, list): + return list(map(_UnicodeToStr, obj)) + elif isinstance(obj, tuple): + return tuple(map(_UnicodeToStr, obj)) + else: + return obj # pragma: no cover + + builder_name_json_filename = os.path.join( + os.path.dirname(__file__), 'builder_name_schema.json') + builder_name_schema_json = json.load(open(builder_name_json_filename)) + + global BUILDER_NAME_SCHEMA + BUILDER_NAME_SCHEMA = _UnicodeToStr( + builder_name_schema_json['builder_name_schema']) + + global BUILDER_NAME_SEP + BUILDER_NAME_SEP = _UnicodeToStr( + builder_name_schema_json['builder_name_sep']) + + global TRYBOT_NAME_SUFFIX + TRYBOT_NAME_SUFFIX = _UnicodeToStr( + builder_name_schema_json['trybot_name_suffix']) + + # Since the builder roles are dictionary keys, just assert that the global + # variables above account for all of them. + assert len(BUILDER_ROLES) == len(BUILDER_NAME_SCHEMA) + for role in BUILDER_ROLES: + assert role in BUILDER_NAME_SCHEMA + + +_LoadSchema() + + +def MakeBuilderName(role, extra_config=None, is_trybot=False, **kwargs): + schema = BUILDER_NAME_SCHEMA.get(role) + if not schema: # pragma: no cover + raise ValueError('%s is not a recognized role.' % role) + for k, v in kwargs.iteritems(): + if BUILDER_NAME_SEP in v: # pragma: no cover + raise ValueError('%s not allowed in %s.' % (BUILDER_NAME_SEP, v)) + if not k in schema: # pragma: no cover + raise ValueError('Schema does not contain "%s": %s' %(k, schema)) + if extra_config and BUILDER_NAME_SEP in extra_config: # pragma: no cover + raise ValueError('%s not allowed in %s.' % (BUILDER_NAME_SEP, + extra_config)) + name_parts = [role] + name_parts.extend([kwargs[attribute] for attribute in schema]) + if extra_config: + name_parts.append(extra_config) + if is_trybot: + name_parts.append(TRYBOT_NAME_SUFFIX) + return BUILDER_NAME_SEP.join(name_parts) + + +def IsTrybot(builder_name): + """ Returns true if builder_name refers to a trybot (as opposed to a + waterfall bot). """ + return builder_name.endswith(TRYBOT_NAME_SUFFIX) + + +def GetWaterfallBot(builder_name): # pragma: no cover + """Returns the name of the waterfall bot for this builder. If it is not a + trybot, builder_name is returned unchanged. If it is a trybot the name is + returned without the trybot suffix.""" + if not IsTrybot(builder_name): + return builder_name + return _WithoutSuffix(builder_name, BUILDER_NAME_SEP + TRYBOT_NAME_SUFFIX) + + +def TrybotName(builder_name): # pragma: no cover + """Returns the name of the trybot clone of this builder. + + If the given builder is a trybot, the name is returned unchanged. If not, the + TRYBOT_NAME_SUFFIX is appended. + """ + if builder_name.endswith(TRYBOT_NAME_SUFFIX): + return builder_name + return builder_name + BUILDER_NAME_SEP + TRYBOT_NAME_SUFFIX + + +def _WithoutSuffix(string, suffix): # pragma: no cover + """ Returns a copy of string 'string', but with suffix 'suffix' removed. + Raises ValueError if string does not end with suffix. """ + if not string.endswith(suffix): + raise ValueError('_WithoutSuffix: string %s does not end with suffix %s' % ( + string, suffix)) + return string[:-len(suffix)] + + +def DictForBuilderName(builder_name): + """Makes a dictionary containing details about the builder from its name.""" + split_name = builder_name.split(BUILDER_NAME_SEP) + + def pop_front(): + try: + return split_name.pop(0) + except: # pragma: no cover + raise ValueError('Invalid builder name: %s' % builder_name) + + result = {'is_trybot': False} + + if split_name[-1] == TRYBOT_NAME_SUFFIX: + result['is_trybot'] = True + split_name.pop() + + if split_name[0] in BUILDER_NAME_SCHEMA.keys(): + key_list = BUILDER_NAME_SCHEMA[split_name[0]] + result['role'] = pop_front() + for key in key_list: + result[key] = pop_front() + if split_name: + result['extra_config'] = pop_front() + if split_name: # pragma: no cover + raise ValueError('Invalid builder name: %s' % builder_name) + else: # pragma: no cover + raise ValueError('Invalid builder name: %s' % builder_name) + return result + + diff --git a/infra/bots/recipe_modules/core/api.py b/infra/bots/recipe_modules/core/api.py index 130ea70562..377026432e 100644 --- a/infra/bots/recipe_modules/core/api.py +++ b/infra/bots/recipe_modules/core/api.py @@ -14,23 +14,9 @@ import sys from recipe_engine import recipe_api from recipe_engine import config_types -from . import fake_specs - class SkiaApi(recipe_api.RecipeApi): - def get_builder_spec(self, skia_dir, builder_name): - """Obtain the buildbot spec for the given builder.""" - fake_spec = None - if self._test_data.enabled: - fake_spec = fake_specs.FAKE_SPECS[builder_name] - builder_spec = self.m.run.json_from_file( - skia_dir.join('tools', 'buildbot_spec.py'), - skia_dir, - builder_name, - fake_spec) - return builder_spec - def setup(self): """Prepare the bot to run.""" # Setup dependencies. @@ -41,18 +27,16 @@ class SkiaApi(recipe_api.RecipeApi): # Obtain the spec for this builder from the Skia repo. Use it to set more # properties. - builder_spec = self.get_builder_spec(self.m.vars.skia_dir, - self.m.vars.builder_name) + builder_spec = self.m.vars.get_builder_spec(self.m.vars.builder_name) # Continue setting up vars with the builder_spec. self.m.vars.update_with_builder_spec(builder_spec) - if not self.m.path.exists(self.m.vars.tmp_dir): self.m.run.run_once(self.m.file.makedirs, - 'tmp_dir', - self.m.vars.tmp_dir, - infra_step=True) + 'tmp_dir', + self.m.vars.tmp_dir, + infra_step=True) self.m.flavor.setup() diff --git a/infra/bots/recipe_modules/core/fake_specs.py b/infra/bots/recipe_modules/core/fake_specs.py deleted file mode 100644 index 5041ca9beb..0000000000 --- a/infra/bots/recipe_modules/core/fake_specs.py +++ /dev/null @@ -1,1526 +0,0 @@ -# Copyright 2016 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -# This file is generated by the infra/bots/gen_buildbot_specs.py script. - -FAKE_SPECS = { - 'Build-Mac-Clang-Arm7-Debug-Android': { - 'build_targets': [ - 'most', - ], - 'builder_cfg': { - 'compiler': 'Clang', - 'configuration': 'Debug', - 'extra_config': 'Android', - 'is_trybot': False, - 'os': 'Mac', - 'role': 'Build', - 'target_arch': 'Arm7', - }, - 'configuration': 'Debug', - 'device_cfg': 'arm_v7_neon', - 'dm_flags': [ - '--dummy-flags', - ], - 'do_perf_steps': False, - 'do_test_steps': False, - 'env': { - 'CC': '/usr/bin/clang', - 'CXX': '/usr/bin/clang++', - 'GYP_DEFINES': - 'skia_arch_type=arm skia_clang_build=1 skia_warnings_as_errors=0', - }, - 'nanobench_flags': [ - '--dummy-flags', - ], - 'upload_dm_results': True, - 'upload_perf_results': False, - }, - 'Build-Mac-Clang-Arm7-Release-iOS': { - 'build_targets': [ - 'most', - ], - 'builder_cfg': { - 'compiler': 'Clang', - 'configuration': 'Release', - 'extra_config': 'iOS', - 'is_trybot': False, - 'os': 'Mac', - 'role': 'Build', - 'target_arch': 'Arm7', - }, - 'configuration': 'Release', - 'dm_flags': [ - '--dummy-flags', - ], - 'do_perf_steps': False, - 'do_test_steps': False, - 'env': { - 'CC': '/usr/bin/clang', - 'CXX': '/usr/bin/clang++', - 'GYP_DEFINES': - ('skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_a' - 's_errors=1'), - }, - 'nanobench_flags': [ - '--dummy-flags', - ], - 'upload_dm_results': True, - 'upload_perf_results': False, - }, - 'Build-Mac-Clang-x86_64-Debug-CommandBuffer': { - 'build_targets': [ - 'most', - ], - 'builder_cfg': { - 'compiler': 'Clang', - 'configuration': 'Debug', - 'extra_config': 'CommandBuffer', - 'is_trybot': False, - 'os': 'Mac', - 'role': 'Build', - 'target_arch': 'x86_64', - }, - 'configuration': 'Debug', - 'dm_flags': [ - '--dummy-flags', - ], - 'do_perf_steps': False, - 'do_test_steps': False, - 'env': { - 'CC': '/usr/bin/clang', - 'CXX': '/usr/bin/clang++', - 'GYP_DEFINES': - ('skia_arch_type=x86_64 skia_clang_build=1 skia_command_buffer=1 sk' - 'ia_warnings_as_errors=1'), - }, - 'nanobench_flags': [ - '--dummy-flags', - ], - 'upload_dm_results': True, - 'upload_perf_results': False, - }, - 'Build-Mac-Clang-x86_64-Release': { - 'build_targets': [ - 'most', - ], - 'builder_cfg': { - 'compiler': 'Clang', - 'configuration': 'Release', - 'is_trybot': False, - 'os': 'Mac', - 'role': 'Build', - 'target_arch': 'x86_64', - }, - 'configuration': 'Release', - 'dm_flags': [ - '--dummy-flags', - ], - 'do_perf_steps': False, - 'do_test_steps': False, - 'env': { - 'CC': '/usr/bin/clang', - 'CXX': '/usr/bin/clang++', - 'GYP_DEFINES': - 'skia_arch_type=x86_64 skia_clang_build=1 skia_warnings_as_errors=1', - }, - 'nanobench_flags': [ - '--dummy-flags', - ], - 'upload_dm_results': True, - 'upload_perf_results': False, - }, - 'Build-Mac-Clang-x86_64-Release-CMake': { - 'build_targets': [ - 'most', - ], - 'builder_cfg': { - 'compiler': 'Clang', - 'configuration': 'Release', - 'extra_config': 'CMake', - 'is_trybot': False, - 'os': 'Mac', - 'role': 'Build', - 'target_arch': 'x86_64', - }, - 'configuration': 'Release', - 'dm_flags': [ - '--dummy-flags', - ], - 'do_perf_steps': False, - 'do_test_steps': False, - 'env': { - 'CC': '/usr/bin/clang', - 'CXX': '/usr/bin/clang++', - 'GYP_DEFINES': - 'skia_arch_type=x86_64 skia_clang_build=1 skia_warnings_as_errors=1', - }, - 'nanobench_flags': [ - '--dummy-flags', - ], - 'upload_dm_results': True, - 'upload_perf_results': False, - }, - 'Build-Ubuntu-Clang-x86_64-Debug-GN': { - 'build_targets': [ - 'most', - ], - 'builder_cfg': { - 'compiler': 'Clang', - 'configuration': 'Debug', - 'extra_config': 'GN', - 'is_trybot': False, - 'os': 'Ubuntu', - 'role': 'Build', - 'target_arch': 'x86_64', - }, - 'configuration': 'Debug', - 'dm_flags': [ - '--dummy-flags', - ], - 'do_perf_steps': False, - 'do_test_steps': False, - 'env': { - 'CC': '/usr/bin/clang', - 'CXX': '/usr/bin/clang++', - 'GYP_DEFINES': - 'skia_arch_type=x86_64 skia_clang_build=1 skia_warnings_as_errors=1', - }, - 'nanobench_flags': [ - '--dummy-flags', - ], - 'upload_dm_results': True, - 'upload_perf_results': False, - }, - 'Build-Ubuntu-GCC-Arm64-Debug-Android_Vulkan': { - 'build_targets': [ - 'most', - ], - 'builder_cfg': { - 'compiler': 'GCC', - 'configuration': 'Debug', - 'extra_config': 'Android_Vulkan', - 'is_trybot': False, - 'os': 'Ubuntu', - 'role': 'Build', - 'target_arch': 'Arm64', - }, - 'configuration': 'Debug', - 'device_cfg': 'arm64', - 'dm_flags': [ - '--dummy-flags', - ], - 'do_perf_steps': False, - 'do_test_steps': False, - 'env': { - 'GYP_DEFINES': 'skia_arch_type=arm64 skia_warnings_as_errors=1', - }, - 'nanobench_flags': [ - '--dummy-flags', - ], - 'upload_dm_results': True, - 'upload_perf_results': False, - }, - 'Build-Ubuntu-GCC-Arm7-Debug-Android-Trybot': { - 'build_targets': [ - 'most', - ], - 'builder_cfg': { - 'compiler': 'GCC', - 'configuration': 'Debug', - 'extra_config': 'Android', - 'is_trybot': True, - 'os': 'Ubuntu', - 'role': 'Build', - 'target_arch': 'Arm7', - }, - 'configuration': 'Debug', - 'device_cfg': 'arm_v7_neon', - 'dm_flags': [ - '--dummy-flags', - ], - 'do_perf_steps': False, - 'do_test_steps': False, - 'env': { - 'GYP_DEFINES': 'skia_arch_type=arm skia_warnings_as_errors=1', - }, - 'nanobench_flags': [ - '--dummy-flags', - ], - 'upload_dm_results': True, - 'upload_perf_results': False, - }, - 'Build-Ubuntu-GCC-Arm7-Release-Android': { - 'build_targets': [ - 'most', - ], - 'builder_cfg': { - 'compiler': 'GCC', - 'configuration': 'Release', - 'extra_config': 'Android', - 'is_trybot': False, - 'os': 'Ubuntu', - 'role': 'Build', - 'target_arch': 'Arm7', - }, - 'configuration': 'Release', - 'device_cfg': 'arm_v7_neon', - 'dm_flags': [ - '--dummy-flags', - ], - 'do_perf_steps': False, - 'do_test_steps': False, - 'env': { - 'GYP_DEFINES': 'skia_arch_type=arm skia_warnings_as_errors=1', - }, - 'nanobench_flags': [ - '--dummy-flags', - ], - 'upload_dm_results': True, - 'upload_perf_results': False, - }, - 'Build-Ubuntu-GCC-Arm7-Release-Android_Vulkan': { - 'build_targets': [ - 'most', - ], - 'builder_cfg': { - 'compiler': 'GCC', - 'configuration': 'Release', - 'extra_config': 'Android_Vulkan', - 'is_trybot': False, - 'os': 'Ubuntu', - 'role': 'Build', - 'target_arch': 'Arm7', - }, - 'configuration': 'Release', - 'device_cfg': 'arm_v7_neon', - 'dm_flags': [ - '--dummy-flags', - ], - 'do_perf_steps': False, - 'do_test_steps': False, - 'env': { - 'GYP_DEFINES': 'skia_arch_type=arm skia_warnings_as_errors=1', - }, - 'nanobench_flags': [ - '--dummy-flags', - ], - 'upload_dm_results': True, - 'upload_perf_results': False, - }, - 'Build-Ubuntu-GCC-x86-Debug': { - 'build_targets': [ - 'most', - ], - 'builder_cfg': { - 'compiler': 'GCC', - 'configuration': 'Debug', - 'is_trybot': False, - 'os': 'Ubuntu', - 'role': 'Build', - 'target_arch': 'x86', - }, - 'configuration': 'Debug', - 'dm_flags': [ - '--dummy-flags', - ], - 'do_perf_steps': False, - 'do_test_steps': False, - 'env': { - 'GYP_DEFINES': 'skia_arch_type=x86 skia_warnings_as_errors=1', - }, - 'nanobench_flags': [ - '--dummy-flags', - ], - 'upload_dm_results': True, - 'upload_perf_results': False, - }, - 'Build-Ubuntu-GCC-x86_64-Debug': { - 'build_targets': [ - 'most', - ], - 'builder_cfg': { - 'compiler': 'GCC', - 'configuration': 'Debug', - 'is_trybot': False, - 'os': 'Ubuntu', - 'role': 'Build', - 'target_arch': 'x86_64', - }, - 'configuration': 'Debug', - 'dm_flags': [ - '--dummy-flags', - ], - 'do_perf_steps': False, - 'do_test_steps': False, - 'env': { - 'GYP_DEFINES': 'skia_arch_type=x86_64 skia_warnings_as_errors=1', - }, - 'nanobench_flags': [ - '--dummy-flags', - ], - 'upload_dm_results': True, - 'upload_perf_results': False, - }, - 'Build-Ubuntu-GCC-x86_64-Debug-GN': { - 'build_targets': [ - 'most', - ], - 'builder_cfg': { - 'compiler': 'GCC', - 'configuration': 'Debug', - 'extra_config': 'GN', - 'is_trybot': False, - 'os': 'Ubuntu', - 'role': 'Build', - 'target_arch': 'x86_64', - }, - 'configuration': 'Debug', - 'dm_flags': [ - '--dummy-flags', - ], - 'do_perf_steps': False, - 'do_test_steps': False, - 'env': { - 'GYP_DEFINES': 'skia_arch_type=x86_64 skia_warnings_as_errors=1', - }, - 'nanobench_flags': [ - '--dummy-flags', - ], - 'upload_dm_results': True, - 'upload_perf_results': False, - }, - 'Build-Ubuntu-GCC-x86_64-Debug-MSAN': { - 'build_targets': [ - 'dm', - 'nanobench', - ], - 'builder_cfg': { - 'compiler': 'GCC', - 'configuration': 'Debug', - 'extra_config': 'MSAN', - 'is_trybot': False, - 'os': 'Ubuntu', - 'role': 'Build', - 'target_arch': 'x86_64', - }, - 'configuration': 'Debug', - 'dm_flags': [ - '--dummy-flags', - ], - 'do_perf_steps': False, - 'do_test_steps': False, - 'env': { - 'GYP_DEFINES': 'skia_arch_type=x86_64 skia_warnings_as_errors=1', - }, - 'nanobench_flags': [ - '--dummy-flags', - ], - 'upload_dm_results': False, - 'upload_perf_results': False, - }, - 'Build-Ubuntu-GCC-x86_64-Release-CMake': { - 'build_targets': [ - 'most', - ], - 'builder_cfg': { - 'compiler': 'GCC', - 'configuration': 'Release', - 'extra_config': 'CMake', - 'is_trybot': False, - 'os': 'Ubuntu', - 'role': 'Build', - 'target_arch': 'x86_64', - }, - 'configuration': 'Release', - 'dm_flags': [ - '--dummy-flags', - ], - 'do_perf_steps': False, - 'do_test_steps': False, - 'env': { - 'GYP_DEFINES': 'skia_arch_type=x86_64 skia_warnings_as_errors=1', - }, - 'nanobench_flags': [ - '--dummy-flags', - ], - 'upload_dm_results': True, - 'upload_perf_results': False, - }, - 'Build-Ubuntu-GCC-x86_64-Release-PDFium': { - 'build_targets': [ - 'most', - ], - 'builder_cfg': { - 'compiler': 'GCC', - 'configuration': 'Release', - 'extra_config': 'PDFium', - 'is_trybot': False, - 'os': 'Ubuntu', - 'role': 'Build', - 'target_arch': 'x86_64', - }, - 'configuration': 'Release', - 'dm_flags': [ - '--dummy-flags', - ], - 'do_perf_steps': False, - 'do_test_steps': False, - 'env': { - 'GYP_DEFINES': 'skia_arch_type=x86_64 skia_warnings_as_errors=1', - }, - 'nanobench_flags': [ - '--dummy-flags', - ], - 'upload_dm_results': True, - 'upload_perf_results': False, - }, - 'Build-Ubuntu-GCC-x86_64-Release-RemoteRun': { - 'build_targets': [ - 'most', - ], - 'builder_cfg': { - 'compiler': 'GCC', - 'configuration': 'Release', - 'extra_config': 'RemoteRun', - 'is_trybot': False, - 'os': 'Ubuntu', - 'role': 'Build', - 'target_arch': 'x86_64', - }, - 'configuration': 'Release', - 'dm_flags': [ - '--dummy-flags', - ], - 'do_perf_steps': False, - 'do_test_steps': False, - 'env': { - 'GYP_DEFINES': 'skia_arch_type=x86_64 skia_warnings_as_errors=1', - }, - 'nanobench_flags': [ - '--dummy-flags', - ], - 'upload_dm_results': True, - 'upload_perf_results': False, - }, - 'Build-Ubuntu-GCC-x86_64-Release-Shared': { - 'build_targets': [ - 'most', - ], - 'builder_cfg': { - 'compiler': 'GCC', - 'configuration': 'Release', - 'extra_config': 'Shared', - 'is_trybot': False, - 'os': 'Ubuntu', - 'role': 'Build', - 'target_arch': 'x86_64', - }, - 'configuration': 'Release', - 'dm_flags': [ - '--dummy-flags', - ], - 'do_perf_steps': False, - 'do_test_steps': False, - 'env': { - 'GYP_DEFINES': - 'skia_arch_type=x86_64 skia_shared_lib=1 skia_warnings_as_errors=1', - }, - 'nanobench_flags': [ - '--dummy-flags', - ], - 'upload_dm_results': True, - 'upload_perf_results': False, - }, - 'Build-Ubuntu-GCC-x86_64-Release-Trybot': { - 'build_targets': [ - 'most', - ], - 'builder_cfg': { - 'compiler': 'GCC', - 'configuration': 'Release', - 'is_trybot': True, - 'os': 'Ubuntu', - 'role': 'Build', - 'target_arch': 'x86_64', - }, - 'configuration': 'Release', - 'dm_flags': [ - '--dummy-flags', - ], - 'do_perf_steps': False, - 'do_test_steps': False, - 'env': { - 'GYP_DEFINES': 'skia_arch_type=x86_64 skia_warnings_as_errors=1', - }, - 'nanobench_flags': [ - '--dummy-flags', - ], - 'upload_dm_results': True, - 'upload_perf_results': False, - }, - 'Build-Ubuntu-GCC-x86_64-Release-Valgrind': { - 'build_targets': [ - 'most', - ], - 'builder_cfg': { - 'compiler': 'GCC', - 'configuration': 'Release', - 'extra_config': 'Valgrind', - 'is_trybot': False, - 'os': 'Ubuntu', - 'role': 'Build', - 'target_arch': 'x86_64', - }, - 'configuration': 'Release', - 'dm_flags': [ - '--dummy-flags', - ], - 'do_perf_steps': False, - 'do_test_steps': False, - 'env': { - 'GYP_DEFINES': - ('skia_arch_type=x86_64 skia_release_optimization_level=1 skia_warn' - 'ings_as_errors=1'), - }, - 'nanobench_flags': [ - '--dummy-flags', - ], - 'upload_dm_results': False, - 'upload_perf_results': False, - }, - 'Build-Win-MSVC-x86-Debug': { - 'build_targets': [ - 'most', - ], - 'builder_cfg': { - 'compiler': 'MSVC', - 'configuration': 'Debug', - 'is_trybot': False, - 'os': 'Win', - 'role': 'Build', - 'target_arch': 'x86', - }, - 'configuration': 'Debug', - 'dm_flags': [ - '--dummy-flags', - ], - 'do_perf_steps': False, - 'do_test_steps': False, - 'env': { - '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'), - }, - 'nanobench_flags': [ - '--dummy-flags', - ], - 'upload_dm_results': True, - 'upload_perf_results': False, - }, - 'Build-Win-MSVC-x86-Release-GN': { - 'build_targets': [ - 'most', - ], - 'builder_cfg': { - 'compiler': 'MSVC', - 'configuration': 'Release', - 'extra_config': 'GN', - 'is_trybot': False, - 'os': 'Win', - 'role': 'Build', - 'target_arch': 'x86', - }, - 'configuration': 'Release', - 'dm_flags': [ - '--dummy-flags', - ], - 'do_perf_steps': False, - 'do_test_steps': False, - 'env': { - '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'), - }, - 'nanobench_flags': [ - '--dummy-flags', - ], - 'upload_dm_results': True, - 'upload_perf_results': False, - }, - 'Build-Win-MSVC-x86_64-Release': { - 'build_targets': [ - 'most', - ], - 'builder_cfg': { - 'compiler': 'MSVC', - 'configuration': 'Release', - 'is_trybot': False, - 'os': 'Win', - 'role': 'Build', - 'target_arch': 'x86_64', - }, - 'configuration': 'Release_x64', - 'dm_flags': [ - '--dummy-flags', - ], - 'do_perf_steps': False, - 'do_test_steps': False, - 'env': { - 'GYP_DEFINES': - ('qt_sdk=C:/Qt/4.8.5/ skia_arch_type=x86_64 skia_warnings_as_errors' - '=1 skia_win_debuggers_path=c:/DbgHelp skia_win_ltcg=0'), - }, - 'nanobench_flags': [ - '--dummy-flags', - ], - 'upload_dm_results': True, - 'upload_perf_results': False, - }, - 'Build-Win-MSVC-x86_64-Release-Vulkan': { - 'build_targets': [ - 'most', - ], - 'builder_cfg': { - 'compiler': 'MSVC', - 'configuration': 'Release', - 'extra_config': 'Vulkan', - 'is_trybot': False, - 'os': 'Win', - 'role': 'Build', - 'target_arch': 'x86_64', - }, - 'configuration': 'Release_x64', - 'dm_flags': [ - '--dummy-flags', - ], - 'do_perf_steps': False, - 'do_test_steps': False, - 'env': { - 'GYP_DEFINES': - ('qt_sdk=C:/Qt/4.8.5/ skia_arch_type=x86_64 skia_vulkan=1 skia_vulk' - 'an_debug_layers=0 skia_warnings_as_errors=1 skia_win_debuggers_pa' - 'th=c:/DbgHelp skia_win_ltcg=0'), - }, - 'nanobench_flags': [ - '--dummy-flags', - ], - 'upload_dm_results': True, - 'upload_perf_results': False, - }, - 'Housekeeper-Nightly-RecreateSKPs_Canary': { - 'build_targets': [ - 'most', - ], - 'builder_cfg': { - 'extra_config': 'RecreateSKPs_Canary', - 'frequency': 'Nightly', - 'is_trybot': False, - 'role': 'Housekeeper', - }, - 'configuration': 'Release', - 'dm_flags': [ - '--dummy-flags', - ], - 'do_perf_steps': False, - 'do_test_steps': False, - 'env': { - 'GYP_DEFINES': 'skia_shared_lib=1 skia_warnings_as_errors=0', - }, - 'nanobench_flags': [ - '--dummy-flags', - ], - 'upload_dm_results': True, - 'upload_perf_results': False, - }, - 'Housekeeper-PerCommit': { - 'build_targets': [ - 'most', - ], - 'builder_cfg': { - 'frequency': 'PerCommit', - 'is_trybot': False, - 'role': 'Housekeeper', - }, - 'configuration': 'Release', - 'dm_flags': [ - '--dummy-flags', - ], - 'do_perf_steps': False, - 'do_test_steps': False, - 'env': { - 'GYP_DEFINES': 'skia_shared_lib=1 skia_warnings_as_errors=0', - }, - 'nanobench_flags': [ - '--dummy-flags', - ], - 'upload_dm_results': True, - 'upload_perf_results': False, - }, - 'Housekeeper-PerCommit-Trybot': { - 'build_targets': [ - 'most', - ], - 'builder_cfg': { - 'frequency': 'PerCommit', - 'is_trybot': True, - 'role': 'Housekeeper', - }, - 'configuration': 'Release', - 'dm_flags': [ - '--dummy-flags', - ], - 'do_perf_steps': False, - 'do_test_steps': False, - 'env': { - 'GYP_DEFINES': 'skia_shared_lib=1 skia_warnings_as_errors=0', - }, - 'nanobench_flags': [ - '--dummy-flags', - ], - 'upload_dm_results': True, - 'upload_perf_results': False, - }, - 'Housekeeper-Weekly-RecreateSKPs': { - 'build_targets': [ - 'most', - ], - 'builder_cfg': { - 'extra_config': 'RecreateSKPs', - 'frequency': 'Weekly', - 'is_trybot': False, - 'role': 'Housekeeper', - }, - 'configuration': 'Release', - 'dm_flags': [ - '--dummy-flags', - ], - 'do_perf_steps': False, - 'do_test_steps': False, - 'env': { - 'GYP_DEFINES': 'skia_shared_lib=1 skia_warnings_as_errors=0', - }, - 'nanobench_flags': [ - '--dummy-flags', - ], - 'upload_dm_results': True, - 'upload_perf_results': False, - }, - 'Infra-PerCommit': { - 'build_targets': [ - 'most', - ], - 'builder_cfg': { - 'frequency': 'PerCommit', - 'is_trybot': False, - 'role': 'Infra', - }, - 'configuration': 'Debug', - 'dm_flags': [ - '--dummy-flags', - ], - 'do_perf_steps': False, - 'do_test_steps': False, - 'env': { - 'GYP_DEFINES': 'skia_warnings_as_errors=0', - }, - 'nanobench_flags': [ - '--dummy-flags', - ], - 'upload_dm_results': True, - 'upload_perf_results': False, - }, - 'Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release': { - 'build_targets': [ - 'nanobench', - ], - 'builder_cfg': { - 'arch': 'Arm7', - 'compiler': 'GCC', - 'configuration': 'Release', - 'cpu_or_gpu': 'GPU', - 'cpu_or_gpu_value': 'Tegra3', - 'is_trybot': False, - 'model': 'Nexus7', - 'os': 'Android', - 'role': 'Perf', - }, - 'configuration': 'Release', - 'device_cfg': 'arm_v7_neon', - 'dm_flags': [ - '--dummy-flags', - ], - 'do_perf_steps': True, - 'do_test_steps': False, - 'env': { - 'GYP_DEFINES': - 'skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0', - }, - 'nanobench_flags': [ - '--dummy-flags', - ], - 'product.board': 'grouper', - 'upload_dm_results': True, - 'upload_perf_results': True, - }, - 'Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Trybot': { - 'build_targets': [ - 'nanobench', - ], - 'builder_cfg': { - 'arch': 'x86_64', - 'compiler': 'GCC', - 'configuration': 'Release', - 'cpu_or_gpu': 'CPU', - 'cpu_or_gpu_value': 'AVX2', - 'is_trybot': True, - 'model': 'GCE', - 'os': 'Ubuntu', - 'role': 'Perf', - }, - 'configuration': 'Release', - 'dm_flags': [ - '--dummy-flags', - ], - 'do_perf_steps': True, - 'do_test_steps': False, - 'env': { - 'GYP_DEFINES': - 'skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0', - }, - 'nanobench_flags': [ - '--dummy-flags', - ], - 'upload_dm_results': True, - 'upload_perf_results': True, - }, - 'Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind': { - 'build_targets': [ - 'nanobench', - ], - 'builder_cfg': { - 'arch': 'x86_64', - 'compiler': 'GCC', - 'configuration': 'Release', - 'cpu_or_gpu': 'GPU', - 'cpu_or_gpu_value': 'GTX550Ti', - 'extra_config': 'Valgrind', - 'is_trybot': False, - 'model': 'ShuttleA', - 'os': 'Ubuntu', - 'role': 'Perf', - }, - 'configuration': 'Release', - 'dm_flags': [ - '--dummy-flags', - ], - 'do_perf_steps': True, - 'do_test_steps': False, - 'env': { - 'GYP_DEFINES': - ('skia_arch_type=x86_64 skia_dump_stats=1 skia_release_optimization' - '_level=1 skia_warnings_as_errors=0'), - }, - 'nanobench_flags': [ - '--dummy-flags', - ], - 'upload_dm_results': False, - 'upload_perf_results': True, - }, - 'Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench': { - 'build_targets': [ - 'visualbench', - ], - 'builder_cfg': { - 'arch': 'x86_64', - 'compiler': 'GCC', - 'configuration': 'Release', - 'cpu_or_gpu': 'GPU', - 'cpu_or_gpu_value': 'GTX550Ti', - 'extra_config': 'VisualBench', - 'is_trybot': False, - 'model': 'ShuttleA', - 'os': 'Ubuntu', - 'role': 'Perf', - }, - 'configuration': 'Release', - 'dm_flags': [ - '--dummy-flags', - ], - 'do_perf_steps': True, - 'do_test_steps': False, - 'env': { - 'GYP_DEFINES': - ('skia_arch_type=x86_64 skia_dump_stats=1 skia_use_sdl=1 skia_warni' - 'ngs_as_errors=0'), - }, - 'nanobench_flags': [ - '--dummy-flags', - ], - 'upload_dm_results': True, - 'upload_perf_results': True, - }, - 'Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug': { - 'build_targets': [ - 'nanobench', - ], - 'builder_cfg': { - 'arch': 'x86_64', - 'compiler': 'MSVC', - 'configuration': 'Debug', - 'cpu_or_gpu': 'CPU', - 'cpu_or_gpu_value': 'AVX2', - 'is_trybot': False, - 'model': 'GCE', - 'os': 'Win', - 'role': 'Perf', - }, - 'configuration': 'Debug_x64', - 'dm_flags': [ - '--dummy-flags', - ], - 'do_perf_steps': True, - 'do_test_steps': False, - 'env': { - 'GYP_DEFINES': - ('qt_sdk=C:/Qt/4.8.5/ skia_arch_type=x86_64 skia_gpu=0 skia_warning' - 's_as_errors=0 skia_win_debuggers_path=c:/DbgHelp'), - }, - 'nanobench_flags': [ - '--dummy-flags', - ], - 'upload_dm_results': True, - 'upload_perf_results': False, - }, - 'Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release': { - 'build_targets': [ - 'nanobench', - ], - 'builder_cfg': { - 'arch': 'x86_64', - 'compiler': 'MSVC', - 'configuration': 'Release', - 'cpu_or_gpu': 'CPU', - 'cpu_or_gpu_value': 'AVX2', - 'is_trybot': False, - 'model': 'GCE', - 'os': 'Win', - 'role': 'Perf', - }, - 'configuration': 'Release_x64', - 'dm_flags': [ - '--dummy-flags', - ], - 'do_perf_steps': True, - 'do_test_steps': False, - 'env': { - 'GYP_DEFINES': - ('qt_sdk=C:/Qt/4.8.5/ skia_arch_type=x86_64 skia_gpu=0 skia_warning' - 's_as_errors=0 skia_win_debuggers_path=c:/DbgHelp'), - }, - 'nanobench_flags': [ - '--dummy-flags', - ], - 'upload_dm_results': True, - 'upload_perf_results': True, - }, - 'Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot': { - 'build_targets': [ - 'nanobench', - ], - 'builder_cfg': { - 'arch': 'x86_64', - 'compiler': 'MSVC', - 'configuration': 'Release', - 'cpu_or_gpu': 'GPU', - 'cpu_or_gpu_value': 'HD4600', - 'is_trybot': True, - 'model': 'ShuttleB', - 'os': 'Win8', - 'role': 'Perf', - }, - 'configuration': 'Release_x64', - 'dm_flags': [ - '--dummy-flags', - ], - 'do_perf_steps': True, - 'do_test_steps': False, - 'env': { - 'GYP_DEFINES': - ('qt_sdk=C:/Qt/Qt5.1.0/5.1.0/msvc2012_64/ skia_arch_type=x86_64 ski' - 'a_dump_stats=1 skia_warnings_as_errors=0 skia_win_debuggers_path=' - 'c:/DbgHelp'), - }, - 'nanobench_flags': [ - '--dummy-flags', - ], - 'upload_dm_results': True, - 'upload_perf_results': True, - }, - 'Test-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Debug': { - 'build_targets': [ - 'dm', - ], - 'builder_cfg': { - 'arch': 'Arm7', - 'compiler': 'GCC', - 'configuration': 'Debug', - 'cpu_or_gpu': 'GPU', - 'cpu_or_gpu_value': 'Mali400', - 'is_trybot': False, - 'model': 'GalaxyS3', - 'os': 'Android', - 'role': 'Test', - }, - 'configuration': 'Debug', - 'device_cfg': 'arm_v7_neon', - 'dm_flags': [ - '--dummy-flags', - ], - 'do_perf_steps': False, - 'do_test_steps': True, - 'env': { - 'GYP_DEFINES': 'skia_arch_type=arm skia_warnings_as_errors=0', - }, - 'nanobench_flags': [ - '--dummy-flags', - ], - 'product.board': 'm0', - 'upload_dm_results': True, - 'upload_perf_results': False, - }, - 'Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug-Vulkan': { - 'build_targets': [ - 'dm', - ], - 'builder_cfg': { - 'arch': 'Arm64', - 'compiler': 'GCC', - 'configuration': 'Debug', - 'cpu_or_gpu': 'GPU', - 'cpu_or_gpu_value': 'TegraX1', - 'extra_config': 'Vulkan', - 'is_trybot': False, - 'model': 'NVIDIA_Shield', - 'os': 'Android', - 'role': 'Test', - }, - 'configuration': 'Debug', - 'device_cfg': 'arm64', - 'dm_flags': [ - '--dummy-flags', - ], - 'do_perf_steps': False, - 'do_test_steps': True, - 'env': { - 'GYP_DEFINES': - ('skia_arch_type=arm64 skia_vulkan=1 skia_vulkan_debug_layers=0 ski' - 'a_warnings_as_errors=0'), - }, - 'nanobench_flags': [ - '--dummy-flags', - ], - 'product.board': 'foster', - 'upload_dm_results': True, - 'upload_perf_results': False, - }, - 'Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug': { - 'build_targets': [ - 'dm', - ], - 'builder_cfg': { - 'arch': 'Arm7', - 'compiler': 'GCC', - 'configuration': 'Debug', - 'cpu_or_gpu': 'GPU', - 'cpu_or_gpu_value': 'Tegra3', - 'is_trybot': False, - 'model': 'Nexus7', - 'os': 'Android', - 'role': 'Test', - }, - 'configuration': 'Debug', - 'device_cfg': 'arm_v7_neon', - 'dm_flags': [ - '--dummy-flags', - ], - 'do_perf_steps': False, - 'do_test_steps': True, - 'env': { - 'GYP_DEFINES': 'skia_arch_type=arm skia_warnings_as_errors=0', - }, - 'nanobench_flags': [ - '--dummy-flags', - ], - 'product.board': 'grouper', - 'upload_dm_results': True, - 'upload_perf_results': False, - }, - 'Test-Android-GCC-Nexus7v2-GPU-Tegra3-Arm7-Release': { - 'build_targets': [ - 'dm', - ], - 'builder_cfg': { - 'arch': 'Arm7', - 'compiler': 'GCC', - 'configuration': 'Release', - 'cpu_or_gpu': 'GPU', - 'cpu_or_gpu_value': 'Tegra3', - 'is_trybot': False, - 'model': 'Nexus7v2', - 'os': 'Android', - 'role': 'Test', - }, - 'configuration': 'Release', - 'device_cfg': 'arm_v7_neon', - 'dm_flags': [ - '--dummy-flags', - ], - 'do_perf_steps': False, - 'do_test_steps': True, - 'env': { - 'GYP_DEFINES': 'skia_arch_type=arm skia_warnings_as_errors=0', - }, - 'nanobench_flags': [ - '--dummy-flags', - ], - 'product.board': 'flo', - 'upload_dm_results': True, - 'upload_perf_results': False, - }, - 'Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release': { - 'build_targets': [ - 'dm', - ], - 'builder_cfg': { - 'arch': 'x86_64', - 'compiler': 'Clang', - 'configuration': 'Release', - 'cpu_or_gpu': 'CPU', - 'cpu_or_gpu_value': 'AVX', - 'is_trybot': False, - 'model': 'MacMini6.2', - 'os': 'Mac', - 'role': 'Test', - }, - 'configuration': 'Release', - 'dm_flags': [ - '--dummy-flags', - ], - 'do_perf_steps': False, - 'do_test_steps': True, - 'env': { - 'CC': '/usr/bin/clang', - 'CXX': '/usr/bin/clang++', - 'GYP_DEFINES': - ('skia_arch_type=x86_64 skia_clang_build=1 skia_gpu=0 skia_warnings' - '_as_errors=0'), - }, - 'nanobench_flags': [ - '--dummy-flags', - ], - 'upload_dm_results': True, - 'upload_perf_results': False, - }, - 'Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot': { - 'build_targets': [ - 'dm', - ], - 'builder_cfg': { - 'arch': 'x86_64', - 'compiler': 'Clang', - 'configuration': 'Coverage', - 'cpu_or_gpu': 'CPU', - 'cpu_or_gpu_value': 'AVX2', - 'is_trybot': True, - 'model': 'GCE', - 'os': 'Ubuntu', - 'role': 'Test', - }, - 'configuration': 'Coverage', - 'dm_flags': [ - '--dummy-flags', - ], - 'do_compile_steps': False, - 'do_perf_steps': False, - 'do_test_steps': True, - 'env': { - 'CC': '/usr/bin/clang-3.6', - 'CXX': '/usr/bin/clang++-3.6', - 'GYP_DEFINES': - ('skia_arch_type=x86_64 skia_clang_build=1 skia_gpu=0 skia_warnings' - '_as_errors=0'), - }, - 'nanobench_flags': [ - '--dummy-flags', - ], - 'upload_dm_results': False, - 'upload_perf_results': False, - }, - 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug': { - 'build_targets': [ - 'dm', - ], - 'builder_cfg': { - 'arch': 'x86_64', - 'compiler': 'GCC', - 'configuration': 'Debug', - 'cpu_or_gpu': 'CPU', - 'cpu_or_gpu_value': 'AVX2', - 'is_trybot': False, - 'model': 'GCE', - 'os': 'Ubuntu', - 'role': 'Test', - }, - 'configuration': 'Debug', - 'dm_flags': [ - '--dummy-flags', - ], - 'do_perf_steps': False, - 'do_test_steps': True, - 'env': { - 'GYP_DEFINES': - 'skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0', - }, - 'nanobench_flags': [ - '--dummy-flags', - ], - 'upload_dm_results': True, - 'upload_perf_results': False, - }, - 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN': { - 'build_targets': [ - 'dm', - 'nanobench', - ], - 'builder_cfg': { - 'arch': 'x86_64', - 'compiler': 'GCC', - 'configuration': 'Debug', - 'cpu_or_gpu': 'CPU', - 'cpu_or_gpu_value': 'AVX2', - 'extra_config': 'MSAN', - 'is_trybot': False, - 'model': 'GCE', - 'os': 'Ubuntu', - 'role': 'Test', - }, - 'configuration': 'Debug', - 'dm_flags': [ - '--dummy-flags', - ], - 'do_perf_steps': False, - 'do_test_steps': True, - 'env': { - 'GYP_DEFINES': - 'skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0', - }, - 'nanobench_flags': [ - '--dummy-flags', - ], - 'upload_dm_results': False, - 'upload_perf_results': False, - }, - 'Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind': { - 'build_targets': [ - 'dm', - ], - 'builder_cfg': { - 'arch': 'x86_64', - 'compiler': 'GCC', - 'configuration': 'Release', - 'cpu_or_gpu': 'GPU', - 'cpu_or_gpu_value': 'GTX550Ti', - 'extra_config': 'Valgrind', - 'is_trybot': False, - 'model': 'ShuttleA', - 'os': 'Ubuntu', - 'role': 'Test', - }, - 'configuration': 'Release', - 'dm_flags': [ - '--dummy-flags', - ], - 'do_perf_steps': False, - 'do_test_steps': True, - 'env': { - 'GYP_DEFINES': - ('skia_arch_type=x86_64 skia_release_optimization_level=1 skia_warn' - 'ings_as_errors=0'), - }, - 'nanobench_flags': [ - '--dummy-flags', - ], - 'upload_dm_results': False, - 'upload_perf_results': False, - }, - 'Test-Win8-MSVC-ShuttleA-GPU-HD7770-x86_64-Release': { - 'build_targets': [ - 'dm', - ], - 'builder_cfg': { - 'arch': 'x86_64', - 'compiler': 'MSVC', - 'configuration': 'Release', - 'cpu_or_gpu': 'GPU', - 'cpu_or_gpu_value': 'HD7770', - 'is_trybot': False, - 'model': 'ShuttleA', - 'os': 'Win8', - 'role': 'Test', - }, - 'configuration': 'Release_x64', - 'dm_flags': [ - '--dummy-flags', - ], - 'do_perf_steps': False, - 'do_test_steps': True, - 'env': { - 'GYP_DEFINES': - ('qt_sdk=C:/Qt/Qt5.1.0/5.1.0/msvc2012_64/ skia_arch_type=x86_64 ski' - 'a_warnings_as_errors=0 skia_win_debuggers_path=c:/DbgHelp'), - }, - 'nanobench_flags': [ - '--dummy-flags', - ], - 'upload_dm_results': True, - 'upload_perf_results': False, - }, - 'Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release': { - 'build_targets': [ - 'dm', - ], - 'builder_cfg': { - 'arch': 'x86_64', - 'compiler': 'MSVC', - 'configuration': 'Release', - 'cpu_or_gpu': 'CPU', - 'cpu_or_gpu_value': 'AVX2', - 'is_trybot': False, - 'model': 'ShuttleB', - 'os': 'Win8', - 'role': 'Test', - }, - 'configuration': 'Release_x64', - 'dm_flags': [ - '--dummy-flags', - ], - 'do_perf_steps': False, - 'do_test_steps': True, - 'env': { - 'GYP_DEFINES': - ('qt_sdk=C:/Qt/Qt5.1.0/5.1.0/msvc2012_64/ skia_arch_type=x86_64 ski' - 'a_gpu=0 skia_warnings_as_errors=0 skia_win_debuggers_path=c:/DbgH' - 'elp'), - }, - 'nanobench_flags': [ - '--dummy-flags', - ], - 'upload_dm_results': True, - 'upload_perf_results': False, - }, - 'Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot': { - 'build_targets': [ - 'dm', - ], - 'builder_cfg': { - 'arch': 'x86_64', - 'compiler': 'MSVC', - 'configuration': 'Release', - 'cpu_or_gpu': 'CPU', - 'cpu_or_gpu_value': 'AVX2', - 'is_trybot': True, - 'model': 'ShuttleB', - 'os': 'Win8', - 'role': 'Test', - }, - 'configuration': 'Release_x64', - 'dm_flags': [ - '--dummy-flags', - ], - 'do_perf_steps': False, - 'do_test_steps': True, - 'env': { - 'GYP_DEFINES': - ('qt_sdk=C:/Qt/Qt5.1.0/5.1.0/msvc2012_64/ skia_arch_type=x86_64 ski' - 'a_gpu=0 skia_warnings_as_errors=0 skia_win_debuggers_path=c:/DbgH' - 'elp'), - }, - 'nanobench_flags': [ - '--dummy-flags', - ], - 'upload_dm_results': True, - 'upload_perf_results': False, - }, - 'Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug': { - 'build_targets': [ - 'iOSShell', - ], - 'builder_cfg': { - 'arch': 'Arm7', - 'compiler': 'Clang', - 'configuration': 'Debug', - 'cpu_or_gpu': 'GPU', - 'cpu_or_gpu_value': 'SGX554', - 'is_trybot': False, - 'model': 'iPad4', - 'os': 'iOS', - 'role': 'Test', - }, - 'configuration': 'Debug', - 'device_cfg': 'iPad4,1', - 'dm_flags': [ - '--dummy-flags', - ], - 'do_perf_steps': False, - 'do_test_steps': True, - 'env': { - 'CC': '/usr/bin/clang', - 'CXX': '/usr/bin/clang++', - 'GYP_DEFINES': - ('skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_a' - 's_errors=0'), - }, - 'nanobench_flags': [ - '--dummy-flags', - ], - 'upload_dm_results': True, - 'upload_perf_results': False, - }, - 'Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release': { - 'build_targets': [ - 'iOSShell', - ], - 'builder_cfg': { - 'arch': 'Arm7', - 'compiler': 'Clang', - 'configuration': 'Release', - 'cpu_or_gpu': 'GPU', - 'cpu_or_gpu_value': 'SGX554', - 'is_trybot': False, - 'model': 'iPad4', - 'os': 'iOS', - 'role': 'Test', - }, - 'configuration': 'Release', - 'device_cfg': 'iPad4,1', - 'dm_flags': [ - '--dummy-flags', - ], - 'do_perf_steps': False, - 'do_test_steps': True, - 'env': { - 'CC': '/usr/bin/clang', - 'CXX': '/usr/bin/clang++', - 'GYP_DEFINES': - ('skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_a' - 's_errors=0'), - }, - 'nanobench_flags': [ - '--dummy-flags', - ], - 'upload_dm_results': True, - 'upload_perf_results': False, - }, -} diff --git a/infra/bots/recipe_modules/run/api.py b/infra/bots/recipe_modules/run/api.py index 1784254d6e..20e82f2b1b 100644 --- a/infra/bots/recipe_modules/run/api.py +++ b/infra/bots/recipe_modules/run/api.py @@ -82,16 +82,6 @@ class SkiaStepApi(recipe_api.RecipeApi): if fail_build_on_failure: self._failed.append(e) - def json_from_file(self, filename, cwd, builder_name, test_data): - """Execute the given script to obtain JSON data.""" - return self.m.python( - 'exec %s' % self.m.path.basename(filename), - filename, - args=[self.m.json.output(), builder_name], - step_test_data=lambda: self.m.json.test_api.output(test_data), - cwd=cwd, - infra_step=True).json.output - def copy_build_products(self, src, dst): """Copy whitelisted build products from src to dst.""" self.m.python.inline( diff --git a/infra/bots/recipe_modules/vars/__init__.py b/infra/bots/recipe_modules/vars/__init__.py index e18377b7cb..aaf8fafa66 100644 --- a/infra/bots/recipe_modules/vars/__init__.py +++ b/infra/bots/recipe_modules/vars/__init__.py @@ -3,6 +3,7 @@ # found in the LICENSE file. DEPS = [ + 'builder_name_schema', 'recipe_engine/json', 'recipe_engine/path', 'recipe_engine/properties', diff --git a/infra/bots/recipe_modules/vars/api.py b/infra/bots/recipe_modules/vars/api.py index 69842fb37f..9b3b30333c 100644 --- a/infra/bots/recipe_modules/vars/api.py +++ b/infra/bots/recipe_modules/vars/api.py @@ -12,6 +12,677 @@ import os BOTO_CHROMIUM_SKIA_GM = 'chromium-skia-gm.boto' +CONFIG_DEBUG = 'Debug' +CONFIG_RELEASE = 'Release' + + +def get_gyp_defines(builder_dict): + gyp_defs = {} + + # skia_arch_type. + if builder_dict['role'] == 'Build': + arch = builder_dict['target_arch'] + elif builder_dict['role'] in ('Housekeeper', 'Infra'): + arch = None + else: + arch = builder_dict['arch'] + + arch_types = { + 'x86': 'x86', + 'x86_64': 'x86_64', + 'Arm7': 'arm', + 'Arm64': 'arm64', + 'Mips': 'mips32', + 'Mips64': 'mips64', + 'MipsDSP2': 'mips32', + } + if arch in arch_types: + gyp_defs['skia_arch_type'] = arch_types[arch] + + # housekeeper: build shared lib. + if builder_dict['role'] == 'Housekeeper': + gyp_defs['skia_shared_lib'] = '1' + + # skia_gpu. + if builder_dict.get('cpu_or_gpu') == 'CPU': + gyp_defs['skia_gpu'] = '0' + + # skia_warnings_as_errors. + werr = False + if builder_dict['role'] == 'Build': + if 'Win' in builder_dict.get('os', ''): + if not ('GDI' in builder_dict.get('extra_config', '') or + 'Exceptions' in builder_dict.get('extra_config', '')): + werr = True + elif ('Mac' in builder_dict.get('os', '') and + 'Android' in builder_dict.get('extra_config', '')): + werr = False + elif 'Fast' in builder_dict.get('extra_config', ''): # pragma: no cover + # See https://bugs.chromium.org/p/skia/issues/detail?id=5257 + werr = False + else: + werr = True + gyp_defs['skia_warnings_as_errors'] = str(int(werr)) # True/False -> '1'/'0' + + # Win debugger. + if 'Win' in builder_dict.get('os', ''): + gyp_defs['skia_win_debuggers_path'] = 'c:/DbgHelp' + + # Qt SDK (Win). + if 'Win' in builder_dict.get('os', ''): + if builder_dict.get('os') == 'Win8': + gyp_defs['qt_sdk'] = 'C:/Qt/Qt5.1.0/5.1.0/msvc2012_64/' + else: + gyp_defs['qt_sdk'] = 'C:/Qt/4.8.5/' + + # ANGLE. + if builder_dict.get('extra_config') == 'ANGLE': # pragma: no cover + gyp_defs['skia_angle'] = '1' + if builder_dict.get('os', '') in ('Ubuntu', 'Linux'): + gyp_defs['use_x11'] = '1' + gyp_defs['chromeos'] = '0' + + # GDI. + if builder_dict.get('extra_config') == 'GDI': # pragma: no cover + gyp_defs['skia_gdi'] = '1' + + # Build with Exceptions on Windows. + if ('Win' in builder_dict.get('os', '') and + builder_dict.get('extra_config') == 'Exceptions'): # pragma: no cover + gyp_defs['skia_win_exceptions'] = '1' + + # iOS. + if (builder_dict.get('os') == 'iOS' or + builder_dict.get('extra_config') == 'iOS'): + gyp_defs['skia_os'] = 'ios' + + # Shared library build. + if builder_dict.get('extra_config') == 'Shared': + gyp_defs['skia_shared_lib'] = '1' + + # Build fastest Skia possible. + if builder_dict.get('extra_config') == 'Fast': # pragma: no cover + gyp_defs['skia_fast'] = '1' + + # PDF viewer in GM. + if (builder_dict.get('os') == 'Mac10.8' and + builder_dict.get('arch') == 'x86_64' and + builder_dict.get('configuration') == 'Release'): # pragma: no cover + gyp_defs['skia_run_pdfviewer_in_gm'] = '1' + + # Clang. + if builder_dict.get('compiler') == 'Clang': + gyp_defs['skia_clang_build'] = '1' + + # Valgrind. + if 'Valgrind' in builder_dict.get('extra_config', ''): + gyp_defs['skia_release_optimization_level'] = '1' + + # Link-time code generation just wastes time on compile-only bots. + if (builder_dict.get('role') == 'Build' and + builder_dict.get('compiler') == 'MSVC'): + gyp_defs['skia_win_ltcg'] = '0' + + # Mesa. + if (builder_dict.get('extra_config') == 'Mesa' or + builder_dict.get('cpu_or_gpu_value') == 'Mesa'): # pragma: no cover + gyp_defs['skia_mesa'] = '1' + + # skia_use_android_framework_defines. + if builder_dict.get('extra_config') == 'Android_FrameworkDefs': + gyp_defs['skia_use_android_framework_defines'] = '1' # pragma: no cover + + # Skia dump stats for perf tests and gpu + if (builder_dict.get('cpu_or_gpu') == 'GPU' and + builder_dict.get('role') == 'Perf'): + gyp_defs['skia_dump_stats'] = '1' + + # CommandBuffer. + if builder_dict.get('extra_config') == 'CommandBuffer': + gyp_defs['skia_command_buffer'] = '1' + + # Vulkan. + if builder_dict.get('extra_config') == 'Vulkan': + gyp_defs['skia_vulkan'] = '1' + gyp_defs['skia_vulkan_debug_layers'] = '0' + + return gyp_defs + + +def get_extra_env_vars(builder_dict): + env = {} + if builder_dict.get('configuration') == 'Coverage': + # We have to use Clang 3.6 because earlier versions do not support the + # compile flags we use and 3.7 and 3.8 hit asserts during compilation. + env['CC'] = '/usr/bin/clang-3.6' + env['CXX'] = '/usr/bin/clang++-3.6' + elif builder_dict.get('compiler') == 'Clang': + env['CC'] = '/usr/bin/clang' + env['CXX'] = '/usr/bin/clang++' + + # SKNX_NO_SIMD, SK_USE_DISCARDABLE_SCALEDIMAGECACHE, etc. + extra_config = builder_dict.get('extra_config', '') + if extra_config.startswith('SK') and extra_config.isupper(): + env['CPPFLAGS'] = '-D' + extra_config # pragma: no cover + + return env + + +def build_targets_from_builder_dict(builder_dict): + """Return a list of targets to build, depending on the builder type.""" + if builder_dict.get('extra_config') == 'iOS': + return ['iOSShell'] + if 'SAN' in builder_dict.get('extra_config', ''): + # 'most' does not compile under MSAN. + return ['dm', 'nanobench'] + else: + return ['most'] + + +def device_cfg(builder_dict): + # Android. + if 'Android' in builder_dict.get('extra_config', ''): + if 'NoNeon' in builder_dict['extra_config']: # pragma: no cover + return 'arm_v7' + return { + 'Arm64': 'arm64', + 'x86': 'x86', + 'x86_64': 'x86_64', + 'Mips': 'mips', + 'Mips64': 'mips64', + 'MipsDSP2': 'mips_dsp2', + }.get(builder_dict['target_arch'], 'arm_v7_neon') + elif builder_dict.get('os') == 'Android': + return { + 'AndroidOne': 'arm_v7_neon', + 'GalaxyS3': 'arm_v7_neon', + 'GalaxyS4': 'arm_v7_neon', + 'NVIDIA_Shield': 'arm64', + 'Nexus10': 'arm_v7_neon', + 'Nexus5': 'arm_v7_neon', + 'Nexus6': 'arm_v7_neon', + 'Nexus7': 'arm_v7_neon', + 'Nexus7v2': 'arm_v7_neon', + 'Nexus9': 'arm64', + 'NexusPlayer': 'x86', + }[builder_dict['model']] + + # iOS. + if 'iOS' in builder_dict.get('os', ''): + return { + 'iPad4': 'iPad4,1', + }[builder_dict['model']] + + return None + + +def product_board(builder_dict): + if 'Android' in builder_dict.get('os', ''): + return { + 'AndroidOne': 'sprout', + 'GalaxyS3': 'm0', #'smdk4x12', Detected incorrectly by swarming? + 'GalaxyS4': None, # TODO(borenet,kjlubick) + 'NVIDIA_Shield': 'foster', + 'Nexus10': 'manta', + 'Nexus5': 'hammerhead', + 'Nexus6': 'shamu', + 'Nexus7': 'grouper', + 'Nexus7v2': 'flo', + 'Nexus9': 'flounder', + 'NexusPlayer': 'fugu', + }[builder_dict['model']] + return None + + +def dm_flags(bot): + args = [] + + # 32-bit desktop bots tend to run out of memory, because they have relatively + # far more cores than RAM (e.g. 32 cores, 3G RAM). Hold them back a bit. + if '-x86-' in bot and not 'NexusPlayer' in bot: + args.extend('--threads 4'.split(' ')) + + # These are the canonical configs that we would ideally run on all bots. We + # may opt out or substitute some below for specific bots + configs = ['565', '8888', 'gpu', 'gpusrgb', 'pdf'] + # Add in either msaa4 or msaa16 to the canonical set of configs to run + if 'Android' in bot or 'iOS' in bot: + configs.append('msaa4') + else: + configs.append('msaa16') + + # With msaa, the S4 crashes and the NP produces a long error stream when we + # run with MSAA. The Tegra2 and Tegra3 just don't support it. No record of + # why we're not running msaa on iOS, probably started with gpu config and just + # haven't tried. + if ('GalaxyS4' in bot or + 'NexusPlayer' in bot or + 'Tegra3' in bot or + 'iOS' in bot): + configs = [x for x in configs if 'msaa' not in x] + + # Runs out of memory on Android bots and Daisy. Everyone else seems fine. + if 'Android' in bot or 'Daisy' in bot: + configs.remove('pdf') + + if '-GCE-' in bot: + configs.extend(['f16', 'srgb']) # Gamma-correct formats. + configs.extend(['sp-8888', '2ndpic-8888']) # Test niche uses of SkPicture. + + if '-TSAN' not in bot: + if ('TegraK1' in bot or + 'TegraX1' in bot or + 'GTX550Ti' in bot or + 'GTX660' in bot or + 'GT610' in bot): + if 'Android' in bot: + configs.append('nvprdit4') + else: + configs.append('nvprdit16') + + # We want to test the OpenGL config not the GLES config on the X1 + if 'TegraX1' in bot: + configs = [x.replace('gpu', 'gl') for x in configs] + configs = [x.replace('msaa', 'glmsaa') for x in configs] + configs = [x.replace('nvpr', 'glnvpr') for x in configs] + + # NP is running out of RAM when we run all these modes. skia:3255 + if 'NexusPlayer' not in bot: + configs.extend(mode + '-8888' for mode in + ['serialize', 'tiles_rt', 'pic']) + + if 'ANGLE' in bot: # pragma: no cover + configs.append('angle') + + # We want to run gpudft on atleast the mali 400 + if 'GalaxyS3' in bot: + configs.append('gpudft') + + # Test instanced rendering on a limited number of platforms + if 'Nexus6' in bot: # pragma: no cover + configs.append('esinst') # esinst4 isn't working yet on Adreno. + elif 'TegraX1' in bot: + # Multisampled instanced configs use nvpr. + configs = [x.replace('glnvpr', 'glinst') for x in configs] + configs.append('glinst') + elif 'MacMini6.2' in bot: + configs.extend(['glinst', 'glinst16']) + + # CommandBuffer bot *only* runs the command_buffer config. + if 'CommandBuffer' in bot: + configs = ['commandbuffer'] + + # Vulkan bot *only* runs the vk config. + if 'Vulkan' in bot: + configs = ['vk'] + + args.append('--config') + args.extend(configs) + + # Run tests, gms, and image decoding tests everywhere. + args.extend('--src tests gm image'.split(' ')) + + if 'GalaxyS' in bot: + args.extend(('--threads', '0')) + + blacklist = [] + + # TODO: ??? + blacklist.extend('f16 _ _ dstreadshuffle'.split(' ')) + blacklist.extend('f16 image _ _'.split(' ')) + blacklist.extend('srgb image _ _'.split(' ')) + blacklist.extend('gpusrgb image _ _'.split(' ')) + + if 'Valgrind' in bot: + # These take 18+ hours to run. + blacklist.extend('pdf gm _ fontmgr_iter'.split(' ')) + blacklist.extend('pdf _ _ PANO_20121023_214540.jpg'.split(' ')) + blacklist.extend('pdf skp _ worldjournal'.split(' ')) + blacklist.extend('pdf skp _ desk_baidu.skp'.split(' ')) + blacklist.extend('pdf skp _ desk_wikipedia.skp'.split(' ')) + + if 'iOS' in bot: + blacklist.extend('gpu skp _ _ msaa skp _ _'.split(' ')) + blacklist.extend('msaa16 gm _ tilemodesProcess'.split(' ')) + + if 'Mac' in bot or 'iOS' in bot: + # CG fails on questionable bmps + blacklist.extend('_ image gen_platf rgba32abf.bmp'.split(' ')) + blacklist.extend('_ image gen_platf rgb24prof.bmp'.split(' ')) + blacklist.extend('_ image gen_platf rgb24lprof.bmp'.split(' ')) + blacklist.extend('_ image gen_platf 8bpp-pixeldata-cropped.bmp'.split(' ')) + blacklist.extend('_ image gen_platf 4bpp-pixeldata-cropped.bmp'.split(' ')) + blacklist.extend('_ image gen_platf 32bpp-pixeldata-cropped.bmp'.split(' ')) + blacklist.extend('_ image gen_platf 24bpp-pixeldata-cropped.bmp'.split(' ')) + + # CG has unpredictable behavior on this questionable gif + # It's probably using uninitialized memory + blacklist.extend('_ image gen_platf frame_larger_than_image.gif'.split(' ')) + + # WIC fails on questionable bmps + if 'Win' in bot: + blacklist.extend('_ image gen_platf rle8-height-negative.bmp'.split(' ')) + blacklist.extend('_ image gen_platf rle4-height-negative.bmp'.split(' ')) + blacklist.extend('_ image gen_platf pal8os2v2.bmp'.split(' ')) + blacklist.extend('_ image gen_platf pal8os2v2-16.bmp'.split(' ')) + blacklist.extend('_ image gen_platf rgba32abf.bmp'.split(' ')) + blacklist.extend('_ image gen_platf rgb24prof.bmp'.split(' ')) + blacklist.extend('_ image gen_platf rgb24lprof.bmp'.split(' ')) + blacklist.extend('_ image gen_platf 8bpp-pixeldata-cropped.bmp'.split(' ')) + blacklist.extend('_ image gen_platf 4bpp-pixeldata-cropped.bmp'.split(' ')) + blacklist.extend('_ image gen_platf 32bpp-pixeldata-cropped.bmp'.split(' ')) + blacklist.extend('_ image gen_platf 24bpp-pixeldata-cropped.bmp'.split(' ')) + if 'x86_64' in bot and 'CPU' in bot: + # This GM triggers a SkSmallAllocator assert. + blacklist.extend('_ gm _ composeshader_bitmap'.split(' ')) + + if 'Android' in bot or 'iOS' in bot: + # This test crashes the N9 (perhaps because of large malloc/frees). It also + # is fairly slow and not platform-specific. So we just disable it on all of + # Android and iOS. skia:5438 + blacklist.extend('_ test _ GrShape'.split(' ')) + + if 'Win8' in bot: + # bungeman: "Doesn't work on Windows anyway, produces unstable GMs with + # 'Unexpected error' from DirectWrite" + blacklist.extend('_ gm _ fontscalerdistortable'.split(' ')) + + # skia:4095 + bad_serialize_gms = ['bleed_image', + 'c_gms', + 'colortype', + 'colortype_xfermodes', + 'drawfilter', + 'fontmgr_bounds_0.75_0', + 'fontmgr_bounds_1_-0.25', + 'fontmgr_bounds', + 'fontmgr_match', + 'fontmgr_iter'] + + # skia:5589 + bad_serialize_gms.extend(['bitmapfilters', + 'bitmapshaders', + 'bleed', + 'bleed_alpha_bmp', + 'bleed_alpha_bmp_shader', + 'convex_poly_clip', + 'extractalpha', + 'filterbitmap_checkerboard_32_32_g8', + 'filterbitmap_image_mandrill_64', + 'shadows', + 'simpleaaclip_aaclip']) + # skia:5595 + bad_serialize_gms.extend(['composeshader_bitmap', + 'scaled_tilemodes_npot', + 'scaled_tilemodes']) + for test in bad_serialize_gms: + blacklist.extend(['serialize-8888', 'gm', '_', test]) + + if 'Mac' not in bot: + for test in ['bleed_alpha_image', 'bleed_alpha_image_shader']: + blacklist.extend(['serialize-8888', 'gm', '_', test]) + # It looks like we skip these only for out-of-memory concerns. + if 'Win' in bot or 'Android' in bot: + for test in ['verylargebitmap', 'verylarge_picture_image']: + blacklist.extend(['serialize-8888', 'gm', '_', test]) + + # skia:4769 + for test in ['drawfilter']: + blacklist.extend([ 'sp-8888', 'gm', '_', test]) + blacklist.extend([ 'pic-8888', 'gm', '_', test]) + blacklist.extend(['2ndpic-8888', 'gm', '_', test]) + # skia:4703 + for test in ['image-cacherator-from-picture', + 'image-cacherator-from-raster', + 'image-cacherator-from-ctable']: + blacklist.extend([ 'sp-8888', 'gm', '_', test]) + blacklist.extend([ 'pic-8888', 'gm', '_', test]) + blacklist.extend([ '2ndpic-8888', 'gm', '_', test]) + blacklist.extend(['serialize-8888', 'gm', '_', test]) + + # Extensions for RAW images + r = ["arw", "cr2", "dng", "nef", "nrw", "orf", "raf", "rw2", "pef", "srw", + "ARW", "CR2", "DNG", "NEF", "NRW", "ORF", "RAF", "RW2", "PEF", "SRW"] + + # skbug.com/4888 + # Blacklist RAW images (and a few large PNGs) on GPU bots + # until we can resolve failures + if 'GPU' in bot: + blacklist.extend('_ image _ interlaced1.png'.split(' ')) + blacklist.extend('_ image _ interlaced2.png'.split(' ')) + blacklist.extend('_ image _ interlaced3.png'.split(' ')) + for raw_ext in r: + blacklist.extend(('_ image _ .%s' % raw_ext).split(' ')) + + if 'Nexus9' in bot: # pragma: no cover + for raw_ext in r: + blacklist.extend(('_ image _ .%s' % raw_ext).split(' ')) + + # Large image that overwhelms older Mac bots + if 'MacMini4.1-GPU' in bot: # pragma: no cover + blacklist.extend('_ image _ abnormal.wbmp'.split(' ')) + blacklist.extend(['msaa16', 'gm', '_', 'blurcircles']) + + match = [] + if 'Valgrind' in bot: # skia:3021 + match.append('~Threaded') + + if 'GalaxyS3' in bot: # skia:1699 + match.append('~WritePixels') + + if 'AndroidOne' in bot: # skia:4711 + match.append('~WritePixels') # pragma: no cover + + if 'NexusPlayer' in bot: # pragma: no cover + match.append('~ResourceCache') + + if 'Nexus10' in bot: # skia:5509 + match.append('~CopySurface') # pragma: no cover + + if 'ANGLE' in bot and 'Debug' in bot: # pragma: no cover + match.append('~GLPrograms') # skia:4717 + + if 'MSAN' in bot: + match.extend(['~Once', '~Shared']) # Not sure what's up with these tests. + + if 'TSAN' in bot: # pragma: no cover + match.extend(['~ReadWriteAlpha']) # Flaky on TSAN-covered on nvidia bots. + + if blacklist: + args.append('--blacklist') + args.extend(blacklist) + + if match: + args.append('--match') + args.extend(match) + + # These bots run out of memory running RAW codec tests. Do not run them in + # parallel + if ('NexusPlayer' in bot or 'Nexus5' in bot or 'Nexus9' in bot + or 'Win8-MSVC-ShuttleB' in bot): + args.append('--noRAW_threading') + + return args + + +def get_builder_spec(api, builder_name): + builder_dict = api.builder_name_schema.DictForBuilderName(builder_name) + env = get_extra_env_vars(builder_dict) + gyp_defs = get_gyp_defines(builder_dict) + gyp_defs_list = ['%s=%s' % (k, v) for k, v in gyp_defs.iteritems()] + gyp_defs_list.sort() + env['GYP_DEFINES'] = ' '.join(gyp_defs_list) + + build_targets = build_targets_from_builder_dict(builder_dict) + rv = { + 'build_targets': build_targets, + 'builder_cfg': builder_dict, + 'dm_flags': dm_flags(builder_name), + 'env': env, + 'nanobench_flags': nanobench_flags(builder_name), + } + device = device_cfg(builder_dict) + if device: + rv['device_cfg'] = device + board = product_board(builder_dict) + if board: + rv['product.board'] = board + + role = builder_dict['role'] + if role == api.builder_name_schema.BUILDER_ROLE_HOUSEKEEPER: + configuration = CONFIG_RELEASE + else: + configuration = builder_dict.get('configuration', CONFIG_DEBUG) + arch = (builder_dict.get('arch') or builder_dict.get('target_arch')) + if ('Win' in builder_dict.get('os', '') and arch == 'x86_64'): + configuration += '_x64' + rv['configuration'] = configuration + if configuration == 'Coverage': + rv['do_compile_steps'] = False + rv['do_test_steps'] = role == api.builder_name_schema.BUILDER_ROLE_TEST + rv['do_perf_steps'] = role == api.builder_name_schema.BUILDER_ROLE_PERF + + # Do we upload perf results? + upload_perf_results = False + if (role == api.builder_name_schema.BUILDER_ROLE_PERF and + CONFIG_RELEASE in configuration): + upload_perf_results = True + rv['upload_perf_results'] = upload_perf_results + + # Do we upload correctness results? + skip_upload_bots = [ + 'ASAN', + 'Coverage', + 'MSAN', + 'TSAN', + 'UBSAN', + 'Valgrind', + ] + upload_dm_results = True + for s in skip_upload_bots: + if s in builder_name: + upload_dm_results = False + break + rv['upload_dm_results'] = upload_dm_results + + return rv + + +def nanobench_flags(bot): + args = ['--pre_log'] + + if 'GPU' in bot: + args.append('--images') + args.extend(['--gpuStatsDump', 'true']) + + if 'Android' in bot and 'GPU' in bot: + args.extend(['--useThermalManager', '1,1,10,1000']) + + args.extend(['--scales', '1.0', '1.1']) + + if 'iOS' in bot: + args.extend(['--skps', 'ignore_skps']) + + config = ['565', '8888', 'gpu', 'nonrendering', 'angle', 'hwui' ] + config += [ 'f16', 'srgb' ] + # The S4 crashes and the NP produces a long error stream when we run with + # MSAA. + if ('GalaxyS4' not in bot and + 'NexusPlayer' not in bot): + if 'Android' in bot: + # The TegraX1 has a regular OpenGL implementation. We bench that instead + # of ES. + if 'TegraX1' in bot: + config.remove('gpu') + config.extend(['gl', 'glmsaa4', 'glnvpr4', 'glnvprdit4']) + else: + config.extend(['msaa4', 'nvpr4', 'nvprdit4']) + else: + config.extend(['msaa16', 'nvpr16', 'nvprdit16']) + + # Bench instanced rendering on a limited number of platforms + if 'Nexus6' in bot: # pragma: no cover + config.append('esinst') # esinst4 isn't working yet on Adreno. + elif 'TegraX1' in bot: + config.extend(['glinst', 'glinst4']) + elif 'MacMini6.2' in bot: + config.extend(['glinst', 'glinst16']) + + if 'Vulkan' in bot: + config = ['vk'] + + args.append('--config') + args.extend(config) + + if 'Valgrind' in bot: + # Don't care about Valgrind performance. + args.extend(['--loops', '1']) + args.extend(['--samples', '1']) + # Ensure that the bot framework does not think we have timed out. + args.extend(['--keepAlive', 'true']) + + match = [] + if 'Android' in bot: + # Segfaults when run as GPU bench. Very large texture? + match.append('~blurroundrect') + match.append('~patch_grid') # skia:2847 + match.append('~desk_carsvg') + if 'NexusPlayer' in bot: # pragma: no cover + match.append('~desk_unicodetable') + if 'Nexus5' in bot: # pragma: no cover + match.append('~keymobi_shop_mobileweb_ebay_com.skp') # skia:5178 + if 'iOS' in bot: + match.append('~blurroundrect') + match.append('~patch_grid') # skia:2847 + match.append('~desk_carsvg') + match.append('~keymobi') + match.append('~path_hairline') + match.append('~GLInstancedArraysBench') # skia:4714 + + # the 32-bit GCE bots run out of memory in DM when running these large images + # so defensively disable them in nanobench, too. + # FIXME (scroggo): This may have just been due to SkImageDecoder's + # buildTileIndex leaking memory (https://bug.skia.org/4360). That is + # disabled by default for nanobench, so we may not need this. + # FIXME (scroggo): Share image blacklists between dm and nanobench? + if 'x86' in bot and not 'x86-64' in bot: + match.append('~interlaced1.png') + match.append('~interlaced2.png') + match.append('~interlaced3.png') + + # This low-end Android bot crashes about 25% of the time while running the + # (somewhat intense) shapes benchmarks. + if 'Perf-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Release' in bot: + match.append('~shapes_') # pragma: no cover + + # We do not need or want to benchmark the decodes of incomplete images. + # In fact, in nanobench we assert that the full image decode succeeds. + match.append('~inc0.gif') + match.append('~inc1.gif') + match.append('~incInterlaced.gif') + match.append('~inc0.jpg') + match.append('~incGray.jpg') + match.append('~inc0.wbmp') + match.append('~inc1.wbmp') + match.append('~inc0.webp') + match.append('~inc1.webp') + match.append('~inc0.ico') + match.append('~inc1.ico') + match.append('~inc0.png') + match.append('~inc1.png') + match.append('~inc2.png') + match.append('~inc12.png') + match.append('~inc13.png') + match.append('~inc14.png') + match.append('~inc0.webp') + match.append('~inc1.webp') + + if match: + args.append('--match') + args.extend(match) + + return args + class SkiaVarsApi(recipe_api.RecipeApi): @@ -37,6 +708,10 @@ class SkiaVarsApi(recipe_api.RecipeApi): home_dir = '[HOME]' return home_dir + def get_builder_spec(self, builder_name): + """Return the builder_spec for the given builder name.""" + return get_builder_spec(self.m, builder_name) + def setup(self): """Prepare the variables.""" # Setup diff --git a/infra/bots/recipes/swarm_RecreateSKPs.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json b/infra/bots/recipes/swarm_RecreateSKPs.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json index a1a4510ab4..d04112db7a 100644 --- a/infra/bots/recipes/swarm_RecreateSKPs.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json +++ b/infra/bots/recipes/swarm_RecreateSKPs.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json @@ -93,45 +93,6 @@ "cmd": [ "python", "-u", - "[CUSTOM_/_B_WORK]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Housekeeper-Nightly-RecreateSKPs_Canary" - ], - "cwd": "[CUSTOM_/_B_WORK]/skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"most\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"extra_config\": \"RecreateSKPs_Canary\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"frequency\": \"Nightly\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Housekeeper\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_shared_lib=1 skia_warnings_as_errors=0\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ - "python", - "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", "[SLAVE_BUILD]/tmp", "511" diff --git a/infra/bots/recipes/swarm_RecreateSKPs.expected/Housekeeper-Weekly-RecreateSKPs.json b/infra/bots/recipes/swarm_RecreateSKPs.expected/Housekeeper-Weekly-RecreateSKPs.json index 756babc7fb..b249c0c0c1 100644 --- a/infra/bots/recipes/swarm_RecreateSKPs.expected/Housekeeper-Weekly-RecreateSKPs.json +++ b/infra/bots/recipes/swarm_RecreateSKPs.expected/Housekeeper-Weekly-RecreateSKPs.json @@ -93,45 +93,6 @@ "cmd": [ "python", "-u", - "[CUSTOM_/_B_WORK]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Housekeeper-Weekly-RecreateSKPs" - ], - "cwd": "[CUSTOM_/_B_WORK]/skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"most\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"extra_config\": \"RecreateSKPs\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"frequency\": \"Weekly\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Housekeeper\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_shared_lib=1 skia_warnings_as_errors=0\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ - "python", - "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", "[SLAVE_BUILD]/tmp", "511" diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-Arm7-Debug-Android.json b/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-Arm7-Debug-Android.json index a8732de0f9..43e84b14c0 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-Arm7-Debug-Android.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-Arm7-Debug-Android.json @@ -72,51 +72,6 @@ }, { "cmd": [ - "python", - "-u", - "[CUSTOM_/_B_WORK]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Build-Mac-Clang-Arm7-Debug-Android" - ], - "cwd": "[CUSTOM_/_B_WORK]/skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"most\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"Clang\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"extra_config\": \"Android\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Mac\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Build\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"target_arch\": \"Arm7\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"device_cfg\": \"arm_v7_neon\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"CC\": \"/usr/bin/clang\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"CXX\": \"/usr/bin/clang++\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=arm skia_clang_build=1 skia_warnings_as_errors=0\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ "which", "adb" ], diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-Arm7-Release-iOS.json b/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-Arm7-Release-iOS.json index 0a3112e755..016eff9ac8 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-Arm7-Release-iOS.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-Arm7-Release-iOS.json @@ -72,50 +72,6 @@ }, { "cmd": [ - "python", - "-u", - "[CUSTOM_/_B_WORK]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Build-Mac-Clang-Arm7-Release-iOS" - ], - "cwd": "[CUSTOM_/_B_WORK]/skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"most\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"Clang\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"extra_config\": \"iOS\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Mac\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Build\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"target_arch\": \"Arm7\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"CC\": \"/usr/bin/clang\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"CXX\": \"/usr/bin/clang++\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=1\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ "[CUSTOM_/_B_WORK]/skia/platform_tools/ios/bin/ios_ninja" ], "cwd": "[CUSTOM_/_B_WORK]/skia", diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json b/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json index e8083108c4..ede4be271c 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json @@ -91,50 +91,6 @@ }, { "cmd": [ - "python", - "-u", - "[CUSTOM_/_B_WORK]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Build-Mac-Clang-x86_64-Debug-CommandBuffer" - ], - "cwd": "[CUSTOM_/_B_WORK]/skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"most\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"Clang\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"extra_config\": \"CommandBuffer\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Mac\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Build\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"target_arch\": \"x86_64\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"CC\": \"/usr/bin/clang\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"CXX\": \"/usr/bin/clang++\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=x86_64 skia_clang_build=1 skia_command_buffer=1 skia_warnings_as_errors=1\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ "make", "most" ], diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-x86_64-Release-CMake.json b/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-x86_64-Release-CMake.json index 4fc7b25db1..401e2e7413 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-x86_64-Release-CMake.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-x86_64-Release-CMake.json @@ -72,50 +72,6 @@ }, { "cmd": [ - "python", - "-u", - "[CUSTOM_/_B_WORK]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Build-Mac-Clang-x86_64-Release-CMake" - ], - "cwd": "[CUSTOM_/_B_WORK]/skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"most\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"Clang\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"extra_config\": \"CMake\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Mac\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Build\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"target_arch\": \"x86_64\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"CC\": \"/usr/bin/clang\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"CXX\": \"/usr/bin/clang++\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=x86_64 skia_clang_build=1 skia_warnings_as_errors=1\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ "[CUSTOM_/_B_WORK]/skia/cmake/cmake_build" ], "cwd": "[CUSTOM_/_B_WORK]/skia", diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-x86_64-Debug-GN.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-x86_64-Debug-GN.json index fd6b94f37f..1cd4b783af 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-x86_64-Debug-GN.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-Clang-x86_64-Debug-GN.json @@ -72,50 +72,6 @@ }, { "cmd": [ - "python", - "-u", - "[CUSTOM_/_B_WORK]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Build-Ubuntu-Clang-x86_64-Debug-GN" - ], - "cwd": "[CUSTOM_/_B_WORK]/skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"most\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"Clang\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"extra_config\": \"GN\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Ubuntu\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Build\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"target_arch\": \"x86_64\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"CC\": \"/usr/bin/clang\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"CXX\": \"/usr/bin/clang++\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=x86_64 skia_clang_build=1 skia_warnings_as_errors=1\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], "cwd": "[CUSTOM_/_B_WORK]/skia", diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-Arm7-Debug-Android-Trybot.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-Arm7-Debug-Android-Trybot.json index 5b8e2948e6..b2dae68052 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-Arm7-Debug-Android-Trybot.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-Arm7-Debug-Android-Trybot.json @@ -92,49 +92,6 @@ }, { "cmd": [ - "python", - "-u", - "[CUSTOM_/_B_WORK]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Build-Ubuntu-GCC-Arm7-Debug-Android-Trybot" - ], - "cwd": "[CUSTOM_/_B_WORK]/skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"most\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"GCC\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"extra_config\": \"Android\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Ubuntu\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Build\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"target_arch\": \"Arm7\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"device_cfg\": \"arm_v7_neon\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=arm skia_warnings_as_errors=1\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ "which", "adb" ], diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-Arm7-Release-Android.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-Arm7-Release-Android.json index 7b846175eb..71ad1dd0df 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-Arm7-Release-Android.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-Arm7-Release-Android.json @@ -72,49 +72,6 @@ }, { "cmd": [ - "python", - "-u", - "[CUSTOM_/_B_WORK]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Build-Ubuntu-GCC-Arm7-Release-Android" - ], - "cwd": "[CUSTOM_/_B_WORK]/skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"most\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"GCC\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"extra_config\": \"Android\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Ubuntu\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Build\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"target_arch\": \"Arm7\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"device_cfg\": \"arm_v7_neon\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=arm skia_warnings_as_errors=1\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ "which", "adb" ], diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-Arm7-Release-Android_Vulkan.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-Arm7-Release-Android_Vulkan.json index 6d8d9a6c7b..262bbf28a4 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-Arm7-Release-Android_Vulkan.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-Arm7-Release-Android_Vulkan.json @@ -72,49 +72,6 @@ }, { "cmd": [ - "python", - "-u", - "[CUSTOM_/_B_WORK]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Build-Ubuntu-GCC-Arm7-Release-Android_Vulkan" - ], - "cwd": "[CUSTOM_/_B_WORK]/skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"most\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"GCC\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"extra_config\": \"Android_Vulkan\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Ubuntu\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Build\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"target_arch\": \"Arm7\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"device_cfg\": \"arm_v7_neon\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=arm skia_warnings_as_errors=1\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ "which", "adb" ], diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86-Debug.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86-Debug.json index 0bf3675700..7d5ca94684 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86-Debug.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86-Debug.json @@ -72,47 +72,6 @@ }, { "cmd": [ - "python", - "-u", - "[CUSTOM_/_B_WORK]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Build-Ubuntu-GCC-x86-Debug" - ], - "cwd": "[CUSTOM_/_B_WORK]/skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"most\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"GCC\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Ubuntu\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Build\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"target_arch\": \"x86\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=x86 skia_warnings_as_errors=1\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ "make", "most" ], diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-GN.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-GN.json index f836737509..41a39e294b 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-GN.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-GN.json @@ -72,48 +72,6 @@ }, { "cmd": [ - "python", - "-u", - "[CUSTOM_/_B_WORK]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Build-Ubuntu-GCC-x86_64-Debug-GN" - ], - "cwd": "[CUSTOM_/_B_WORK]/skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"most\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"GCC\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"extra_config\": \"GN\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Ubuntu\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Build\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"target_arch\": \"x86_64\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=x86_64 skia_warnings_as_errors=1\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], "cwd": "[CUSTOM_/_B_WORK]/skia", diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-MSAN.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-MSAN.json index c1c6747d7f..17efac5b91 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-MSAN.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Debug-MSAN.json @@ -90,49 +90,6 @@ }, { "cmd": [ - "python", - "-u", - "[CUSTOM_/_B_WORK]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Build-Ubuntu-GCC-x86_64-Debug-MSAN" - ], - "cwd": "[CUSTOM_/_B_WORK]/skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"dm\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"GCC\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"extra_config\": \"MSAN\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Ubuntu\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Build\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"target_arch\": \"x86_64\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=x86_64 skia_warnings_as_errors=1\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ "[CUSTOM_/_B_WORK]/skia/tools/xsan_build", "memory", "dm" diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-CMake.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-CMake.json index 90fe5139a7..8bee0359af 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-CMake.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-CMake.json @@ -72,48 +72,6 @@ }, { "cmd": [ - "python", - "-u", - "[CUSTOM_/_B_WORK]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Build-Ubuntu-GCC-x86_64-Release-CMake" - ], - "cwd": "[CUSTOM_/_B_WORK]/skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"most\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"GCC\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"extra_config\": \"CMake\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Ubuntu\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Build\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"target_arch\": \"x86_64\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=x86_64 skia_warnings_as_errors=1\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ "[CUSTOM_/_B_WORK]/skia/cmake/cmake_build" ], "cwd": "[CUSTOM_/_B_WORK]/skia", diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium.json index 4e4b0c7172..d39a1a389b 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium.json @@ -77,48 +77,6 @@ }, { "cmd": [ - "python", - "-u", - "[CUSTOM_/_B_WORK]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Build-Ubuntu-GCC-x86_64-Release-PDFium" - ], - "cwd": "[CUSTOM_/_B_WORK]/skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"most\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"GCC\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"extra_config\": \"PDFium\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Ubuntu\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Build\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"target_arch\": \"x86_64\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=x86_64 skia_warnings_as_errors=1\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ "gclient", "runhook", "gn_linux64" diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Shared.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Shared.json index 6a507c98fc..83adb14519 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Shared.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Shared.json @@ -72,48 +72,6 @@ }, { "cmd": [ - "python", - "-u", - "[CUSTOM_/_B_WORK]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Build-Ubuntu-GCC-x86_64-Release-Shared" - ], - "cwd": "[CUSTOM_/_B_WORK]/skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"most\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"GCC\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"extra_config\": \"Shared\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Ubuntu\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Build\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"target_arch\": \"x86_64\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=x86_64 skia_shared_lib=1 skia_warnings_as_errors=1\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ "make", "most" ], diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Valgrind.json b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Valgrind.json index 787f284650..f24d552054 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Valgrind.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Valgrind.json @@ -72,48 +72,6 @@ }, { "cmd": [ - "python", - "-u", - "[CUSTOM_/_B_WORK]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Build-Ubuntu-GCC-x86_64-Release-Valgrind" - ], - "cwd": "[CUSTOM_/_B_WORK]/skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"most\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"GCC\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"extra_config\": \"Valgrind\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Ubuntu\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Build\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"target_arch\": \"x86_64\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=x86_64 skia_release_optimization_level=1 skia_warnings_as_errors=1\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ "make", "most" ], diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Debug.json b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Debug.json index 03593be04c..94f2bbaef4 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Debug.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Debug.json @@ -74,47 +74,6 @@ "cmd": [ "python", "-u", - "[CUSTOM_C:\\_B_WORK]\\skia\\tools\\buildbot_spec.py", - "/path/to/tmp/json", - "Build-Win-MSVC-x86-Debug" - ], - "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"most\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"MSVC\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Win\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Build\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"target_arch\": \"x86\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"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\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ - "python", - "-u", "[CUSTOM_C:\\_B_WORK]\\skia\\infra\\bots\\bootstrap_win_toolchain_json.py", "--win_toolchain_json", "[SLAVE_BUILD]\\src\\build\\win_toolchain.json", diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GN.json b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GN.json index 8a4a746ba5..780b27e1f9 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GN.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GN.json @@ -72,48 +72,6 @@ }, { "cmd": [ - "python", - "-u", - "[CUSTOM_C:\\_B_WORK]\\skia\\tools\\buildbot_spec.py", - "/path/to/tmp/json", - "Build-Win-MSVC-x86-Release-GN" - ], - "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"most\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"MSVC\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"extra_config\": \"GN\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Win\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Build\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"target_arch\": \"x86\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"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\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ "[CUSTOM_C:\\_B_WORK]\\skia\\bin\\fetch-gn" ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json index 3209f21012..296765be7a 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json @@ -74,48 +74,6 @@ "cmd": [ "python", "-u", - "[CUSTOM_C:\\_B_WORK]\\skia\\tools\\buildbot_spec.py", - "/path/to/tmp/json", - "Build-Win-MSVC-x86_64-Release-Vulkan" - ], - "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"most\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"MSVC\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"extra_config\": \"Vulkan\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Win\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Build\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"target_arch\": \"x86_64\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release_x64\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"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\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ - "python", - "-u", "[CUSTOM_C:\\_B_WORK]\\skia\\infra\\bots\\bootstrap_win_toolchain_json.py", "--win_toolchain_json", "[SLAVE_BUILD]\\src\\build\\win_toolchain.json", diff --git a/infra/bots/recipes/swarm_compile.expected/big_issue_number.json b/infra/bots/recipes/swarm_compile.expected/big_issue_number.json index 25c01b42c7..1ccc625332 100644 --- a/infra/bots/recipes/swarm_compile.expected/big_issue_number.json +++ b/infra/bots/recipes/swarm_compile.expected/big_issue_number.json @@ -94,47 +94,6 @@ "cmd": [ "python", "-u", - "[CUSTOM_C:\\_B_WORK]\\skia\\tools\\buildbot_spec.py", - "/path/to/tmp/json", - "Build-Win-MSVC-x86-Debug" - ], - "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"most\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"MSVC\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Win\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Build\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"target_arch\": \"x86\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"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\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ - "python", - "-u", "[CUSTOM_C:\\_B_WORK]\\skia\\infra\\bots\\bootstrap_win_toolchain_json.py", "--win_toolchain_json", "[SLAVE_BUILD]\\src\\build\\win_toolchain.json", diff --git a/infra/bots/recipes/swarm_compile.expected/failed_compile.json b/infra/bots/recipes/swarm_compile.expected/failed_compile.json index 2bdddaef3a..c6ed4c0cb0 100644 --- a/infra/bots/recipes/swarm_compile.expected/failed_compile.json +++ b/infra/bots/recipes/swarm_compile.expected/failed_compile.json @@ -72,47 +72,6 @@ }, { "cmd": [ - "python", - "-u", - "[CUSTOM_/_B_WORK]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Build-Ubuntu-GCC-x86-Debug" - ], - "cwd": "[CUSTOM_/_B_WORK]/skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"most\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"GCC\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Ubuntu\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Build\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"target_arch\": \"x86\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=x86 skia_warnings_as_errors=1\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ "make", "most" ], diff --git a/infra/bots/recipes/swarm_compile.expected/win_retry_failed_compile.json b/infra/bots/recipes/swarm_compile.expected/win_retry_failed_compile.json index 94929b767f..7f3a6021c7 100644 --- a/infra/bots/recipes/swarm_compile.expected/win_retry_failed_compile.json +++ b/infra/bots/recipes/swarm_compile.expected/win_retry_failed_compile.json @@ -74,47 +74,6 @@ "cmd": [ "python", "-u", - "[CUSTOM_C:\\_B_WORK]\\skia\\tools\\buildbot_spec.py", - "/path/to/tmp/json", - "Build-Win-MSVC-x86-Debug" - ], - "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"most\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"MSVC\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Win\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Build\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"target_arch\": \"x86\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"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\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ - "python", - "-u", "[CUSTOM_C:\\_B_WORK]\\skia\\infra\\bots\\bootstrap_win_toolchain_json.py", "--win_toolchain_json", "[SLAVE_BUILD]\\src\\build\\win_toolchain.json", diff --git a/infra/bots/recipes/swarm_housekeeper.expected/Housekeeper-PerCommit-Trybot.json b/infra/bots/recipes/swarm_housekeeper.expected/Housekeeper-PerCommit-Trybot.json index 9e5375620c..31b18a7fde 100644 --- a/infra/bots/recipes/swarm_housekeeper.expected/Housekeeper-PerCommit-Trybot.json +++ b/infra/bots/recipes/swarm_housekeeper.expected/Housekeeper-PerCommit-Trybot.json @@ -3,44 +3,6 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Housekeeper-PerCommit-Trybot" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"most\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"frequency\": \"PerCommit\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Housekeeper\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_shared_lib=1 skia_warnings_as_errors=0\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ - "python", - "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", "[SLAVE_BUILD]/tmp", "511" diff --git a/infra/bots/recipes/swarm_housekeeper.expected/Housekeeper-PerCommit.json b/infra/bots/recipes/swarm_housekeeper.expected/Housekeeper-PerCommit.json index d08d8cbe08..aa25936472 100644 --- a/infra/bots/recipes/swarm_housekeeper.expected/Housekeeper-PerCommit.json +++ b/infra/bots/recipes/swarm_housekeeper.expected/Housekeeper-PerCommit.json @@ -3,44 +3,6 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Housekeeper-PerCommit" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"most\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"frequency\": \"PerCommit\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Housekeeper\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_shared_lib=1 skia_warnings_as_errors=0\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ - "python", - "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", "[SLAVE_BUILD]/tmp", "511" diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release.json b/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release.json index e88e5498f8..ebcafc34eb 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release.json @@ -1,52 +1,6 @@ [ { "cmd": [ - "python", - "-u", - "[SLAVE_BUILD]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"arch\": \"Arm7\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"GCC\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu\": \"GPU\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu_value\": \"Tegra3\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"model\": \"Nexus7\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Android\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Perf\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"device_cfg\": \"arm_v7_neon\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"product.board\": \"grouper\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": true@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ "which", "adb" ], @@ -398,7 +352,50 @@ "--images", "/storage/emulated/legacy/skiabot/skia_images/nanobench", "--nocpu", - "--dummy-flags", + "--pre_log", + "--images", + "--gpuStatsDump", + "true", + "--useThermalManager", + "1,1,10,1000", + "--scales", + "1.0", + "1.1", + "--config", + "565", + "8888", + "gpu", + "nonrendering", + "angle", + "hwui", + "f16", + "srgb", + "msaa4", + "nvpr4", + "nvprdit4", + "--match", + "~blurroundrect", + "~patch_grid", + "~desk_carsvg", + "~inc0.gif", + "~inc1.gif", + "~incInterlaced.gif", + "~inc0.jpg", + "~incGray.jpg", + "~inc0.wbmp", + "~inc1.wbmp", + "~inc0.webp", + "~inc1.webp", + "~inc0.ico", + "~inc1.ico", + "~inc0.png", + "~inc1.png", + "~inc2.png", + "~inc12.png", + "~inc13.png", + "~inc14.png", + "~inc0.webp", + "~inc1.webp", "--outResultsFile", "/storage/emulated/legacy/skiabot/skia_perf/nanobench_abc123.json", "--properties", diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json b/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json index ee4385f0ae..e07b9db17e 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json @@ -3,51 +3,6 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"arch\": \"x86_64\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"GCC\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu\": \"GPU\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu_value\": \"GTX550Ti\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"extra_config\": \"Valgrind\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"model\": \"ShuttleA\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Ubuntu\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Perf\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=x86_64 skia_dump_stats=1 skia_release_optimization_level=1 skia_warnings_as_errors=0\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": true@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ - "python", - "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" @@ -146,7 +101,54 @@ "--images", "[SLAVE_BUILD]/skimage/nanobench", "--nocpu", - "--dummy-flags", + "--pre_log", + "--images", + "--gpuStatsDump", + "true", + "--scales", + "1.0", + "1.1", + "--config", + "565", + "8888", + "gpu", + "nonrendering", + "angle", + "hwui", + "f16", + "srgb", + "msaa16", + "nvpr16", + "nvprdit16", + "--loops", + "1", + "--samples", + "1", + "--keepAlive", + "true", + "--match", + "~interlaced1.png", + "~interlaced2.png", + "~interlaced3.png", + "~inc0.gif", + "~inc1.gif", + "~incInterlaced.gif", + "~inc0.jpg", + "~incGray.jpg", + "~inc0.wbmp", + "~inc1.wbmp", + "~inc0.webp", + "~inc1.webp", + "~inc0.ico", + "~inc1.ico", + "~inc0.png", + "~inc1.png", + "~inc2.png", + "~inc12.png", + "~inc13.png", + "~inc14.png", + "~inc0.webp", + "~inc1.webp", "--outResultsFile", "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind/data/nanobench_abc123.json", "--properties", @@ -196,7 +198,54 @@ "--images", "[SLAVE_BUILD]/skimage/nanobench", "--nocpu", - "--dummy-flags", + "--pre_log", + "--images", + "--gpuStatsDump", + "true", + "--scales", + "1.0", + "1.1", + "--config", + "565", + "8888", + "gpu", + "nonrendering", + "angle", + "hwui", + "f16", + "srgb", + "msaa16", + "nvpr16", + "nvprdit16", + "--loops", + "1", + "--samples", + "1", + "--keepAlive", + "true", + "--match", + "~interlaced1.png", + "~interlaced2.png", + "~interlaced3.png", + "~inc0.gif", + "~inc1.gif", + "~incInterlaced.gif", + "~inc0.jpg", + "~incGray.jpg", + "~inc0.wbmp", + "~inc1.wbmp", + "~inc0.webp", + "~inc1.webp", + "~inc0.ico", + "~inc1.ico", + "~inc0.png", + "~inc1.png", + "~inc2.png", + "~inc12.png", + "~inc13.png", + "~inc14.png", + "~inc0.webp", + "~inc1.webp", "--outResultsFile", "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind/data/nanobench_abc123.json", "--properties", diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench.json b/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench.json index e737719ab5..31712422fa 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench.json @@ -3,51 +3,6 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"visualbench\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"arch\": \"x86_64\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"GCC\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu\": \"GPU\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu_value\": \"GTX550Ti\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"extra_config\": \"VisualBench\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"model\": \"ShuttleA\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Ubuntu\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Perf\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=x86_64 skia_dump_stats=1 skia_use_sdl=1 skia_warnings_as_errors=0\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": true@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ - "python", - "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" @@ -140,7 +95,48 @@ "--images", "[SLAVE_BUILD]/skimage/nanobench", "--nocpu", - "--dummy-flags", + "--pre_log", + "--images", + "--gpuStatsDump", + "true", + "--scales", + "1.0", + "1.1", + "--config", + "565", + "8888", + "gpu", + "nonrendering", + "angle", + "hwui", + "f16", + "srgb", + "msaa16", + "nvpr16", + "nvprdit16", + "--match", + "~interlaced1.png", + "~interlaced2.png", + "~interlaced3.png", + "~inc0.gif", + "~inc1.gif", + "~incInterlaced.gif", + "~inc0.jpg", + "~incGray.jpg", + "~inc0.wbmp", + "~inc1.wbmp", + "~inc0.webp", + "~inc1.webp", + "~inc0.ico", + "~inc1.ico", + "~inc0.png", + "~inc1.png", + "~inc2.png", + "~inc12.png", + "~inc13.png", + "~inc14.png", + "~inc0.webp", + "~inc1.webp", "--outResultsFile", "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench/data/nanobench_abc123.json", "--properties", @@ -167,7 +163,7 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "GYP_DEFINES": "skia_arch_type=x86_64 skia_dump_stats=1 skia_use_sdl=1 skia_warnings_as_errors=0", + "GYP_DEFINES": "skia_arch_type=x86_64 skia_dump_stats=1 skia_warnings_as_errors=0", "SKIA_OUT": "[SLAVE_BUILD]/out" }, "name": "visualbench" diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug.json b/infra/bots/recipes/swarm_perf.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug.json index 0ef017ec6f..b9afc16b65 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug.json @@ -3,50 +3,6 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]\\skia\\tools\\buildbot_spec.py", - "/path/to/tmp/json", - "Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug" - ], - "cwd": "[SLAVE_BUILD]\\skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"arch\": \"x86_64\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"MSVC\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu\": \"CPU\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu_value\": \"AVX2\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"model\": \"GCE\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Win\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Perf\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug_x64\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"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\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ - "python", - "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\skp\\VERSION", "/path/to/tmp/" @@ -94,7 +50,45 @@ "--images", "[SLAVE_BUILD]\\skimage\\nanobench", "--nogpu", - "--dummy-flags" + "--pre_log", + "--scales", + "1.0", + "1.1", + "--config", + "565", + "8888", + "gpu", + "nonrendering", + "angle", + "hwui", + "f16", + "srgb", + "msaa16", + "nvpr16", + "nvprdit16", + "--match", + "~interlaced1.png", + "~interlaced2.png", + "~interlaced3.png", + "~inc0.gif", + "~inc1.gif", + "~incInterlaced.gif", + "~inc0.jpg", + "~incGray.jpg", + "~inc0.wbmp", + "~inc1.wbmp", + "~inc0.webp", + "~inc1.webp", + "~inc0.ico", + "~inc1.ico", + "~inc0.png", + "~inc1.png", + "~inc2.png", + "~inc12.png", + "~inc13.png", + "~inc14.png", + "~inc0.webp", + "~inc1.webp" ], "env": { "BUILDTYPE": "Debug_x64", diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release.json b/infra/bots/recipes/swarm_perf.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release.json index e530601a86..1d8378b2d4 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release.json @@ -3,50 +3,6 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]\\skia\\tools\\buildbot_spec.py", - "/path/to/tmp/json", - "Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release" - ], - "cwd": "[SLAVE_BUILD]\\skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"arch\": \"x86_64\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"MSVC\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu\": \"CPU\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu_value\": \"AVX2\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"model\": \"GCE\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Win\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Perf\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release_x64\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"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\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": true@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ - "python", - "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\skp\\VERSION", "/path/to/tmp/" @@ -138,7 +94,45 @@ "--images", "[SLAVE_BUILD]\\skimage\\nanobench", "--nogpu", - "--dummy-flags", + "--pre_log", + "--scales", + "1.0", + "1.1", + "--config", + "565", + "8888", + "gpu", + "nonrendering", + "angle", + "hwui", + "f16", + "srgb", + "msaa16", + "nvpr16", + "nvprdit16", + "--match", + "~interlaced1.png", + "~interlaced2.png", + "~interlaced3.png", + "~inc0.gif", + "~inc1.gif", + "~incInterlaced.gif", + "~inc0.jpg", + "~incGray.jpg", + "~inc0.wbmp", + "~inc1.wbmp", + "~inc0.webp", + "~inc1.webp", + "~inc0.ico", + "~inc1.ico", + "~inc0.png", + "~inc1.png", + "~inc2.png", + "~inc12.png", + "~inc13.png", + "~inc14.png", + "~inc0.webp", + "~inc1.webp", "--outResultsFile", "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release\\data\\nanobench_abc123.json", "--properties", diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json b/infra/bots/recipes/swarm_perf.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json index 81a2a618c3..e565defb0e 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json @@ -3,50 +3,6 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]\\skia\\tools\\buildbot_spec.py", - "/path/to/tmp/json", - "Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot" - ], - "cwd": "[SLAVE_BUILD]\\skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"arch\": \"x86_64\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"MSVC\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu\": \"GPU\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu_value\": \"HD4600\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"model\": \"ShuttleB\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Win8\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Perf\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release_x64\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"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\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": true@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ - "python", - "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\skp\\VERSION", "/path/to/tmp/" @@ -138,7 +94,48 @@ "--images", "[SLAVE_BUILD]\\skimage\\nanobench", "--nocpu", - "--dummy-flags", + "--pre_log", + "--images", + "--gpuStatsDump", + "true", + "--scales", + "1.0", + "1.1", + "--config", + "565", + "8888", + "gpu", + "nonrendering", + "angle", + "hwui", + "f16", + "srgb", + "msaa16", + "nvpr16", + "nvprdit16", + "--match", + "~interlaced1.png", + "~interlaced2.png", + "~interlaced3.png", + "~inc0.gif", + "~inc1.gif", + "~incInterlaced.gif", + "~inc0.jpg", + "~incGray.jpg", + "~inc0.wbmp", + "~inc1.wbmp", + "~inc0.webp", + "~inc1.webp", + "~inc0.ico", + "~inc1.ico", + "~inc0.png", + "~inc1.png", + "~inc2.png", + "~inc12.png", + "~inc13.png", + "~inc14.png", + "~inc0.webp", + "~inc1.webp", "--outResultsFile", "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot\\data\\nanobench_abc123.json", "--properties", diff --git a/infra/bots/recipes/swarm_perf.expected/big_issue_number.json b/infra/bots/recipes/swarm_perf.expected/big_issue_number.json index 70d5b823df..d98e6680d2 100644 --- a/infra/bots/recipes/swarm_perf.expected/big_issue_number.json +++ b/infra/bots/recipes/swarm_perf.expected/big_issue_number.json @@ -3,50 +3,6 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]\\skia\\tools\\buildbot_spec.py", - "/path/to/tmp/json", - "Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot" - ], - "cwd": "[SLAVE_BUILD]\\skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"arch\": \"x86_64\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"MSVC\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu\": \"GPU\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu_value\": \"HD4600\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"model\": \"ShuttleB\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Win8\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Perf\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release_x64\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"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\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": true@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ - "python", - "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\skp\\VERSION", "/path/to/tmp/" @@ -138,7 +94,48 @@ "--images", "[SLAVE_BUILD]\\skimage\\nanobench", "--nocpu", - "--dummy-flags", + "--pre_log", + "--images", + "--gpuStatsDump", + "true", + "--scales", + "1.0", + "1.1", + "--config", + "565", + "8888", + "gpu", + "nonrendering", + "angle", + "hwui", + "f16", + "srgb", + "msaa16", + "nvpr16", + "nvprdit16", + "--match", + "~interlaced1.png", + "~interlaced2.png", + "~interlaced3.png", + "~inc0.gif", + "~inc1.gif", + "~incInterlaced.gif", + "~inc0.jpg", + "~incGray.jpg", + "~inc0.wbmp", + "~inc1.wbmp", + "~inc0.webp", + "~inc1.webp", + "~inc0.ico", + "~inc1.ico", + "~inc0.png", + "~inc1.png", + "~inc2.png", + "~inc12.png", + "~inc13.png", + "~inc14.png", + "~inc0.webp", + "~inc1.webp", "--outResultsFile", "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot\\data\\nanobench_abc123.json", "--properties", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Debug.json index 4ee72b9136..f29ee87b9c 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Debug.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Debug.json @@ -1,52 +1,6 @@ [ { "cmd": [ - "python", - "-u", - "[SLAVE_BUILD]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Test-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Debug" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"dm\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"arch\": \"Arm7\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"GCC\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu\": \"GPU\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu_value\": \"Mali400\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"model\": \"GalaxyS3\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Android\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Test\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"device_cfg\": \"arm_v7_neon\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=arm skia_warnings_as_errors=0\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"product.board\": \"m0\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ "which", "adb" ], @@ -458,7 +412,309 @@ "--writePath", "/storage/emulated/legacy/skiabot/skia_dm", "--nocpu", - "--dummy-flags" + "--config", + "565", + "8888", + "gpu", + "gpusrgb", + "msaa4", + "serialize-8888", + "tiles_rt-8888", + "pic-8888", + "gpudft", + "--src", + "tests", + "gm", + "image", + "--threads", + "0", + "--blacklist", + "f16", + "_", + "_", + "dstreadshuffle", + "f16", + "image", + "_", + "_", + "srgb", + "image", + "_", + "_", + "gpusrgb", + "image", + "_", + "_", + "_", + "test", + "_", + "GrShape", + "serialize-8888", + "gm", + "_", + "bleed_image", + "serialize-8888", + "gm", + "_", + "c_gms", + "serialize-8888", + "gm", + "_", + "colortype", + "serialize-8888", + "gm", + "_", + "colortype_xfermodes", + "serialize-8888", + "gm", + "_", + "drawfilter", + "serialize-8888", + "gm", + "_", + "fontmgr_bounds_0.75_0", + "serialize-8888", + "gm", + "_", + "fontmgr_bounds_1_-0.25", + "serialize-8888", + "gm", + "_", + "fontmgr_bounds", + "serialize-8888", + "gm", + "_", + "fontmgr_match", + "serialize-8888", + "gm", + "_", + "fontmgr_iter", + "serialize-8888", + "gm", + "_", + "bitmapfilters", + "serialize-8888", + "gm", + "_", + "bitmapshaders", + "serialize-8888", + "gm", + "_", + "bleed", + "serialize-8888", + "gm", + "_", + "bleed_alpha_bmp", + "serialize-8888", + "gm", + "_", + "bleed_alpha_bmp_shader", + "serialize-8888", + "gm", + "_", + "convex_poly_clip", + "serialize-8888", + "gm", + "_", + "extractalpha", + "serialize-8888", + "gm", + "_", + "filterbitmap_checkerboard_32_32_g8", + "serialize-8888", + "gm", + "_", + "filterbitmap_image_mandrill_64", + "serialize-8888", + "gm", + "_", + "shadows", + "serialize-8888", + "gm", + "_", + "simpleaaclip_aaclip", + "serialize-8888", + "gm", + "_", + "composeshader_bitmap", + "serialize-8888", + "gm", + "_", + "scaled_tilemodes_npot", + "serialize-8888", + "gm", + "_", + "scaled_tilemodes", + "serialize-8888", + "gm", + "_", + "bleed_alpha_image", + "serialize-8888", + "gm", + "_", + "bleed_alpha_image_shader", + "serialize-8888", + "gm", + "_", + "verylargebitmap", + "serialize-8888", + "gm", + "_", + "verylarge_picture_image", + "sp-8888", + "gm", + "_", + "drawfilter", + "pic-8888", + "gm", + "_", + "drawfilter", + "2ndpic-8888", + "gm", + "_", + "drawfilter", + "sp-8888", + "gm", + "_", + "image-cacherator-from-picture", + "pic-8888", + "gm", + "_", + "image-cacherator-from-picture", + "2ndpic-8888", + "gm", + "_", + "image-cacherator-from-picture", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-picture", + "sp-8888", + "gm", + "_", + "image-cacherator-from-raster", + "pic-8888", + "gm", + "_", + "image-cacherator-from-raster", + "2ndpic-8888", + "gm", + "_", + "image-cacherator-from-raster", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-raster", + "sp-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "pic-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "2ndpic-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "_", + "image", + "_", + "interlaced1.png", + "_", + "image", + "_", + "interlaced2.png", + "_", + "image", + "_", + "interlaced3.png", + "_", + "image", + "_", + ".arw", + "_", + "image", + "_", + ".cr2", + "_", + "image", + "_", + ".dng", + "_", + "image", + "_", + ".nef", + "_", + "image", + "_", + ".nrw", + "_", + "image", + "_", + ".orf", + "_", + "image", + "_", + ".raf", + "_", + "image", + "_", + ".rw2", + "_", + "image", + "_", + ".pef", + "_", + "image", + "_", + ".srw", + "_", + "image", + "_", + ".ARW", + "_", + "image", + "_", + ".CR2", + "_", + "image", + "_", + ".DNG", + "_", + "image", + "_", + ".NEF", + "_", + "image", + "_", + ".NRW", + "_", + "image", + "_", + ".ORF", + "_", + "image", + "_", + ".RAF", + "_", + "image", + "_", + ".RW2", + "_", + "image", + "_", + ".PEF", + "_", + "image", + "_", + ".SRW", + "--match", + "~WritePixels" ], "env": { "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug.json index 3732a42bdc..7ed4b3e99e 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug.json @@ -1,52 +1,6 @@ [ { "cmd": [ - "python", - "-u", - "[SLAVE_BUILD]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"dm\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"arch\": \"Arm7\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"GCC\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu\": \"GPU\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu_value\": \"Tegra3\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"model\": \"Nexus7\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Android\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Test\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"device_cfg\": \"arm_v7_neon\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=arm skia_warnings_as_errors=0\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"product.board\": \"grouper\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ "which", "adb" ], @@ -559,7 +513,303 @@ "--writePath", "/storage/emulated/legacy/skiabot/skia_dm", "--nocpu", - "--dummy-flags" + "--config", + "565", + "8888", + "gpu", + "gpusrgb", + "serialize-8888", + "tiles_rt-8888", + "pic-8888", + "--src", + "tests", + "gm", + "image", + "--blacklist", + "f16", + "_", + "_", + "dstreadshuffle", + "f16", + "image", + "_", + "_", + "srgb", + "image", + "_", + "_", + "gpusrgb", + "image", + "_", + "_", + "_", + "test", + "_", + "GrShape", + "serialize-8888", + "gm", + "_", + "bleed_image", + "serialize-8888", + "gm", + "_", + "c_gms", + "serialize-8888", + "gm", + "_", + "colortype", + "serialize-8888", + "gm", + "_", + "colortype_xfermodes", + "serialize-8888", + "gm", + "_", + "drawfilter", + "serialize-8888", + "gm", + "_", + "fontmgr_bounds_0.75_0", + "serialize-8888", + "gm", + "_", + "fontmgr_bounds_1_-0.25", + "serialize-8888", + "gm", + "_", + "fontmgr_bounds", + "serialize-8888", + "gm", + "_", + "fontmgr_match", + "serialize-8888", + "gm", + "_", + "fontmgr_iter", + "serialize-8888", + "gm", + "_", + "bitmapfilters", + "serialize-8888", + "gm", + "_", + "bitmapshaders", + "serialize-8888", + "gm", + "_", + "bleed", + "serialize-8888", + "gm", + "_", + "bleed_alpha_bmp", + "serialize-8888", + "gm", + "_", + "bleed_alpha_bmp_shader", + "serialize-8888", + "gm", + "_", + "convex_poly_clip", + "serialize-8888", + "gm", + "_", + "extractalpha", + "serialize-8888", + "gm", + "_", + "filterbitmap_checkerboard_32_32_g8", + "serialize-8888", + "gm", + "_", + "filterbitmap_image_mandrill_64", + "serialize-8888", + "gm", + "_", + "shadows", + "serialize-8888", + "gm", + "_", + "simpleaaclip_aaclip", + "serialize-8888", + "gm", + "_", + "composeshader_bitmap", + "serialize-8888", + "gm", + "_", + "scaled_tilemodes_npot", + "serialize-8888", + "gm", + "_", + "scaled_tilemodes", + "serialize-8888", + "gm", + "_", + "bleed_alpha_image", + "serialize-8888", + "gm", + "_", + "bleed_alpha_image_shader", + "serialize-8888", + "gm", + "_", + "verylargebitmap", + "serialize-8888", + "gm", + "_", + "verylarge_picture_image", + "sp-8888", + "gm", + "_", + "drawfilter", + "pic-8888", + "gm", + "_", + "drawfilter", + "2ndpic-8888", + "gm", + "_", + "drawfilter", + "sp-8888", + "gm", + "_", + "image-cacherator-from-picture", + "pic-8888", + "gm", + "_", + "image-cacherator-from-picture", + "2ndpic-8888", + "gm", + "_", + "image-cacherator-from-picture", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-picture", + "sp-8888", + "gm", + "_", + "image-cacherator-from-raster", + "pic-8888", + "gm", + "_", + "image-cacherator-from-raster", + "2ndpic-8888", + "gm", + "_", + "image-cacherator-from-raster", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-raster", + "sp-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "pic-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "2ndpic-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "_", + "image", + "_", + "interlaced1.png", + "_", + "image", + "_", + "interlaced2.png", + "_", + "image", + "_", + "interlaced3.png", + "_", + "image", + "_", + ".arw", + "_", + "image", + "_", + ".cr2", + "_", + "image", + "_", + ".dng", + "_", + "image", + "_", + ".nef", + "_", + "image", + "_", + ".nrw", + "_", + "image", + "_", + ".orf", + "_", + "image", + "_", + ".raf", + "_", + "image", + "_", + ".rw2", + "_", + "image", + "_", + ".pef", + "_", + "image", + "_", + ".srw", + "_", + "image", + "_", + ".ARW", + "_", + "image", + "_", + ".CR2", + "_", + "image", + "_", + ".DNG", + "_", + "image", + "_", + ".NEF", + "_", + "image", + "_", + ".NRW", + "_", + "image", + "_", + ".ORF", + "_", + "image", + "_", + ".RAF", + "_", + "image", + "_", + ".RW2", + "_", + "image", + "_", + ".PEF", + "_", + "image", + "_", + ".SRW" ], "env": { "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json index bf198b3002..1878e7d15b 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json @@ -3,53 +3,6 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"dm\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"arch\": \"x86_64\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"Clang\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Coverage\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu\": \"CPU\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu_value\": \"AVX2\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"model\": \"GCE\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Ubuntu\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Test\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Coverage\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_compile_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"CC\": \"/usr/bin/clang-3.6\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"CXX\": \"/usr/bin/clang++-3.6\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=x86_64 skia_clang_build=1 skia_gpu=0 skia_warnings_as_errors=0\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ - "python", - "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" @@ -190,7 +143,205 @@ "os", "Ubuntu", "--nogpu", - "--dummy-flags", + "--config", + "565", + "8888", + "gpu", + "gpusrgb", + "pdf", + "msaa16", + "f16", + "srgb", + "sp-8888", + "2ndpic-8888", + "serialize-8888", + "tiles_rt-8888", + "pic-8888", + "--src", + "tests", + "gm", + "image", + "--blacklist", + "f16", + "_", + "_", + "dstreadshuffle", + "f16", + "image", + "_", + "_", + "srgb", + "image", + "_", + "_", + "gpusrgb", + "image", + "_", + "_", + "serialize-8888", + "gm", + "_", + "bleed_image", + "serialize-8888", + "gm", + "_", + "c_gms", + "serialize-8888", + "gm", + "_", + "colortype", + "serialize-8888", + "gm", + "_", + "colortype_xfermodes", + "serialize-8888", + "gm", + "_", + "drawfilter", + "serialize-8888", + "gm", + "_", + "fontmgr_bounds_0.75_0", + "serialize-8888", + "gm", + "_", + "fontmgr_bounds_1_-0.25", + "serialize-8888", + "gm", + "_", + "fontmgr_bounds", + "serialize-8888", + "gm", + "_", + "fontmgr_match", + "serialize-8888", + "gm", + "_", + "fontmgr_iter", + "serialize-8888", + "gm", + "_", + "bitmapfilters", + "serialize-8888", + "gm", + "_", + "bitmapshaders", + "serialize-8888", + "gm", + "_", + "bleed", + "serialize-8888", + "gm", + "_", + "bleed_alpha_bmp", + "serialize-8888", + "gm", + "_", + "bleed_alpha_bmp_shader", + "serialize-8888", + "gm", + "_", + "convex_poly_clip", + "serialize-8888", + "gm", + "_", + "extractalpha", + "serialize-8888", + "gm", + "_", + "filterbitmap_checkerboard_32_32_g8", + "serialize-8888", + "gm", + "_", + "filterbitmap_image_mandrill_64", + "serialize-8888", + "gm", + "_", + "shadows", + "serialize-8888", + "gm", + "_", + "simpleaaclip_aaclip", + "serialize-8888", + "gm", + "_", + "composeshader_bitmap", + "serialize-8888", + "gm", + "_", + "scaled_tilemodes_npot", + "serialize-8888", + "gm", + "_", + "scaled_tilemodes", + "serialize-8888", + "gm", + "_", + "bleed_alpha_image", + "serialize-8888", + "gm", + "_", + "bleed_alpha_image_shader", + "sp-8888", + "gm", + "_", + "drawfilter", + "pic-8888", + "gm", + "_", + "drawfilter", + "2ndpic-8888", + "gm", + "_", + "drawfilter", + "sp-8888", + "gm", + "_", + "image-cacherator-from-picture", + "pic-8888", + "gm", + "_", + "image-cacherator-from-picture", + "2ndpic-8888", + "gm", + "_", + "image-cacherator-from-picture", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-picture", + "sp-8888", + "gm", + "_", + "image-cacherator-from-raster", + "pic-8888", + "gm", + "_", + "image-cacherator-from-raster", + "2ndpic-8888", + "gm", + "_", + "image-cacherator-from-raster", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-raster", + "sp-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "pic-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "2ndpic-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-ctable", "--outResultsFile", "[SLAVE_BUILD]/out/coverage_results/abc123.cov" ], diff --git a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json index 50cdf19527..30ddf87598 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json @@ -3,52 +3,6 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"dm\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"arch\": \"x86_64\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"GCC\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu\": \"CPU\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu_value\": \"AVX2\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"extra_config\": \"MSAN\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"model\": \"GCE\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Ubuntu\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Test\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ - "python", - "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" @@ -125,7 +79,208 @@ "os", "Ubuntu", "--nogpu", - "--dummy-flags" + "--config", + "565", + "8888", + "gpu", + "gpusrgb", + "pdf", + "msaa16", + "f16", + "srgb", + "sp-8888", + "2ndpic-8888", + "serialize-8888", + "tiles_rt-8888", + "pic-8888", + "--src", + "tests", + "gm", + "image", + "--blacklist", + "f16", + "_", + "_", + "dstreadshuffle", + "f16", + "image", + "_", + "_", + "srgb", + "image", + "_", + "_", + "gpusrgb", + "image", + "_", + "_", + "serialize-8888", + "gm", + "_", + "bleed_image", + "serialize-8888", + "gm", + "_", + "c_gms", + "serialize-8888", + "gm", + "_", + "colortype", + "serialize-8888", + "gm", + "_", + "colortype_xfermodes", + "serialize-8888", + "gm", + "_", + "drawfilter", + "serialize-8888", + "gm", + "_", + "fontmgr_bounds_0.75_0", + "serialize-8888", + "gm", + "_", + "fontmgr_bounds_1_-0.25", + "serialize-8888", + "gm", + "_", + "fontmgr_bounds", + "serialize-8888", + "gm", + "_", + "fontmgr_match", + "serialize-8888", + "gm", + "_", + "fontmgr_iter", + "serialize-8888", + "gm", + "_", + "bitmapfilters", + "serialize-8888", + "gm", + "_", + "bitmapshaders", + "serialize-8888", + "gm", + "_", + "bleed", + "serialize-8888", + "gm", + "_", + "bleed_alpha_bmp", + "serialize-8888", + "gm", + "_", + "bleed_alpha_bmp_shader", + "serialize-8888", + "gm", + "_", + "convex_poly_clip", + "serialize-8888", + "gm", + "_", + "extractalpha", + "serialize-8888", + "gm", + "_", + "filterbitmap_checkerboard_32_32_g8", + "serialize-8888", + "gm", + "_", + "filterbitmap_image_mandrill_64", + "serialize-8888", + "gm", + "_", + "shadows", + "serialize-8888", + "gm", + "_", + "simpleaaclip_aaclip", + "serialize-8888", + "gm", + "_", + "composeshader_bitmap", + "serialize-8888", + "gm", + "_", + "scaled_tilemodes_npot", + "serialize-8888", + "gm", + "_", + "scaled_tilemodes", + "serialize-8888", + "gm", + "_", + "bleed_alpha_image", + "serialize-8888", + "gm", + "_", + "bleed_alpha_image_shader", + "sp-8888", + "gm", + "_", + "drawfilter", + "pic-8888", + "gm", + "_", + "drawfilter", + "2ndpic-8888", + "gm", + "_", + "drawfilter", + "sp-8888", + "gm", + "_", + "image-cacherator-from-picture", + "pic-8888", + "gm", + "_", + "image-cacherator-from-picture", + "2ndpic-8888", + "gm", + "_", + "image-cacherator-from-picture", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-picture", + "sp-8888", + "gm", + "_", + "image-cacherator-from-raster", + "pic-8888", + "gm", + "_", + "image-cacherator-from-raster", + "2ndpic-8888", + "gm", + "_", + "image-cacherator-from-raster", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-raster", + "sp-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "pic-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "2ndpic-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "--match", + "~Once", + "~Shared" ], "env": { "ASAN_OPTIONS": "symbolize=1 detect_leaks=1", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json index cb4b525576..efe9a753c6 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json @@ -3,50 +3,6 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"dm\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"arch\": \"x86_64\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"GCC\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu\": \"CPU\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu_value\": \"AVX2\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"model\": \"GCE\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Ubuntu\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Test\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ - "python", - "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" @@ -241,7 +197,205 @@ "--writePath", "[CUSTOM_[SWARM_OUT_DIR]]/dm", "--nogpu", - "--dummy-flags" + "--config", + "565", + "8888", + "gpu", + "gpusrgb", + "pdf", + "msaa16", + "f16", + "srgb", + "sp-8888", + "2ndpic-8888", + "serialize-8888", + "tiles_rt-8888", + "pic-8888", + "--src", + "tests", + "gm", + "image", + "--blacklist", + "f16", + "_", + "_", + "dstreadshuffle", + "f16", + "image", + "_", + "_", + "srgb", + "image", + "_", + "_", + "gpusrgb", + "image", + "_", + "_", + "serialize-8888", + "gm", + "_", + "bleed_image", + "serialize-8888", + "gm", + "_", + "c_gms", + "serialize-8888", + "gm", + "_", + "colortype", + "serialize-8888", + "gm", + "_", + "colortype_xfermodes", + "serialize-8888", + "gm", + "_", + "drawfilter", + "serialize-8888", + "gm", + "_", + "fontmgr_bounds_0.75_0", + "serialize-8888", + "gm", + "_", + "fontmgr_bounds_1_-0.25", + "serialize-8888", + "gm", + "_", + "fontmgr_bounds", + "serialize-8888", + "gm", + "_", + "fontmgr_match", + "serialize-8888", + "gm", + "_", + "fontmgr_iter", + "serialize-8888", + "gm", + "_", + "bitmapfilters", + "serialize-8888", + "gm", + "_", + "bitmapshaders", + "serialize-8888", + "gm", + "_", + "bleed", + "serialize-8888", + "gm", + "_", + "bleed_alpha_bmp", + "serialize-8888", + "gm", + "_", + "bleed_alpha_bmp_shader", + "serialize-8888", + "gm", + "_", + "convex_poly_clip", + "serialize-8888", + "gm", + "_", + "extractalpha", + "serialize-8888", + "gm", + "_", + "filterbitmap_checkerboard_32_32_g8", + "serialize-8888", + "gm", + "_", + "filterbitmap_image_mandrill_64", + "serialize-8888", + "gm", + "_", + "shadows", + "serialize-8888", + "gm", + "_", + "simpleaaclip_aaclip", + "serialize-8888", + "gm", + "_", + "composeshader_bitmap", + "serialize-8888", + "gm", + "_", + "scaled_tilemodes_npot", + "serialize-8888", + "gm", + "_", + "scaled_tilemodes", + "serialize-8888", + "gm", + "_", + "bleed_alpha_image", + "serialize-8888", + "gm", + "_", + "bleed_alpha_image_shader", + "sp-8888", + "gm", + "_", + "drawfilter", + "pic-8888", + "gm", + "_", + "drawfilter", + "2ndpic-8888", + "gm", + "_", + "drawfilter", + "sp-8888", + "gm", + "_", + "image-cacherator-from-picture", + "pic-8888", + "gm", + "_", + "image-cacherator-from-picture", + "2ndpic-8888", + "gm", + "_", + "image-cacherator-from-picture", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-picture", + "sp-8888", + "gm", + "_", + "image-cacherator-from-raster", + "pic-8888", + "gm", + "_", + "image-cacherator-from-raster", + "2ndpic-8888", + "gm", + "_", + "image-cacherator-from-raster", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-raster", + "sp-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "pic-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "2ndpic-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-ctable" ], "env": { "BUILDTYPE": "Debug", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json index 3da3daea0c..cd5fc389cf 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json @@ -3,51 +3,6 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"dm\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"arch\": \"x86_64\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"GCC\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu\": \"GPU\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu_value\": \"GTX550Ti\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"extra_config\": \"Valgrind\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"model\": \"ShuttleA\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Ubuntu\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Test\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=x86_64 skia_release_optimization_level=1 skia_warnings_as_errors=0\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ - "python", - "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" @@ -131,7 +86,316 @@ "os", "Ubuntu", "--nocpu", - "--dummy-flags" + "--config", + "565", + "8888", + "gpu", + "gpusrgb", + "pdf", + "msaa16", + "nvprdit16", + "serialize-8888", + "tiles_rt-8888", + "pic-8888", + "--src", + "tests", + "gm", + "image", + "--blacklist", + "f16", + "_", + "_", + "dstreadshuffle", + "f16", + "image", + "_", + "_", + "srgb", + "image", + "_", + "_", + "gpusrgb", + "image", + "_", + "_", + "pdf", + "gm", + "_", + "fontmgr_iter", + "pdf", + "_", + "_", + "PANO_20121023_214540.jpg", + "pdf", + "skp", + "_", + "worldjournal", + "pdf", + "skp", + "_", + "desk_baidu.skp", + "pdf", + "skp", + "_", + "desk_wikipedia.skp", + "serialize-8888", + "gm", + "_", + "bleed_image", + "serialize-8888", + "gm", + "_", + "c_gms", + "serialize-8888", + "gm", + "_", + "colortype", + "serialize-8888", + "gm", + "_", + "colortype_xfermodes", + "serialize-8888", + "gm", + "_", + "drawfilter", + "serialize-8888", + "gm", + "_", + "fontmgr_bounds_0.75_0", + "serialize-8888", + "gm", + "_", + "fontmgr_bounds_1_-0.25", + "serialize-8888", + "gm", + "_", + "fontmgr_bounds", + "serialize-8888", + "gm", + "_", + "fontmgr_match", + "serialize-8888", + "gm", + "_", + "fontmgr_iter", + "serialize-8888", + "gm", + "_", + "bitmapfilters", + "serialize-8888", + "gm", + "_", + "bitmapshaders", + "serialize-8888", + "gm", + "_", + "bleed", + "serialize-8888", + "gm", + "_", + "bleed_alpha_bmp", + "serialize-8888", + "gm", + "_", + "bleed_alpha_bmp_shader", + "serialize-8888", + "gm", + "_", + "convex_poly_clip", + "serialize-8888", + "gm", + "_", + "extractalpha", + "serialize-8888", + "gm", + "_", + "filterbitmap_checkerboard_32_32_g8", + "serialize-8888", + "gm", + "_", + "filterbitmap_image_mandrill_64", + "serialize-8888", + "gm", + "_", + "shadows", + "serialize-8888", + "gm", + "_", + "simpleaaclip_aaclip", + "serialize-8888", + "gm", + "_", + "composeshader_bitmap", + "serialize-8888", + "gm", + "_", + "scaled_tilemodes_npot", + "serialize-8888", + "gm", + "_", + "scaled_tilemodes", + "serialize-8888", + "gm", + "_", + "bleed_alpha_image", + "serialize-8888", + "gm", + "_", + "bleed_alpha_image_shader", + "sp-8888", + "gm", + "_", + "drawfilter", + "pic-8888", + "gm", + "_", + "drawfilter", + "2ndpic-8888", + "gm", + "_", + "drawfilter", + "sp-8888", + "gm", + "_", + "image-cacherator-from-picture", + "pic-8888", + "gm", + "_", + "image-cacherator-from-picture", + "2ndpic-8888", + "gm", + "_", + "image-cacherator-from-picture", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-picture", + "sp-8888", + "gm", + "_", + "image-cacherator-from-raster", + "pic-8888", + "gm", + "_", + "image-cacherator-from-raster", + "2ndpic-8888", + "gm", + "_", + "image-cacherator-from-raster", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-raster", + "sp-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "pic-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "2ndpic-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "_", + "image", + "_", + "interlaced1.png", + "_", + "image", + "_", + "interlaced2.png", + "_", + "image", + "_", + "interlaced3.png", + "_", + "image", + "_", + ".arw", + "_", + "image", + "_", + ".cr2", + "_", + "image", + "_", + ".dng", + "_", + "image", + "_", + ".nef", + "_", + "image", + "_", + ".nrw", + "_", + "image", + "_", + ".orf", + "_", + "image", + "_", + ".raf", + "_", + "image", + "_", + ".rw2", + "_", + "image", + "_", + ".pef", + "_", + "image", + "_", + ".srw", + "_", + "image", + "_", + ".ARW", + "_", + "image", + "_", + ".CR2", + "_", + "image", + "_", + ".DNG", + "_", + "image", + "_", + ".NEF", + "_", + "image", + "_", + ".NRW", + "_", + "image", + "_", + ".ORF", + "_", + "image", + "_", + ".RAF", + "_", + "image", + "_", + ".RW2", + "_", + "image", + "_", + ".PEF", + "_", + "image", + "_", + ".SRW", + "--match", + "~Threaded" ], "env": { "BUILDTYPE": "Release", @@ -188,7 +452,316 @@ "os", "Ubuntu", "--nocpu", - "--dummy-flags", + "--config", + "565", + "8888", + "gpu", + "gpusrgb", + "pdf", + "msaa16", + "nvprdit16", + "serialize-8888", + "tiles_rt-8888", + "pic-8888", + "--src", + "tests", + "gm", + "image", + "--blacklist", + "f16", + "_", + "_", + "dstreadshuffle", + "f16", + "image", + "_", + "_", + "srgb", + "image", + "_", + "_", + "gpusrgb", + "image", + "_", + "_", + "pdf", + "gm", + "_", + "fontmgr_iter", + "pdf", + "_", + "_", + "PANO_20121023_214540.jpg", + "pdf", + "skp", + "_", + "worldjournal", + "pdf", + "skp", + "_", + "desk_baidu.skp", + "pdf", + "skp", + "_", + "desk_wikipedia.skp", + "serialize-8888", + "gm", + "_", + "bleed_image", + "serialize-8888", + "gm", + "_", + "c_gms", + "serialize-8888", + "gm", + "_", + "colortype", + "serialize-8888", + "gm", + "_", + "colortype_xfermodes", + "serialize-8888", + "gm", + "_", + "drawfilter", + "serialize-8888", + "gm", + "_", + "fontmgr_bounds_0.75_0", + "serialize-8888", + "gm", + "_", + "fontmgr_bounds_1_-0.25", + "serialize-8888", + "gm", + "_", + "fontmgr_bounds", + "serialize-8888", + "gm", + "_", + "fontmgr_match", + "serialize-8888", + "gm", + "_", + "fontmgr_iter", + "serialize-8888", + "gm", + "_", + "bitmapfilters", + "serialize-8888", + "gm", + "_", + "bitmapshaders", + "serialize-8888", + "gm", + "_", + "bleed", + "serialize-8888", + "gm", + "_", + "bleed_alpha_bmp", + "serialize-8888", + "gm", + "_", + "bleed_alpha_bmp_shader", + "serialize-8888", + "gm", + "_", + "convex_poly_clip", + "serialize-8888", + "gm", + "_", + "extractalpha", + "serialize-8888", + "gm", + "_", + "filterbitmap_checkerboard_32_32_g8", + "serialize-8888", + "gm", + "_", + "filterbitmap_image_mandrill_64", + "serialize-8888", + "gm", + "_", + "shadows", + "serialize-8888", + "gm", + "_", + "simpleaaclip_aaclip", + "serialize-8888", + "gm", + "_", + "composeshader_bitmap", + "serialize-8888", + "gm", + "_", + "scaled_tilemodes_npot", + "serialize-8888", + "gm", + "_", + "scaled_tilemodes", + "serialize-8888", + "gm", + "_", + "bleed_alpha_image", + "serialize-8888", + "gm", + "_", + "bleed_alpha_image_shader", + "sp-8888", + "gm", + "_", + "drawfilter", + "pic-8888", + "gm", + "_", + "drawfilter", + "2ndpic-8888", + "gm", + "_", + "drawfilter", + "sp-8888", + "gm", + "_", + "image-cacherator-from-picture", + "pic-8888", + "gm", + "_", + "image-cacherator-from-picture", + "2ndpic-8888", + "gm", + "_", + "image-cacherator-from-picture", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-picture", + "sp-8888", + "gm", + "_", + "image-cacherator-from-raster", + "pic-8888", + "gm", + "_", + "image-cacherator-from-raster", + "2ndpic-8888", + "gm", + "_", + "image-cacherator-from-raster", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-raster", + "sp-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "pic-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "2ndpic-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "_", + "image", + "_", + "interlaced1.png", + "_", + "image", + "_", + "interlaced2.png", + "_", + "image", + "_", + "interlaced3.png", + "_", + "image", + "_", + ".arw", + "_", + "image", + "_", + ".cr2", + "_", + "image", + "_", + ".dng", + "_", + "image", + "_", + ".nef", + "_", + "image", + "_", + ".nrw", + "_", + "image", + "_", + ".orf", + "_", + "image", + "_", + ".raf", + "_", + "image", + "_", + ".rw2", + "_", + "image", + "_", + ".pef", + "_", + "image", + "_", + ".srw", + "_", + "image", + "_", + ".ARW", + "_", + "image", + "_", + ".CR2", + "_", + "image", + "_", + ".DNG", + "_", + "image", + "_", + ".NEF", + "_", + "image", + "_", + ".NRW", + "_", + "image", + "_", + ".ORF", + "_", + "image", + "_", + ".RAF", + "_", + "image", + "_", + ".RW2", + "_", + "image", + "_", + ".PEF", + "_", + "image", + "_", + ".SRW", + "--match", + "~Threaded", "--abandonGpuContext" ], "env": { @@ -246,7 +819,316 @@ "os", "Ubuntu", "--nocpu", - "--dummy-flags", + "--config", + "565", + "8888", + "gpu", + "gpusrgb", + "pdf", + "msaa16", + "nvprdit16", + "serialize-8888", + "tiles_rt-8888", + "pic-8888", + "--src", + "tests", + "gm", + "image", + "--blacklist", + "f16", + "_", + "_", + "dstreadshuffle", + "f16", + "image", + "_", + "_", + "srgb", + "image", + "_", + "_", + "gpusrgb", + "image", + "_", + "_", + "pdf", + "gm", + "_", + "fontmgr_iter", + "pdf", + "_", + "_", + "PANO_20121023_214540.jpg", + "pdf", + "skp", + "_", + "worldjournal", + "pdf", + "skp", + "_", + "desk_baidu.skp", + "pdf", + "skp", + "_", + "desk_wikipedia.skp", + "serialize-8888", + "gm", + "_", + "bleed_image", + "serialize-8888", + "gm", + "_", + "c_gms", + "serialize-8888", + "gm", + "_", + "colortype", + "serialize-8888", + "gm", + "_", + "colortype_xfermodes", + "serialize-8888", + "gm", + "_", + "drawfilter", + "serialize-8888", + "gm", + "_", + "fontmgr_bounds_0.75_0", + "serialize-8888", + "gm", + "_", + "fontmgr_bounds_1_-0.25", + "serialize-8888", + "gm", + "_", + "fontmgr_bounds", + "serialize-8888", + "gm", + "_", + "fontmgr_match", + "serialize-8888", + "gm", + "_", + "fontmgr_iter", + "serialize-8888", + "gm", + "_", + "bitmapfilters", + "serialize-8888", + "gm", + "_", + "bitmapshaders", + "serialize-8888", + "gm", + "_", + "bleed", + "serialize-8888", + "gm", + "_", + "bleed_alpha_bmp", + "serialize-8888", + "gm", + "_", + "bleed_alpha_bmp_shader", + "serialize-8888", + "gm", + "_", + "convex_poly_clip", + "serialize-8888", + "gm", + "_", + "extractalpha", + "serialize-8888", + "gm", + "_", + "filterbitmap_checkerboard_32_32_g8", + "serialize-8888", + "gm", + "_", + "filterbitmap_image_mandrill_64", + "serialize-8888", + "gm", + "_", + "shadows", + "serialize-8888", + "gm", + "_", + "simpleaaclip_aaclip", + "serialize-8888", + "gm", + "_", + "composeshader_bitmap", + "serialize-8888", + "gm", + "_", + "scaled_tilemodes_npot", + "serialize-8888", + "gm", + "_", + "scaled_tilemodes", + "serialize-8888", + "gm", + "_", + "bleed_alpha_image", + "serialize-8888", + "gm", + "_", + "bleed_alpha_image_shader", + "sp-8888", + "gm", + "_", + "drawfilter", + "pic-8888", + "gm", + "_", + "drawfilter", + "2ndpic-8888", + "gm", + "_", + "drawfilter", + "sp-8888", + "gm", + "_", + "image-cacherator-from-picture", + "pic-8888", + "gm", + "_", + "image-cacherator-from-picture", + "2ndpic-8888", + "gm", + "_", + "image-cacherator-from-picture", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-picture", + "sp-8888", + "gm", + "_", + "image-cacherator-from-raster", + "pic-8888", + "gm", + "_", + "image-cacherator-from-raster", + "2ndpic-8888", + "gm", + "_", + "image-cacherator-from-raster", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-raster", + "sp-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "pic-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "2ndpic-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "_", + "image", + "_", + "interlaced1.png", + "_", + "image", + "_", + "interlaced2.png", + "_", + "image", + "_", + "interlaced3.png", + "_", + "image", + "_", + ".arw", + "_", + "image", + "_", + ".cr2", + "_", + "image", + "_", + ".dng", + "_", + "image", + "_", + ".nef", + "_", + "image", + "_", + ".nrw", + "_", + "image", + "_", + ".orf", + "_", + "image", + "_", + ".raf", + "_", + "image", + "_", + ".rw2", + "_", + "image", + "_", + ".pef", + "_", + "image", + "_", + ".srw", + "_", + "image", + "_", + ".ARW", + "_", + "image", + "_", + ".CR2", + "_", + "image", + "_", + ".DNG", + "_", + "image", + "_", + ".NEF", + "_", + "image", + "_", + ".NRW", + "_", + "image", + "_", + ".ORF", + "_", + "image", + "_", + ".RAF", + "_", + "image", + "_", + ".RW2", + "_", + "image", + "_", + ".PEF", + "_", + "image", + "_", + ".SRW", + "--match", + "~Threaded", "--preAbandonGpuContext" ], "env": { diff --git a/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json b/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json index a054f3409b..56b17714e8 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json @@ -3,50 +3,6 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]\\skia\\tools\\buildbot_spec.py", - "/path/to/tmp/json", - "Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot" - ], - "cwd": "[SLAVE_BUILD]\\skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"dm\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"arch\": \"x86_64\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"MSVC\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu\": \"CPU\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu_value\": \"AVX2\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"model\": \"ShuttleB\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Win8\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Test\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release_x64\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"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\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ - "python", - "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\skp\\VERSION", "/path/to/tmp/" @@ -244,7 +200,262 @@ "--writePath", "[CUSTOM_[SWARM_OUT_DIR]]\\dm", "--nogpu", - "--dummy-flags" + "--config", + "565", + "8888", + "gpu", + "gpusrgb", + "pdf", + "msaa16", + "serialize-8888", + "tiles_rt-8888", + "pic-8888", + "--src", + "tests", + "gm", + "image", + "--blacklist", + "f16", + "_", + "_", + "dstreadshuffle", + "f16", + "image", + "_", + "_", + "srgb", + "image", + "_", + "_", + "gpusrgb", + "image", + "_", + "_", + "_", + "image", + "gen_platf", + "rle8-height-negative.bmp", + "_", + "image", + "gen_platf", + "rle4-height-negative.bmp", + "_", + "image", + "gen_platf", + "pal8os2v2.bmp", + "_", + "image", + "gen_platf", + "pal8os2v2-16.bmp", + "_", + "image", + "gen_platf", + "rgba32abf.bmp", + "_", + "image", + "gen_platf", + "rgb24prof.bmp", + "_", + "image", + "gen_platf", + "rgb24lprof.bmp", + "_", + "image", + "gen_platf", + "8bpp-pixeldata-cropped.bmp", + "_", + "image", + "gen_platf", + "4bpp-pixeldata-cropped.bmp", + "_", + "image", + "gen_platf", + "32bpp-pixeldata-cropped.bmp", + "_", + "image", + "gen_platf", + "24bpp-pixeldata-cropped.bmp", + "_", + "gm", + "_", + "composeshader_bitmap", + "_", + "gm", + "_", + "fontscalerdistortable", + "serialize-8888", + "gm", + "_", + "bleed_image", + "serialize-8888", + "gm", + "_", + "c_gms", + "serialize-8888", + "gm", + "_", + "colortype", + "serialize-8888", + "gm", + "_", + "colortype_xfermodes", + "serialize-8888", + "gm", + "_", + "drawfilter", + "serialize-8888", + "gm", + "_", + "fontmgr_bounds_0.75_0", + "serialize-8888", + "gm", + "_", + "fontmgr_bounds_1_-0.25", + "serialize-8888", + "gm", + "_", + "fontmgr_bounds", + "serialize-8888", + "gm", + "_", + "fontmgr_match", + "serialize-8888", + "gm", + "_", + "fontmgr_iter", + "serialize-8888", + "gm", + "_", + "bitmapfilters", + "serialize-8888", + "gm", + "_", + "bitmapshaders", + "serialize-8888", + "gm", + "_", + "bleed", + "serialize-8888", + "gm", + "_", + "bleed_alpha_bmp", + "serialize-8888", + "gm", + "_", + "bleed_alpha_bmp_shader", + "serialize-8888", + "gm", + "_", + "convex_poly_clip", + "serialize-8888", + "gm", + "_", + "extractalpha", + "serialize-8888", + "gm", + "_", + "filterbitmap_checkerboard_32_32_g8", + "serialize-8888", + "gm", + "_", + "filterbitmap_image_mandrill_64", + "serialize-8888", + "gm", + "_", + "shadows", + "serialize-8888", + "gm", + "_", + "simpleaaclip_aaclip", + "serialize-8888", + "gm", + "_", + "composeshader_bitmap", + "serialize-8888", + "gm", + "_", + "scaled_tilemodes_npot", + "serialize-8888", + "gm", + "_", + "scaled_tilemodes", + "serialize-8888", + "gm", + "_", + "bleed_alpha_image", + "serialize-8888", + "gm", + "_", + "bleed_alpha_image_shader", + "serialize-8888", + "gm", + "_", + "verylargebitmap", + "serialize-8888", + "gm", + "_", + "verylarge_picture_image", + "sp-8888", + "gm", + "_", + "drawfilter", + "pic-8888", + "gm", + "_", + "drawfilter", + "2ndpic-8888", + "gm", + "_", + "drawfilter", + "sp-8888", + "gm", + "_", + "image-cacherator-from-picture", + "pic-8888", + "gm", + "_", + "image-cacherator-from-picture", + "2ndpic-8888", + "gm", + "_", + "image-cacherator-from-picture", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-picture", + "sp-8888", + "gm", + "_", + "image-cacherator-from-raster", + "pic-8888", + "gm", + "_", + "image-cacherator-from-raster", + "2ndpic-8888", + "gm", + "_", + "image-cacherator-from-raster", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-raster", + "sp-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "pic-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "2ndpic-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "--noRAW_threading" ], "env": { "BUILDTYPE": "Release_x64", diff --git a/infra/bots/recipes/swarm_test.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json index 49e7cfd8fd..b6737c6e90 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json +++ b/infra/bots/recipes/swarm_test.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json @@ -1,53 +1,6 @@ [ { "cmd": [ - "python", - "-u", - "[SLAVE_BUILD]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"iOSShell\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"arch\": \"Arm7\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"Clang\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu\": \"GPU\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu_value\": \"SGX554\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"model\": \"iPad4\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"iOS\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Test\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"device_cfg\": \"iPad4,1\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"CC\": \"/usr/bin/clang\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"CXX\": \"/usr/bin/clang++\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=0\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_install" ], "env": { @@ -525,7 +478,340 @@ "--writePath", "skiabot/skia_dm", "--nocpu", - "--dummy-flags" + "--config", + "565", + "8888", + "gpu", + "gpusrgb", + "pdf", + "serialize-8888", + "tiles_rt-8888", + "pic-8888", + "--src", + "tests", + "gm", + "image", + "--blacklist", + "f16", + "_", + "_", + "dstreadshuffle", + "f16", + "image", + "_", + "_", + "srgb", + "image", + "_", + "_", + "gpusrgb", + "image", + "_", + "_", + "gpu", + "skp", + "_", + "_", + "msaa", + "skp", + "_", + "_", + "msaa16", + "gm", + "_", + "tilemodesProcess", + "_", + "image", + "gen_platf", + "rgba32abf.bmp", + "_", + "image", + "gen_platf", + "rgb24prof.bmp", + "_", + "image", + "gen_platf", + "rgb24lprof.bmp", + "_", + "image", + "gen_platf", + "8bpp-pixeldata-cropped.bmp", + "_", + "image", + "gen_platf", + "4bpp-pixeldata-cropped.bmp", + "_", + "image", + "gen_platf", + "32bpp-pixeldata-cropped.bmp", + "_", + "image", + "gen_platf", + "24bpp-pixeldata-cropped.bmp", + "_", + "image", + "gen_platf", + "frame_larger_than_image.gif", + "_", + "test", + "_", + "GrShape", + "serialize-8888", + "gm", + "_", + "bleed_image", + "serialize-8888", + "gm", + "_", + "c_gms", + "serialize-8888", + "gm", + "_", + "colortype", + "serialize-8888", + "gm", + "_", + "colortype_xfermodes", + "serialize-8888", + "gm", + "_", + "drawfilter", + "serialize-8888", + "gm", + "_", + "fontmgr_bounds_0.75_0", + "serialize-8888", + "gm", + "_", + "fontmgr_bounds_1_-0.25", + "serialize-8888", + "gm", + "_", + "fontmgr_bounds", + "serialize-8888", + "gm", + "_", + "fontmgr_match", + "serialize-8888", + "gm", + "_", + "fontmgr_iter", + "serialize-8888", + "gm", + "_", + "bitmapfilters", + "serialize-8888", + "gm", + "_", + "bitmapshaders", + "serialize-8888", + "gm", + "_", + "bleed", + "serialize-8888", + "gm", + "_", + "bleed_alpha_bmp", + "serialize-8888", + "gm", + "_", + "bleed_alpha_bmp_shader", + "serialize-8888", + "gm", + "_", + "convex_poly_clip", + "serialize-8888", + "gm", + "_", + "extractalpha", + "serialize-8888", + "gm", + "_", + "filterbitmap_checkerboard_32_32_g8", + "serialize-8888", + "gm", + "_", + "filterbitmap_image_mandrill_64", + "serialize-8888", + "gm", + "_", + "shadows", + "serialize-8888", + "gm", + "_", + "simpleaaclip_aaclip", + "serialize-8888", + "gm", + "_", + "composeshader_bitmap", + "serialize-8888", + "gm", + "_", + "scaled_tilemodes_npot", + "serialize-8888", + "gm", + "_", + "scaled_tilemodes", + "serialize-8888", + "gm", + "_", + "bleed_alpha_image", + "serialize-8888", + "gm", + "_", + "bleed_alpha_image_shader", + "sp-8888", + "gm", + "_", + "drawfilter", + "pic-8888", + "gm", + "_", + "drawfilter", + "2ndpic-8888", + "gm", + "_", + "drawfilter", + "sp-8888", + "gm", + "_", + "image-cacherator-from-picture", + "pic-8888", + "gm", + "_", + "image-cacherator-from-picture", + "2ndpic-8888", + "gm", + "_", + "image-cacherator-from-picture", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-picture", + "sp-8888", + "gm", + "_", + "image-cacherator-from-raster", + "pic-8888", + "gm", + "_", + "image-cacherator-from-raster", + "2ndpic-8888", + "gm", + "_", + "image-cacherator-from-raster", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-raster", + "sp-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "pic-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "2ndpic-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "_", + "image", + "_", + "interlaced1.png", + "_", + "image", + "_", + "interlaced2.png", + "_", + "image", + "_", + "interlaced3.png", + "_", + "image", + "_", + ".arw", + "_", + "image", + "_", + ".cr2", + "_", + "image", + "_", + ".dng", + "_", + "image", + "_", + ".nef", + "_", + "image", + "_", + ".nrw", + "_", + "image", + "_", + ".orf", + "_", + "image", + "_", + ".raf", + "_", + "image", + "_", + ".rw2", + "_", + "image", + "_", + ".pef", + "_", + "image", + "_", + ".srw", + "_", + "image", + "_", + ".ARW", + "_", + "image", + "_", + ".CR2", + "_", + "image", + "_", + ".DNG", + "_", + "image", + "_", + ".NEF", + "_", + "image", + "_", + ".NRW", + "_", + "image", + "_", + ".ORF", + "_", + "image", + "_", + ".RAF", + "_", + "image", + "_", + ".RW2", + "_", + "image", + "_", + ".PEF", + "_", + "image", + "_", + ".SRW" ], "env": { "BUILDTYPE": "Debug", diff --git a/infra/bots/recipes/swarm_test.expected/adb_in_path.json b/infra/bots/recipes/swarm_test.expected/adb_in_path.json index b6d025657d..29bc01d03c 100644 --- a/infra/bots/recipes/swarm_test.expected/adb_in_path.json +++ b/infra/bots/recipes/swarm_test.expected/adb_in_path.json @@ -1,52 +1,6 @@ [ { "cmd": [ - "python", - "-u", - "[SLAVE_BUILD]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"dm\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"arch\": \"Arm7\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"GCC\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu\": \"GPU\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu_value\": \"Tegra3\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"model\": \"Nexus7\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Android\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Test\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"device_cfg\": \"arm_v7_neon\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=arm skia_warnings_as_errors=0\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"product.board\": \"grouper\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ "which", "adb" ], @@ -555,7 +509,303 @@ "--writePath", "/storage/emulated/legacy/skiabot/skia_dm", "--nocpu", - "--dummy-flags" + "--config", + "565", + "8888", + "gpu", + "gpusrgb", + "serialize-8888", + "tiles_rt-8888", + "pic-8888", + "--src", + "tests", + "gm", + "image", + "--blacklist", + "f16", + "_", + "_", + "dstreadshuffle", + "f16", + "image", + "_", + "_", + "srgb", + "image", + "_", + "_", + "gpusrgb", + "image", + "_", + "_", + "_", + "test", + "_", + "GrShape", + "serialize-8888", + "gm", + "_", + "bleed_image", + "serialize-8888", + "gm", + "_", + "c_gms", + "serialize-8888", + "gm", + "_", + "colortype", + "serialize-8888", + "gm", + "_", + "colortype_xfermodes", + "serialize-8888", + "gm", + "_", + "drawfilter", + "serialize-8888", + "gm", + "_", + "fontmgr_bounds_0.75_0", + "serialize-8888", + "gm", + "_", + "fontmgr_bounds_1_-0.25", + "serialize-8888", + "gm", + "_", + "fontmgr_bounds", + "serialize-8888", + "gm", + "_", + "fontmgr_match", + "serialize-8888", + "gm", + "_", + "fontmgr_iter", + "serialize-8888", + "gm", + "_", + "bitmapfilters", + "serialize-8888", + "gm", + "_", + "bitmapshaders", + "serialize-8888", + "gm", + "_", + "bleed", + "serialize-8888", + "gm", + "_", + "bleed_alpha_bmp", + "serialize-8888", + "gm", + "_", + "bleed_alpha_bmp_shader", + "serialize-8888", + "gm", + "_", + "convex_poly_clip", + "serialize-8888", + "gm", + "_", + "extractalpha", + "serialize-8888", + "gm", + "_", + "filterbitmap_checkerboard_32_32_g8", + "serialize-8888", + "gm", + "_", + "filterbitmap_image_mandrill_64", + "serialize-8888", + "gm", + "_", + "shadows", + "serialize-8888", + "gm", + "_", + "simpleaaclip_aaclip", + "serialize-8888", + "gm", + "_", + "composeshader_bitmap", + "serialize-8888", + "gm", + "_", + "scaled_tilemodes_npot", + "serialize-8888", + "gm", + "_", + "scaled_tilemodes", + "serialize-8888", + "gm", + "_", + "bleed_alpha_image", + "serialize-8888", + "gm", + "_", + "bleed_alpha_image_shader", + "serialize-8888", + "gm", + "_", + "verylargebitmap", + "serialize-8888", + "gm", + "_", + "verylarge_picture_image", + "sp-8888", + "gm", + "_", + "drawfilter", + "pic-8888", + "gm", + "_", + "drawfilter", + "2ndpic-8888", + "gm", + "_", + "drawfilter", + "sp-8888", + "gm", + "_", + "image-cacherator-from-picture", + "pic-8888", + "gm", + "_", + "image-cacherator-from-picture", + "2ndpic-8888", + "gm", + "_", + "image-cacherator-from-picture", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-picture", + "sp-8888", + "gm", + "_", + "image-cacherator-from-raster", + "pic-8888", + "gm", + "_", + "image-cacherator-from-raster", + "2ndpic-8888", + "gm", + "_", + "image-cacherator-from-raster", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-raster", + "sp-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "pic-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "2ndpic-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "_", + "image", + "_", + "interlaced1.png", + "_", + "image", + "_", + "interlaced2.png", + "_", + "image", + "_", + "interlaced3.png", + "_", + "image", + "_", + ".arw", + "_", + "image", + "_", + ".cr2", + "_", + "image", + "_", + ".dng", + "_", + "image", + "_", + ".nef", + "_", + "image", + "_", + ".nrw", + "_", + "image", + "_", + ".orf", + "_", + "image", + "_", + ".raf", + "_", + "image", + "_", + ".rw2", + "_", + "image", + "_", + ".pef", + "_", + "image", + "_", + ".srw", + "_", + "image", + "_", + ".ARW", + "_", + "image", + "_", + ".CR2", + "_", + "image", + "_", + ".DNG", + "_", + "image", + "_", + ".NEF", + "_", + "image", + "_", + ".NRW", + "_", + "image", + "_", + ".ORF", + "_", + "image", + "_", + ".RAF", + "_", + "image", + "_", + ".RW2", + "_", + "image", + "_", + ".PEF", + "_", + "image", + "_", + ".SRW" ], "env": { "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk", diff --git a/infra/bots/recipes/swarm_test.expected/big_issue_number.json b/infra/bots/recipes/swarm_test.expected/big_issue_number.json index 3a6e7feb24..d972c8c76c 100644 --- a/infra/bots/recipes/swarm_test.expected/big_issue_number.json +++ b/infra/bots/recipes/swarm_test.expected/big_issue_number.json @@ -3,50 +3,6 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]\\skia\\tools\\buildbot_spec.py", - "/path/to/tmp/json", - "Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot" - ], - "cwd": "[SLAVE_BUILD]\\skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"dm\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"arch\": \"x86_64\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"MSVC\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu\": \"CPU\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu_value\": \"AVX2\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"model\": \"ShuttleB\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Win8\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Test\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release_x64\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"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\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ - "python", - "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "[SLAVE_BUILD]\\skia\\infra\\bots\\assets\\skp\\VERSION", "/path/to/tmp/" @@ -244,7 +200,262 @@ "--writePath", "[CUSTOM_[SWARM_OUT_DIR]]\\dm", "--nogpu", - "--dummy-flags" + "--config", + "565", + "8888", + "gpu", + "gpusrgb", + "pdf", + "msaa16", + "serialize-8888", + "tiles_rt-8888", + "pic-8888", + "--src", + "tests", + "gm", + "image", + "--blacklist", + "f16", + "_", + "_", + "dstreadshuffle", + "f16", + "image", + "_", + "_", + "srgb", + "image", + "_", + "_", + "gpusrgb", + "image", + "_", + "_", + "_", + "image", + "gen_platf", + "rle8-height-negative.bmp", + "_", + "image", + "gen_platf", + "rle4-height-negative.bmp", + "_", + "image", + "gen_platf", + "pal8os2v2.bmp", + "_", + "image", + "gen_platf", + "pal8os2v2-16.bmp", + "_", + "image", + "gen_platf", + "rgba32abf.bmp", + "_", + "image", + "gen_platf", + "rgb24prof.bmp", + "_", + "image", + "gen_platf", + "rgb24lprof.bmp", + "_", + "image", + "gen_platf", + "8bpp-pixeldata-cropped.bmp", + "_", + "image", + "gen_platf", + "4bpp-pixeldata-cropped.bmp", + "_", + "image", + "gen_platf", + "32bpp-pixeldata-cropped.bmp", + "_", + "image", + "gen_platf", + "24bpp-pixeldata-cropped.bmp", + "_", + "gm", + "_", + "composeshader_bitmap", + "_", + "gm", + "_", + "fontscalerdistortable", + "serialize-8888", + "gm", + "_", + "bleed_image", + "serialize-8888", + "gm", + "_", + "c_gms", + "serialize-8888", + "gm", + "_", + "colortype", + "serialize-8888", + "gm", + "_", + "colortype_xfermodes", + "serialize-8888", + "gm", + "_", + "drawfilter", + "serialize-8888", + "gm", + "_", + "fontmgr_bounds_0.75_0", + "serialize-8888", + "gm", + "_", + "fontmgr_bounds_1_-0.25", + "serialize-8888", + "gm", + "_", + "fontmgr_bounds", + "serialize-8888", + "gm", + "_", + "fontmgr_match", + "serialize-8888", + "gm", + "_", + "fontmgr_iter", + "serialize-8888", + "gm", + "_", + "bitmapfilters", + "serialize-8888", + "gm", + "_", + "bitmapshaders", + "serialize-8888", + "gm", + "_", + "bleed", + "serialize-8888", + "gm", + "_", + "bleed_alpha_bmp", + "serialize-8888", + "gm", + "_", + "bleed_alpha_bmp_shader", + "serialize-8888", + "gm", + "_", + "convex_poly_clip", + "serialize-8888", + "gm", + "_", + "extractalpha", + "serialize-8888", + "gm", + "_", + "filterbitmap_checkerboard_32_32_g8", + "serialize-8888", + "gm", + "_", + "filterbitmap_image_mandrill_64", + "serialize-8888", + "gm", + "_", + "shadows", + "serialize-8888", + "gm", + "_", + "simpleaaclip_aaclip", + "serialize-8888", + "gm", + "_", + "composeshader_bitmap", + "serialize-8888", + "gm", + "_", + "scaled_tilemodes_npot", + "serialize-8888", + "gm", + "_", + "scaled_tilemodes", + "serialize-8888", + "gm", + "_", + "bleed_alpha_image", + "serialize-8888", + "gm", + "_", + "bleed_alpha_image_shader", + "serialize-8888", + "gm", + "_", + "verylargebitmap", + "serialize-8888", + "gm", + "_", + "verylarge_picture_image", + "sp-8888", + "gm", + "_", + "drawfilter", + "pic-8888", + "gm", + "_", + "drawfilter", + "2ndpic-8888", + "gm", + "_", + "drawfilter", + "sp-8888", + "gm", + "_", + "image-cacherator-from-picture", + "pic-8888", + "gm", + "_", + "image-cacherator-from-picture", + "2ndpic-8888", + "gm", + "_", + "image-cacherator-from-picture", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-picture", + "sp-8888", + "gm", + "_", + "image-cacherator-from-raster", + "pic-8888", + "gm", + "_", + "image-cacherator-from-raster", + "2ndpic-8888", + "gm", + "_", + "image-cacherator-from-raster", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-raster", + "sp-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "pic-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "2ndpic-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "--noRAW_threading" ], "env": { "BUILDTYPE": "Release_x64", diff --git a/infra/bots/recipes/swarm_test.expected/download_and_push_skimage.json b/infra/bots/recipes/swarm_test.expected/download_and_push_skimage.json index 232cb0b336..a92427dd0d 100644 --- a/infra/bots/recipes/swarm_test.expected/download_and_push_skimage.json +++ b/infra/bots/recipes/swarm_test.expected/download_and_push_skimage.json @@ -1,52 +1,6 @@ [ { "cmd": [ - "python", - "-u", - "[SLAVE_BUILD]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"dm\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"arch\": \"Arm7\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"GCC\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu\": \"GPU\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu_value\": \"Tegra3\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"model\": \"Nexus7\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Android\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Test\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"device_cfg\": \"arm_v7_neon\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=arm skia_warnings_as_errors=0\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"product.board\": \"grouper\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ "which", "adb" ], @@ -663,7 +617,303 @@ "--writePath", "/storage/emulated/legacy/skiabot/skia_dm", "--nocpu", - "--dummy-flags" + "--config", + "565", + "8888", + "gpu", + "gpusrgb", + "serialize-8888", + "tiles_rt-8888", + "pic-8888", + "--src", + "tests", + "gm", + "image", + "--blacklist", + "f16", + "_", + "_", + "dstreadshuffle", + "f16", + "image", + "_", + "_", + "srgb", + "image", + "_", + "_", + "gpusrgb", + "image", + "_", + "_", + "_", + "test", + "_", + "GrShape", + "serialize-8888", + "gm", + "_", + "bleed_image", + "serialize-8888", + "gm", + "_", + "c_gms", + "serialize-8888", + "gm", + "_", + "colortype", + "serialize-8888", + "gm", + "_", + "colortype_xfermodes", + "serialize-8888", + "gm", + "_", + "drawfilter", + "serialize-8888", + "gm", + "_", + "fontmgr_bounds_0.75_0", + "serialize-8888", + "gm", + "_", + "fontmgr_bounds_1_-0.25", + "serialize-8888", + "gm", + "_", + "fontmgr_bounds", + "serialize-8888", + "gm", + "_", + "fontmgr_match", + "serialize-8888", + "gm", + "_", + "fontmgr_iter", + "serialize-8888", + "gm", + "_", + "bitmapfilters", + "serialize-8888", + "gm", + "_", + "bitmapshaders", + "serialize-8888", + "gm", + "_", + "bleed", + "serialize-8888", + "gm", + "_", + "bleed_alpha_bmp", + "serialize-8888", + "gm", + "_", + "bleed_alpha_bmp_shader", + "serialize-8888", + "gm", + "_", + "convex_poly_clip", + "serialize-8888", + "gm", + "_", + "extractalpha", + "serialize-8888", + "gm", + "_", + "filterbitmap_checkerboard_32_32_g8", + "serialize-8888", + "gm", + "_", + "filterbitmap_image_mandrill_64", + "serialize-8888", + "gm", + "_", + "shadows", + "serialize-8888", + "gm", + "_", + "simpleaaclip_aaclip", + "serialize-8888", + "gm", + "_", + "composeshader_bitmap", + "serialize-8888", + "gm", + "_", + "scaled_tilemodes_npot", + "serialize-8888", + "gm", + "_", + "scaled_tilemodes", + "serialize-8888", + "gm", + "_", + "bleed_alpha_image", + "serialize-8888", + "gm", + "_", + "bleed_alpha_image_shader", + "serialize-8888", + "gm", + "_", + "verylargebitmap", + "serialize-8888", + "gm", + "_", + "verylarge_picture_image", + "sp-8888", + "gm", + "_", + "drawfilter", + "pic-8888", + "gm", + "_", + "drawfilter", + "2ndpic-8888", + "gm", + "_", + "drawfilter", + "sp-8888", + "gm", + "_", + "image-cacherator-from-picture", + "pic-8888", + "gm", + "_", + "image-cacherator-from-picture", + "2ndpic-8888", + "gm", + "_", + "image-cacherator-from-picture", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-picture", + "sp-8888", + "gm", + "_", + "image-cacherator-from-raster", + "pic-8888", + "gm", + "_", + "image-cacherator-from-raster", + "2ndpic-8888", + "gm", + "_", + "image-cacherator-from-raster", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-raster", + "sp-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "pic-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "2ndpic-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "_", + "image", + "_", + "interlaced1.png", + "_", + "image", + "_", + "interlaced2.png", + "_", + "image", + "_", + "interlaced3.png", + "_", + "image", + "_", + ".arw", + "_", + "image", + "_", + ".cr2", + "_", + "image", + "_", + ".dng", + "_", + "image", + "_", + ".nef", + "_", + "image", + "_", + ".nrw", + "_", + "image", + "_", + ".orf", + "_", + "image", + "_", + ".raf", + "_", + "image", + "_", + ".rw2", + "_", + "image", + "_", + ".pef", + "_", + "image", + "_", + ".srw", + "_", + "image", + "_", + ".ARW", + "_", + "image", + "_", + ".CR2", + "_", + "image", + "_", + ".DNG", + "_", + "image", + "_", + ".NEF", + "_", + "image", + "_", + ".NRW", + "_", + "image", + "_", + ".ORF", + "_", + "image", + "_", + ".RAF", + "_", + "image", + "_", + ".RW2", + "_", + "image", + "_", + ".PEF", + "_", + "image", + "_", + ".SRW" ], "env": { "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk", diff --git a/infra/bots/recipes/swarm_test.expected/download_and_push_skps.json b/infra/bots/recipes/swarm_test.expected/download_and_push_skps.json index e3275c5df2..60c0186a29 100644 --- a/infra/bots/recipes/swarm_test.expected/download_and_push_skps.json +++ b/infra/bots/recipes/swarm_test.expected/download_and_push_skps.json @@ -1,52 +1,6 @@ [ { "cmd": [ - "python", - "-u", - "[SLAVE_BUILD]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"dm\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"arch\": \"Arm7\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"GCC\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu\": \"GPU\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu_value\": \"Tegra3\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"model\": \"Nexus7\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Android\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Test\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"device_cfg\": \"arm_v7_neon\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=arm skia_warnings_as_errors=0\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"product.board\": \"grouper\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ "which", "adb" ], @@ -663,7 +617,303 @@ "--writePath", "/storage/emulated/legacy/skiabot/skia_dm", "--nocpu", - "--dummy-flags" + "--config", + "565", + "8888", + "gpu", + "gpusrgb", + "serialize-8888", + "tiles_rt-8888", + "pic-8888", + "--src", + "tests", + "gm", + "image", + "--blacklist", + "f16", + "_", + "_", + "dstreadshuffle", + "f16", + "image", + "_", + "_", + "srgb", + "image", + "_", + "_", + "gpusrgb", + "image", + "_", + "_", + "_", + "test", + "_", + "GrShape", + "serialize-8888", + "gm", + "_", + "bleed_image", + "serialize-8888", + "gm", + "_", + "c_gms", + "serialize-8888", + "gm", + "_", + "colortype", + "serialize-8888", + "gm", + "_", + "colortype_xfermodes", + "serialize-8888", + "gm", + "_", + "drawfilter", + "serialize-8888", + "gm", + "_", + "fontmgr_bounds_0.75_0", + "serialize-8888", + "gm", + "_", + "fontmgr_bounds_1_-0.25", + "serialize-8888", + "gm", + "_", + "fontmgr_bounds", + "serialize-8888", + "gm", + "_", + "fontmgr_match", + "serialize-8888", + "gm", + "_", + "fontmgr_iter", + "serialize-8888", + "gm", + "_", + "bitmapfilters", + "serialize-8888", + "gm", + "_", + "bitmapshaders", + "serialize-8888", + "gm", + "_", + "bleed", + "serialize-8888", + "gm", + "_", + "bleed_alpha_bmp", + "serialize-8888", + "gm", + "_", + "bleed_alpha_bmp_shader", + "serialize-8888", + "gm", + "_", + "convex_poly_clip", + "serialize-8888", + "gm", + "_", + "extractalpha", + "serialize-8888", + "gm", + "_", + "filterbitmap_checkerboard_32_32_g8", + "serialize-8888", + "gm", + "_", + "filterbitmap_image_mandrill_64", + "serialize-8888", + "gm", + "_", + "shadows", + "serialize-8888", + "gm", + "_", + "simpleaaclip_aaclip", + "serialize-8888", + "gm", + "_", + "composeshader_bitmap", + "serialize-8888", + "gm", + "_", + "scaled_tilemodes_npot", + "serialize-8888", + "gm", + "_", + "scaled_tilemodes", + "serialize-8888", + "gm", + "_", + "bleed_alpha_image", + "serialize-8888", + "gm", + "_", + "bleed_alpha_image_shader", + "serialize-8888", + "gm", + "_", + "verylargebitmap", + "serialize-8888", + "gm", + "_", + "verylarge_picture_image", + "sp-8888", + "gm", + "_", + "drawfilter", + "pic-8888", + "gm", + "_", + "drawfilter", + "2ndpic-8888", + "gm", + "_", + "drawfilter", + "sp-8888", + "gm", + "_", + "image-cacherator-from-picture", + "pic-8888", + "gm", + "_", + "image-cacherator-from-picture", + "2ndpic-8888", + "gm", + "_", + "image-cacherator-from-picture", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-picture", + "sp-8888", + "gm", + "_", + "image-cacherator-from-raster", + "pic-8888", + "gm", + "_", + "image-cacherator-from-raster", + "2ndpic-8888", + "gm", + "_", + "image-cacherator-from-raster", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-raster", + "sp-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "pic-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "2ndpic-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "_", + "image", + "_", + "interlaced1.png", + "_", + "image", + "_", + "interlaced2.png", + "_", + "image", + "_", + "interlaced3.png", + "_", + "image", + "_", + ".arw", + "_", + "image", + "_", + ".cr2", + "_", + "image", + "_", + ".dng", + "_", + "image", + "_", + ".nef", + "_", + "image", + "_", + ".nrw", + "_", + "image", + "_", + ".orf", + "_", + "image", + "_", + ".raf", + "_", + "image", + "_", + ".rw2", + "_", + "image", + "_", + ".pef", + "_", + "image", + "_", + ".srw", + "_", + "image", + "_", + ".ARW", + "_", + "image", + "_", + ".CR2", + "_", + "image", + "_", + ".DNG", + "_", + "image", + "_", + ".NEF", + "_", + "image", + "_", + ".NRW", + "_", + "image", + "_", + ".ORF", + "_", + "image", + "_", + ".RAF", + "_", + "image", + "_", + ".RW2", + "_", + "image", + "_", + ".PEF", + "_", + "image", + "_", + ".SRW" ], "env": { "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk", diff --git a/infra/bots/recipes/swarm_test.expected/failed_dm.json b/infra/bots/recipes/swarm_test.expected/failed_dm.json index ec2a4ca678..f6beecf627 100644 --- a/infra/bots/recipes/swarm_test.expected/failed_dm.json +++ b/infra/bots/recipes/swarm_test.expected/failed_dm.json @@ -3,50 +3,6 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"dm\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"arch\": \"x86_64\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"GCC\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu\": \"CPU\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu_value\": \"AVX2\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"model\": \"GCE\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Ubuntu\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Test\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ - "python", - "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" @@ -241,7 +197,205 @@ "--writePath", "[CUSTOM_[SWARM_OUT_DIR]]/dm", "--nogpu", - "--dummy-flags" + "--config", + "565", + "8888", + "gpu", + "gpusrgb", + "pdf", + "msaa16", + "f16", + "srgb", + "sp-8888", + "2ndpic-8888", + "serialize-8888", + "tiles_rt-8888", + "pic-8888", + "--src", + "tests", + "gm", + "image", + "--blacklist", + "f16", + "_", + "_", + "dstreadshuffle", + "f16", + "image", + "_", + "_", + "srgb", + "image", + "_", + "_", + "gpusrgb", + "image", + "_", + "_", + "serialize-8888", + "gm", + "_", + "bleed_image", + "serialize-8888", + "gm", + "_", + "c_gms", + "serialize-8888", + "gm", + "_", + "colortype", + "serialize-8888", + "gm", + "_", + "colortype_xfermodes", + "serialize-8888", + "gm", + "_", + "drawfilter", + "serialize-8888", + "gm", + "_", + "fontmgr_bounds_0.75_0", + "serialize-8888", + "gm", + "_", + "fontmgr_bounds_1_-0.25", + "serialize-8888", + "gm", + "_", + "fontmgr_bounds", + "serialize-8888", + "gm", + "_", + "fontmgr_match", + "serialize-8888", + "gm", + "_", + "fontmgr_iter", + "serialize-8888", + "gm", + "_", + "bitmapfilters", + "serialize-8888", + "gm", + "_", + "bitmapshaders", + "serialize-8888", + "gm", + "_", + "bleed", + "serialize-8888", + "gm", + "_", + "bleed_alpha_bmp", + "serialize-8888", + "gm", + "_", + "bleed_alpha_bmp_shader", + "serialize-8888", + "gm", + "_", + "convex_poly_clip", + "serialize-8888", + "gm", + "_", + "extractalpha", + "serialize-8888", + "gm", + "_", + "filterbitmap_checkerboard_32_32_g8", + "serialize-8888", + "gm", + "_", + "filterbitmap_image_mandrill_64", + "serialize-8888", + "gm", + "_", + "shadows", + "serialize-8888", + "gm", + "_", + "simpleaaclip_aaclip", + "serialize-8888", + "gm", + "_", + "composeshader_bitmap", + "serialize-8888", + "gm", + "_", + "scaled_tilemodes_npot", + "serialize-8888", + "gm", + "_", + "scaled_tilemodes", + "serialize-8888", + "gm", + "_", + "bleed_alpha_image", + "serialize-8888", + "gm", + "_", + "bleed_alpha_image_shader", + "sp-8888", + "gm", + "_", + "drawfilter", + "pic-8888", + "gm", + "_", + "drawfilter", + "2ndpic-8888", + "gm", + "_", + "drawfilter", + "sp-8888", + "gm", + "_", + "image-cacherator-from-picture", + "pic-8888", + "gm", + "_", + "image-cacherator-from-picture", + "2ndpic-8888", + "gm", + "_", + "image-cacherator-from-picture", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-picture", + "sp-8888", + "gm", + "_", + "image-cacherator-from-raster", + "pic-8888", + "gm", + "_", + "image-cacherator-from-raster", + "2ndpic-8888", + "gm", + "_", + "image-cacherator-from-raster", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-raster", + "sp-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "pic-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "2ndpic-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-ctable" ], "env": { "BUILDTYPE": "Debug", diff --git a/infra/bots/recipes/swarm_test.expected/failed_get_hashes.json b/infra/bots/recipes/swarm_test.expected/failed_get_hashes.json index 25fff5c26a..0d8d65b489 100644 --- a/infra/bots/recipes/swarm_test.expected/failed_get_hashes.json +++ b/infra/bots/recipes/swarm_test.expected/failed_get_hashes.json @@ -1,52 +1,6 @@ [ { "cmd": [ - "python", - "-u", - "[SLAVE_BUILD]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"dm\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"arch\": \"Arm7\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"GCC\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu\": \"GPU\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu_value\": \"Tegra3\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"model\": \"Nexus7\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Android\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Test\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"device_cfg\": \"arm_v7_neon\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=arm skia_warnings_as_errors=0\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"product.board\": \"grouper\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ "which", "adb" ], @@ -561,7 +515,303 @@ "--writePath", "/storage/emulated/legacy/skiabot/skia_dm", "--nocpu", - "--dummy-flags" + "--config", + "565", + "8888", + "gpu", + "gpusrgb", + "serialize-8888", + "tiles_rt-8888", + "pic-8888", + "--src", + "tests", + "gm", + "image", + "--blacklist", + "f16", + "_", + "_", + "dstreadshuffle", + "f16", + "image", + "_", + "_", + "srgb", + "image", + "_", + "_", + "gpusrgb", + "image", + "_", + "_", + "_", + "test", + "_", + "GrShape", + "serialize-8888", + "gm", + "_", + "bleed_image", + "serialize-8888", + "gm", + "_", + "c_gms", + "serialize-8888", + "gm", + "_", + "colortype", + "serialize-8888", + "gm", + "_", + "colortype_xfermodes", + "serialize-8888", + "gm", + "_", + "drawfilter", + "serialize-8888", + "gm", + "_", + "fontmgr_bounds_0.75_0", + "serialize-8888", + "gm", + "_", + "fontmgr_bounds_1_-0.25", + "serialize-8888", + "gm", + "_", + "fontmgr_bounds", + "serialize-8888", + "gm", + "_", + "fontmgr_match", + "serialize-8888", + "gm", + "_", + "fontmgr_iter", + "serialize-8888", + "gm", + "_", + "bitmapfilters", + "serialize-8888", + "gm", + "_", + "bitmapshaders", + "serialize-8888", + "gm", + "_", + "bleed", + "serialize-8888", + "gm", + "_", + "bleed_alpha_bmp", + "serialize-8888", + "gm", + "_", + "bleed_alpha_bmp_shader", + "serialize-8888", + "gm", + "_", + "convex_poly_clip", + "serialize-8888", + "gm", + "_", + "extractalpha", + "serialize-8888", + "gm", + "_", + "filterbitmap_checkerboard_32_32_g8", + "serialize-8888", + "gm", + "_", + "filterbitmap_image_mandrill_64", + "serialize-8888", + "gm", + "_", + "shadows", + "serialize-8888", + "gm", + "_", + "simpleaaclip_aaclip", + "serialize-8888", + "gm", + "_", + "composeshader_bitmap", + "serialize-8888", + "gm", + "_", + "scaled_tilemodes_npot", + "serialize-8888", + "gm", + "_", + "scaled_tilemodes", + "serialize-8888", + "gm", + "_", + "bleed_alpha_image", + "serialize-8888", + "gm", + "_", + "bleed_alpha_image_shader", + "serialize-8888", + "gm", + "_", + "verylargebitmap", + "serialize-8888", + "gm", + "_", + "verylarge_picture_image", + "sp-8888", + "gm", + "_", + "drawfilter", + "pic-8888", + "gm", + "_", + "drawfilter", + "2ndpic-8888", + "gm", + "_", + "drawfilter", + "sp-8888", + "gm", + "_", + "image-cacherator-from-picture", + "pic-8888", + "gm", + "_", + "image-cacherator-from-picture", + "2ndpic-8888", + "gm", + "_", + "image-cacherator-from-picture", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-picture", + "sp-8888", + "gm", + "_", + "image-cacherator-from-raster", + "pic-8888", + "gm", + "_", + "image-cacherator-from-raster", + "2ndpic-8888", + "gm", + "_", + "image-cacherator-from-raster", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-raster", + "sp-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "pic-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "2ndpic-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "_", + "image", + "_", + "interlaced1.png", + "_", + "image", + "_", + "interlaced2.png", + "_", + "image", + "_", + "interlaced3.png", + "_", + "image", + "_", + ".arw", + "_", + "image", + "_", + ".cr2", + "_", + "image", + "_", + ".dng", + "_", + "image", + "_", + ".nef", + "_", + "image", + "_", + ".nrw", + "_", + "image", + "_", + ".orf", + "_", + "image", + "_", + ".raf", + "_", + "image", + "_", + ".rw2", + "_", + "image", + "_", + ".pef", + "_", + "image", + "_", + ".srw", + "_", + "image", + "_", + ".ARW", + "_", + "image", + "_", + ".CR2", + "_", + "image", + "_", + ".DNG", + "_", + "image", + "_", + ".NEF", + "_", + "image", + "_", + ".NRW", + "_", + "image", + "_", + ".ORF", + "_", + "image", + "_", + ".RAF", + "_", + "image", + "_", + ".RW2", + "_", + "image", + "_", + ".PEF", + "_", + "image", + "_", + ".SRW" ], "env": { "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk", diff --git a/infra/bots/recipes/swarm_test.expected/missing_SKP_VERSION_device.json b/infra/bots/recipes/swarm_test.expected/missing_SKP_VERSION_device.json index 7ae85b3f46..f5152326ba 100644 --- a/infra/bots/recipes/swarm_test.expected/missing_SKP_VERSION_device.json +++ b/infra/bots/recipes/swarm_test.expected/missing_SKP_VERSION_device.json @@ -1,52 +1,6 @@ [ { "cmd": [ - "python", - "-u", - "[SLAVE_BUILD]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"dm\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"arch\": \"Arm7\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"GCC\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu\": \"GPU\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu_value\": \"Tegra3\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"model\": \"Nexus7\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Android\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Test\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"device_cfg\": \"arm_v7_neon\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=arm skia_warnings_as_errors=0\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"product.board\": \"grouper\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ "which", "adb" ], @@ -667,7 +621,303 @@ "--writePath", "/storage/emulated/legacy/skiabot/skia_dm", "--nocpu", - "--dummy-flags" + "--config", + "565", + "8888", + "gpu", + "gpusrgb", + "serialize-8888", + "tiles_rt-8888", + "pic-8888", + "--src", + "tests", + "gm", + "image", + "--blacklist", + "f16", + "_", + "_", + "dstreadshuffle", + "f16", + "image", + "_", + "_", + "srgb", + "image", + "_", + "_", + "gpusrgb", + "image", + "_", + "_", + "_", + "test", + "_", + "GrShape", + "serialize-8888", + "gm", + "_", + "bleed_image", + "serialize-8888", + "gm", + "_", + "c_gms", + "serialize-8888", + "gm", + "_", + "colortype", + "serialize-8888", + "gm", + "_", + "colortype_xfermodes", + "serialize-8888", + "gm", + "_", + "drawfilter", + "serialize-8888", + "gm", + "_", + "fontmgr_bounds_0.75_0", + "serialize-8888", + "gm", + "_", + "fontmgr_bounds_1_-0.25", + "serialize-8888", + "gm", + "_", + "fontmgr_bounds", + "serialize-8888", + "gm", + "_", + "fontmgr_match", + "serialize-8888", + "gm", + "_", + "fontmgr_iter", + "serialize-8888", + "gm", + "_", + "bitmapfilters", + "serialize-8888", + "gm", + "_", + "bitmapshaders", + "serialize-8888", + "gm", + "_", + "bleed", + "serialize-8888", + "gm", + "_", + "bleed_alpha_bmp", + "serialize-8888", + "gm", + "_", + "bleed_alpha_bmp_shader", + "serialize-8888", + "gm", + "_", + "convex_poly_clip", + "serialize-8888", + "gm", + "_", + "extractalpha", + "serialize-8888", + "gm", + "_", + "filterbitmap_checkerboard_32_32_g8", + "serialize-8888", + "gm", + "_", + "filterbitmap_image_mandrill_64", + "serialize-8888", + "gm", + "_", + "shadows", + "serialize-8888", + "gm", + "_", + "simpleaaclip_aaclip", + "serialize-8888", + "gm", + "_", + "composeshader_bitmap", + "serialize-8888", + "gm", + "_", + "scaled_tilemodes_npot", + "serialize-8888", + "gm", + "_", + "scaled_tilemodes", + "serialize-8888", + "gm", + "_", + "bleed_alpha_image", + "serialize-8888", + "gm", + "_", + "bleed_alpha_image_shader", + "serialize-8888", + "gm", + "_", + "verylargebitmap", + "serialize-8888", + "gm", + "_", + "verylarge_picture_image", + "sp-8888", + "gm", + "_", + "drawfilter", + "pic-8888", + "gm", + "_", + "drawfilter", + "2ndpic-8888", + "gm", + "_", + "drawfilter", + "sp-8888", + "gm", + "_", + "image-cacherator-from-picture", + "pic-8888", + "gm", + "_", + "image-cacherator-from-picture", + "2ndpic-8888", + "gm", + "_", + "image-cacherator-from-picture", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-picture", + "sp-8888", + "gm", + "_", + "image-cacherator-from-raster", + "pic-8888", + "gm", + "_", + "image-cacherator-from-raster", + "2ndpic-8888", + "gm", + "_", + "image-cacherator-from-raster", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-raster", + "sp-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "pic-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "2ndpic-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "_", + "image", + "_", + "interlaced1.png", + "_", + "image", + "_", + "interlaced2.png", + "_", + "image", + "_", + "interlaced3.png", + "_", + "image", + "_", + ".arw", + "_", + "image", + "_", + ".cr2", + "_", + "image", + "_", + ".dng", + "_", + "image", + "_", + ".nef", + "_", + "image", + "_", + ".nrw", + "_", + "image", + "_", + ".orf", + "_", + "image", + "_", + ".raf", + "_", + "image", + "_", + ".rw2", + "_", + "image", + "_", + ".pef", + "_", + "image", + "_", + ".srw", + "_", + "image", + "_", + ".ARW", + "_", + "image", + "_", + ".CR2", + "_", + "image", + "_", + ".DNG", + "_", + "image", + "_", + ".NEF", + "_", + "image", + "_", + ".NRW", + "_", + "image", + "_", + ".ORF", + "_", + "image", + "_", + ".RAF", + "_", + "image", + "_", + ".RW2", + "_", + "image", + "_", + ".PEF", + "_", + "image", + "_", + ".SRW" ], "env": { "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk", diff --git a/infra/bots/recipes/swarm_test.expected/missing_SK_IMAGE_VERSION_device.json b/infra/bots/recipes/swarm_test.expected/missing_SK_IMAGE_VERSION_device.json index 1842fcd9f4..c6128469e5 100644 --- a/infra/bots/recipes/swarm_test.expected/missing_SK_IMAGE_VERSION_device.json +++ b/infra/bots/recipes/swarm_test.expected/missing_SK_IMAGE_VERSION_device.json @@ -1,52 +1,6 @@ [ { "cmd": [ - "python", - "-u", - "[SLAVE_BUILD]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"dm\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"arch\": \"Arm7\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"GCC\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu\": \"GPU\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu_value\": \"Tegra3\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"model\": \"Nexus7\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Android\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Test\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"device_cfg\": \"arm_v7_neon\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=arm skia_warnings_as_errors=0\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"product.board\": \"grouper\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ "which", "adb" ], @@ -667,7 +621,303 @@ "--writePath", "/storage/emulated/legacy/skiabot/skia_dm", "--nocpu", - "--dummy-flags" + "--config", + "565", + "8888", + "gpu", + "gpusrgb", + "serialize-8888", + "tiles_rt-8888", + "pic-8888", + "--src", + "tests", + "gm", + "image", + "--blacklist", + "f16", + "_", + "_", + "dstreadshuffle", + "f16", + "image", + "_", + "_", + "srgb", + "image", + "_", + "_", + "gpusrgb", + "image", + "_", + "_", + "_", + "test", + "_", + "GrShape", + "serialize-8888", + "gm", + "_", + "bleed_image", + "serialize-8888", + "gm", + "_", + "c_gms", + "serialize-8888", + "gm", + "_", + "colortype", + "serialize-8888", + "gm", + "_", + "colortype_xfermodes", + "serialize-8888", + "gm", + "_", + "drawfilter", + "serialize-8888", + "gm", + "_", + "fontmgr_bounds_0.75_0", + "serialize-8888", + "gm", + "_", + "fontmgr_bounds_1_-0.25", + "serialize-8888", + "gm", + "_", + "fontmgr_bounds", + "serialize-8888", + "gm", + "_", + "fontmgr_match", + "serialize-8888", + "gm", + "_", + "fontmgr_iter", + "serialize-8888", + "gm", + "_", + "bitmapfilters", + "serialize-8888", + "gm", + "_", + "bitmapshaders", + "serialize-8888", + "gm", + "_", + "bleed", + "serialize-8888", + "gm", + "_", + "bleed_alpha_bmp", + "serialize-8888", + "gm", + "_", + "bleed_alpha_bmp_shader", + "serialize-8888", + "gm", + "_", + "convex_poly_clip", + "serialize-8888", + "gm", + "_", + "extractalpha", + "serialize-8888", + "gm", + "_", + "filterbitmap_checkerboard_32_32_g8", + "serialize-8888", + "gm", + "_", + "filterbitmap_image_mandrill_64", + "serialize-8888", + "gm", + "_", + "shadows", + "serialize-8888", + "gm", + "_", + "simpleaaclip_aaclip", + "serialize-8888", + "gm", + "_", + "composeshader_bitmap", + "serialize-8888", + "gm", + "_", + "scaled_tilemodes_npot", + "serialize-8888", + "gm", + "_", + "scaled_tilemodes", + "serialize-8888", + "gm", + "_", + "bleed_alpha_image", + "serialize-8888", + "gm", + "_", + "bleed_alpha_image_shader", + "serialize-8888", + "gm", + "_", + "verylargebitmap", + "serialize-8888", + "gm", + "_", + "verylarge_picture_image", + "sp-8888", + "gm", + "_", + "drawfilter", + "pic-8888", + "gm", + "_", + "drawfilter", + "2ndpic-8888", + "gm", + "_", + "drawfilter", + "sp-8888", + "gm", + "_", + "image-cacherator-from-picture", + "pic-8888", + "gm", + "_", + "image-cacherator-from-picture", + "2ndpic-8888", + "gm", + "_", + "image-cacherator-from-picture", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-picture", + "sp-8888", + "gm", + "_", + "image-cacherator-from-raster", + "pic-8888", + "gm", + "_", + "image-cacherator-from-raster", + "2ndpic-8888", + "gm", + "_", + "image-cacherator-from-raster", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-raster", + "sp-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "pic-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "2ndpic-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "_", + "image", + "_", + "interlaced1.png", + "_", + "image", + "_", + "interlaced2.png", + "_", + "image", + "_", + "interlaced3.png", + "_", + "image", + "_", + ".arw", + "_", + "image", + "_", + ".cr2", + "_", + "image", + "_", + ".dng", + "_", + "image", + "_", + ".nef", + "_", + "image", + "_", + ".nrw", + "_", + "image", + "_", + ".orf", + "_", + "image", + "_", + ".raf", + "_", + "image", + "_", + ".rw2", + "_", + "image", + "_", + ".pef", + "_", + "image", + "_", + ".srw", + "_", + "image", + "_", + ".ARW", + "_", + "image", + "_", + ".CR2", + "_", + "image", + "_", + ".DNG", + "_", + "image", + "_", + ".NEF", + "_", + "image", + "_", + ".NRW", + "_", + "image", + "_", + ".ORF", + "_", + "image", + "_", + ".RAF", + "_", + "image", + "_", + ".RW2", + "_", + "image", + "_", + ".PEF", + "_", + "image", + "_", + ".SRW" ], "env": { "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk", diff --git a/infra/bots/recipes/swarm_trigger.expected/Build-Mac-Clang-x86_64-Release.json b/infra/bots/recipes/swarm_trigger.expected/Build-Mac-Clang-x86_64-Release.json index 5cbd6dc066..a234e83778 100644 --- a/infra/bots/recipes/swarm_trigger.expected/Build-Mac-Clang-x86_64-Release.json +++ b/infra/bots/recipes/swarm_trigger.expected/Build-Mac-Clang-x86_64-Release.json @@ -261,49 +261,6 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Build-Mac-Clang-x86_64-Release" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"most\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"Clang\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Mac\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Build\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"target_arch\": \"x86_64\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"CC\": \"/usr/bin/clang\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"CXX\": \"/usr/bin/clang++\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=x86_64 skia_clang_build=1 skia_warnings_as_errors=1\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ - "python", - "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", "[SLAVE_BUILD]/swarming_temp_dir", "511" diff --git a/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-Arm64-Debug-Android_Vulkan.json b/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-Arm64-Debug-Android_Vulkan.json index 805687b5ef..3f670903bf 100644 --- a/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-Arm64-Debug-Android_Vulkan.json +++ b/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-Arm64-Debug-Android_Vulkan.json @@ -261,49 +261,6 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Build-Ubuntu-GCC-Arm64-Debug-Android_Vulkan" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"most\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"GCC\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"extra_config\": \"Android_Vulkan\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Ubuntu\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Build\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"target_arch\": \"Arm64\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"device_cfg\": \"arm64\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=arm64 skia_warnings_as_errors=1\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ - "python", - "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "[SLAVE_BUILD]/skia/infra/bots/assets/android_sdk/VERSION", "/path/to/tmp/" diff --git a/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Debug-GN.json b/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Debug-GN.json index 2accb60ed4..0fdfc03515 100644 --- a/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Debug-GN.json +++ b/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Debug-GN.json @@ -261,48 +261,6 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Build-Ubuntu-GCC-x86_64-Debug-GN" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"most\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"GCC\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"extra_config\": \"GN\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Ubuntu\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Build\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"target_arch\": \"x86_64\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=x86_64 skia_warnings_as_errors=1\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ - "python", - "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", "[SLAVE_BUILD]/swarming_temp_dir", "511" diff --git a/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Debug.json b/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Debug.json index 0414ca0ad8..96cef6f4ed 100644 --- a/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Debug.json +++ b/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Debug.json @@ -261,47 +261,6 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Build-Ubuntu-GCC-x86_64-Debug" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"most\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"GCC\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Ubuntu\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Build\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"target_arch\": \"x86_64\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=x86_64 skia_warnings_as_errors=1\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ - "python", - "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", "[SLAVE_BUILD]/swarming_temp_dir", "511" diff --git a/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Release-RemoteRun.json b/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Release-RemoteRun.json index a3e9d5ea6b..4d95548013 100644 --- a/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Release-RemoteRun.json +++ b/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Release-RemoteRun.json @@ -261,48 +261,6 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Build-Ubuntu-GCC-x86_64-Release-RemoteRun" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"most\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"GCC\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"extra_config\": \"RemoteRun\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Ubuntu\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Build\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"target_arch\": \"x86_64\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=x86_64 skia_warnings_as_errors=1\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ - "python", - "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", "[SLAVE_BUILD]/swarming_temp_dir", "511" diff --git a/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Release-Trybot.json b/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Release-Trybot.json index 8c9a521679..18055e4ee0 100644 --- a/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Release-Trybot.json +++ b/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Release-Trybot.json @@ -261,47 +261,6 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Build-Ubuntu-GCC-x86_64-Release-Trybot" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"most\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"GCC\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Ubuntu\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Build\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"target_arch\": \"x86_64\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=x86_64 skia_warnings_as_errors=1\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ - "python", - "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", "[SLAVE_BUILD]/swarming_temp_dir", "511" diff --git a/infra/bots/recipes/swarm_trigger.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json b/infra/bots/recipes/swarm_trigger.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json index 72ae024645..7fec6e95a1 100644 --- a/infra/bots/recipes/swarm_trigger.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json +++ b/infra/bots/recipes/swarm_trigger.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json @@ -261,48 +261,6 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Build-Win-MSVC-x86_64-Release-Vulkan" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"most\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"MSVC\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"extra_config\": \"Vulkan\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Win\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Build\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"target_arch\": \"x86_64\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release_x64\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"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\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ - "python", - "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "[SLAVE_BUILD]/skia/infra/bots/assets/win_toolchain/VERSION", "/path/to/tmp/" diff --git a/infra/bots/recipes/swarm_trigger.expected/Build-Win-MSVC-x86_64-Release.json b/infra/bots/recipes/swarm_trigger.expected/Build-Win-MSVC-x86_64-Release.json index 1dd7ec0678..9b38b452f3 100644 --- a/infra/bots/recipes/swarm_trigger.expected/Build-Win-MSVC-x86_64-Release.json +++ b/infra/bots/recipes/swarm_trigger.expected/Build-Win-MSVC-x86_64-Release.json @@ -261,47 +261,6 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Build-Win-MSVC-x86_64-Release" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"most\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"MSVC\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Win\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Build\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"target_arch\": \"x86_64\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release_x64\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"qt_sdk=C:/Qt/4.8.5/ skia_arch_type=x86_64 skia_warnings_as_errors=1 skia_win_debuggers_path=c:/DbgHelp skia_win_ltcg=0\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ - "python", - "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "[SLAVE_BUILD]/skia/infra/bots/assets/win_toolchain/VERSION", "/path/to/tmp/" diff --git a/infra/bots/recipes/swarm_trigger.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json b/infra/bots/recipes/swarm_trigger.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json index 491ffd5510..de660de728 100644 --- a/infra/bots/recipes/swarm_trigger.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json +++ b/infra/bots/recipes/swarm_trigger.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json @@ -261,45 +261,6 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Housekeeper-Nightly-RecreateSKPs_Canary" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"most\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"extra_config\": \"RecreateSKPs_Canary\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"frequency\": \"Nightly\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Housekeeper\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_shared_lib=1 skia_warnings_as_errors=0\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ - "python", - "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", "[SLAVE_BUILD]/swarming_temp_dir", "511" diff --git a/infra/bots/recipes/swarm_trigger.expected/Housekeeper-PerCommit.json b/infra/bots/recipes/swarm_trigger.expected/Housekeeper-PerCommit.json index ce1ef4d441..57d3a1637f 100644 --- a/infra/bots/recipes/swarm_trigger.expected/Housekeeper-PerCommit.json +++ b/infra/bots/recipes/swarm_trigger.expected/Housekeeper-PerCommit.json @@ -261,86 +261,6 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Housekeeper-PerCommit" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"most\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"frequency\": \"PerCommit\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Housekeeper\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_shared_lib=1 skia_warnings_as_errors=0\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "[SLAVE_BUILD]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Build-Ubuntu-GCC-x86_64-Release-Shared" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "exec buildbot_spec.py (2)", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"most\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"GCC\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"extra_config\": \"Shared\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Ubuntu\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Build\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"target_arch\": \"x86_64\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=x86_64 skia_shared_lib=1 skia_warnings_as_errors=1\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ - "python", - "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", "[SLAVE_BUILD]/swarming_temp_dir", "511" diff --git a/infra/bots/recipes/swarm_trigger.expected/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Trybot.json b/infra/bots/recipes/swarm_trigger.expected/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Trybot.json index 75359f6583..64817f4451 100644 --- a/infra/bots/recipes/swarm_trigger.expected/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Trybot.json +++ b/infra/bots/recipes/swarm_trigger.expected/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Trybot.json @@ -261,91 +261,6 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Trybot" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"arch\": \"x86_64\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"GCC\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu\": \"CPU\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu_value\": \"AVX2\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"model\": \"GCE\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Ubuntu\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Perf\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": true@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "[SLAVE_BUILD]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Build-Ubuntu-GCC-x86_64-Release-Trybot" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "exec buildbot_spec.py (2)", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"most\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"GCC\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Ubuntu\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Build\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"target_arch\": \"x86_64\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=x86_64 skia_warnings_as_errors=1\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ - "python", - "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", "[SLAVE_BUILD]/swarming_temp_dir", "511" diff --git a/infra/bots/recipes/swarm_trigger.expected/Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug-Vulkan.json b/infra/bots/recipes/swarm_trigger.expected/Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug-Vulkan.json index cd02903df2..e3e9695cc9 100644 --- a/infra/bots/recipes/swarm_trigger.expected/Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug-Vulkan.json +++ b/infra/bots/recipes/swarm_trigger.expected/Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug-Vulkan.json @@ -261,53 +261,6 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug-Vulkan" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"dm\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"arch\": \"Arm64\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"GCC\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu\": \"GPU\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu_value\": \"TegraX1\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"extra_config\": \"Vulkan\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"model\": \"NVIDIA_Shield\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Android\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Test\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"device_cfg\": \"arm64\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=arm64 skia_vulkan=1 skia_vulkan_debug_layers=0 skia_warnings_as_errors=0\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"product.board\": \"foster\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ - "python", - "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "[SLAVE_BUILD]/skia/infra/bots/assets/android_sdk/VERSION", "/path/to/tmp/" @@ -318,49 +271,6 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Build-Ubuntu-GCC-Arm64-Debug-Android_Vulkan" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "exec buildbot_spec.py (2)", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"most\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"GCC\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"extra_config\": \"Android_Vulkan\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Ubuntu\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Build\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"target_arch\": \"Arm64\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"device_cfg\": \"arm64\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=arm64 skia_warnings_as_errors=1\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ - "python", - "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", "[SLAVE_BUILD]/swarming_temp_dir", "511" diff --git a/infra/bots/recipes/swarm_trigger.expected/Test-Android-GCC-Nexus7v2-GPU-Tegra3-Arm7-Release.json b/infra/bots/recipes/swarm_trigger.expected/Test-Android-GCC-Nexus7v2-GPU-Tegra3-Arm7-Release.json index dcbb9bbaca..4389d4ea6b 100644 --- a/infra/bots/recipes/swarm_trigger.expected/Test-Android-GCC-Nexus7v2-GPU-Tegra3-Arm7-Release.json +++ b/infra/bots/recipes/swarm_trigger.expected/Test-Android-GCC-Nexus7v2-GPU-Tegra3-Arm7-Release.json @@ -261,52 +261,6 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Test-Android-GCC-Nexus7v2-GPU-Tegra3-Arm7-Release" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"dm\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"arch\": \"Arm7\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"GCC\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu\": \"GPU\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu_value\": \"Tegra3\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"model\": \"Nexus7v2\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Android\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Test\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"device_cfg\": \"arm_v7_neon\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=arm skia_warnings_as_errors=0\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"product.board\": \"flo\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ - "python", - "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "[SLAVE_BUILD]/skia/infra/bots/assets/android_sdk/VERSION", "/path/to/tmp/" @@ -317,49 +271,6 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Build-Ubuntu-GCC-Arm7-Release-Android" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "exec buildbot_spec.py (2)", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"most\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"GCC\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"extra_config\": \"Android\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Ubuntu\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Build\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"target_arch\": \"Arm7\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"device_cfg\": \"arm_v7_neon\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=arm skia_warnings_as_errors=1\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ - "python", - "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", "[SLAVE_BUILD]/swarming_temp_dir", "511" diff --git a/infra/bots/recipes/swarm_trigger.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release.json b/infra/bots/recipes/swarm_trigger.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release.json index e266e8bf9a..a99e09f46d 100644 --- a/infra/bots/recipes/swarm_trigger.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release.json +++ b/infra/bots/recipes/swarm_trigger.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release.json @@ -261,95 +261,6 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"dm\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"arch\": \"x86_64\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"Clang\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu\": \"CPU\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu_value\": \"AVX\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"model\": \"MacMini6.2\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Mac\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Test\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"CC\": \"/usr/bin/clang\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"CXX\": \"/usr/bin/clang++\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=x86_64 skia_clang_build=1 skia_gpu=0 skia_warnings_as_errors=0\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "[SLAVE_BUILD]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Build-Mac-Clang-x86_64-Release" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "exec buildbot_spec.py (2)", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"most\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"Clang\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Mac\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Build\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"target_arch\": \"x86_64\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"CC\": \"/usr/bin/clang\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"CXX\": \"/usr/bin/clang++\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=x86_64 skia_clang_build=1 skia_warnings_as_errors=1\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ - "python", - "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", "[SLAVE_BUILD]/swarming_temp_dir", "511" diff --git a/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json b/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json index 84d2ef59b7..ba9c5a9b7d 100644 --- a/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json +++ b/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json @@ -261,53 +261,6 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"dm\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"arch\": \"x86_64\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"Clang\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Coverage\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu\": \"CPU\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu_value\": \"AVX2\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"model\": \"GCE\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Ubuntu\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Test\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Coverage\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_compile_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"CC\": \"/usr/bin/clang-3.6\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"CXX\": \"/usr/bin/clang++-3.6\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=x86_64 skia_clang_build=1 skia_gpu=0 skia_warnings_as_errors=0\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ - "python", - "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" diff --git a/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json b/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json index b6c6bffe82..d78ac7378c 100644 --- a/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json +++ b/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json @@ -261,95 +261,6 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"dm\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"arch\": \"x86_64\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"GCC\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu\": \"CPU\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu_value\": \"AVX2\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"extra_config\": \"MSAN\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"model\": \"GCE\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Ubuntu\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Test\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "[SLAVE_BUILD]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Build-Ubuntu-GCC-x86_64-Debug-MSAN" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "exec buildbot_spec.py (2)", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"dm\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"GCC\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"extra_config\": \"MSAN\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Ubuntu\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Build\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"target_arch\": \"x86_64\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=x86_64 skia_warnings_as_errors=1\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ - "python", - "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", "[SLAVE_BUILD]/swarming_temp_dir", "511" diff --git a/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json b/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json index fbe10be824..d1f052d228 100644 --- a/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json +++ b/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json @@ -261,91 +261,6 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"dm\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"arch\": \"x86_64\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"GCC\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu\": \"CPU\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu_value\": \"AVX2\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"model\": \"GCE\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Ubuntu\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Test\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "[SLAVE_BUILD]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Build-Ubuntu-GCC-x86_64-Debug" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "exec buildbot_spec.py (2)", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"most\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"GCC\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Ubuntu\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Build\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"target_arch\": \"x86_64\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Debug\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=x86_64 skia_warnings_as_errors=1\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ - "python", - "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", "[SLAVE_BUILD]/swarming_temp_dir", "511" diff --git a/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json b/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json index e202a38b36..d091dfd5d6 100644 --- a/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json +++ b/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json @@ -261,93 +261,6 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"dm\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"arch\": \"x86_64\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"GCC\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu\": \"GPU\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu_value\": \"GTX550Ti\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"extra_config\": \"Valgrind\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"model\": \"ShuttleA\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Ubuntu\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Test\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=x86_64 skia_release_optimization_level=1 skia_warnings_as_errors=0\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "[SLAVE_BUILD]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Build-Ubuntu-GCC-x86_64-Release-Valgrind" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "exec buildbot_spec.py (2)", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"most\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"GCC\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"extra_config\": \"Valgrind\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Ubuntu\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Build\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"target_arch\": \"x86_64\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=x86_64 skia_release_optimization_level=1 skia_warnings_as_errors=1\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ - "python", - "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", "[SLAVE_BUILD]/swarming_temp_dir", "511" diff --git a/infra/bots/recipes/swarm_trigger.expected/Test-Win8-MSVC-ShuttleA-GPU-HD7770-x86_64-Release.json b/infra/bots/recipes/swarm_trigger.expected/Test-Win8-MSVC-ShuttleA-GPU-HD7770-x86_64-Release.json index 97be43115a..d19b717723 100644 --- a/infra/bots/recipes/swarm_trigger.expected/Test-Win8-MSVC-ShuttleA-GPU-HD7770-x86_64-Release.json +++ b/infra/bots/recipes/swarm_trigger.expected/Test-Win8-MSVC-ShuttleA-GPU-HD7770-x86_64-Release.json @@ -261,91 +261,6 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Test-Win8-MSVC-ShuttleA-GPU-HD7770-x86_64-Release" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"dm\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"arch\": \"x86_64\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"MSVC\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu\": \"GPU\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu_value\": \"HD7770\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"model\": \"ShuttleA\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Win8\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Test\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release_x64\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"qt_sdk=C:/Qt/Qt5.1.0/5.1.0/msvc2012_64/ skia_arch_type=x86_64 skia_warnings_as_errors=0 skia_win_debuggers_path=c:/DbgHelp\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "[SLAVE_BUILD]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Build-Win-MSVC-x86_64-Release" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "exec buildbot_spec.py (2)", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"most\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"MSVC\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Win\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Build\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"target_arch\": \"x86_64\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release_x64\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"qt_sdk=C:/Qt/4.8.5/ skia_arch_type=x86_64 skia_warnings_as_errors=1 skia_win_debuggers_path=c:/DbgHelp skia_win_ltcg=0\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ - "python", - "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "[SLAVE_BUILD]/skia/infra/bots/assets/win_toolchain/VERSION", "/path/to/tmp/" diff --git a/infra/bots/recipes/swarm_trigger.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release.json b/infra/bots/recipes/swarm_trigger.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release.json index fae8ed8aae..474ae7e9db 100644 --- a/infra/bots/recipes/swarm_trigger.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release.json +++ b/infra/bots/recipes/swarm_trigger.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release.json @@ -261,91 +261,6 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"dm\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"arch\": \"x86_64\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"MSVC\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu\": \"CPU\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu_value\": \"AVX2\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"model\": \"ShuttleB\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Win8\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Test\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release_x64\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"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\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "[SLAVE_BUILD]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Build-Win-MSVC-x86_64-Release" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "exec buildbot_spec.py (2)", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"most\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"MSVC\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Win\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Build\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"target_arch\": \"x86_64\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release_x64\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"qt_sdk=C:/Qt/4.8.5/ skia_arch_type=x86_64 skia_warnings_as_errors=1 skia_win_debuggers_path=c:/DbgHelp skia_win_ltcg=0\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ - "python", - "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", "[SLAVE_BUILD]/skia/infra/bots/assets/win_toolchain/VERSION", "/path/to/tmp/" diff --git a/infra/bots/recipes/swarm_trigger.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release.json b/infra/bots/recipes/swarm_trigger.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release.json index 88eb30b16d..a3eede9edb 100644 --- a/infra/bots/recipes/swarm_trigger.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release.json +++ b/infra/bots/recipes/swarm_trigger.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release.json @@ -261,97 +261,6 @@ "cmd": [ "python", "-u", - "[SLAVE_BUILD]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "exec buildbot_spec.py", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"iOSShell\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"arch\": \"Arm7\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"Clang\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu\": \"GPU\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"cpu_or_gpu_value\": \"SGX554\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"model\": \"iPad4\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"iOS\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Test\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"device_cfg\": \"iPad4,1\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"CC\": \"/usr/bin/clang\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"CXX\": \"/usr/bin/clang++\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=0\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "[SLAVE_BUILD]/skia/tools/buildbot_spec.py", - "/path/to/tmp/json", - "Build-Mac-Clang-Arm7-Release-iOS" - ], - "cwd": "[SLAVE_BUILD]/skia", - "name": "exec buildbot_spec.py (2)", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"build_targets\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"most\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder_cfg\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"compiler\": \"Clang\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"extra_config\": \"iOS\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"is_trybot\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"os\": \"Mac\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"role\": \"Build\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"target_arch\": \"Arm7\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"configuration\": \"Release\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"dm_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_perf_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"do_test_steps\": false, @@@", - "@@@STEP_LOG_LINE@json.output@ \"env\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"CC\": \"/usr/bin/clang\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"CXX\": \"/usr/bin/clang++\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"GYP_DEFINES\": \"skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=1\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"nanobench_flags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ \"--dummy-flags\"@@@", - "@@@STEP_LOG_LINE@json.output@ ], @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_dm_results\": true, @@@", - "@@@STEP_LOG_LINE@json.output@ \"upload_perf_results\": false@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ - "python", - "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", "[SLAVE_BUILD]/swarming_temp_dir", "511" diff --git a/infra/bots/recipes/swarm_trigger.py b/infra/bots/recipes/swarm_trigger.py index d3dbbc08a2..1cde51a3cd 100644 --- a/infra/bots/recipes/swarm_trigger.py +++ b/infra/bots/recipes/swarm_trigger.py @@ -10,9 +10,10 @@ import json DEPS = [ - 'core', 'build/file', 'build/gsutil', + 'builder_name_schema', + 'core', 'depot_tools/depot_tools', 'depot_tools/git', 'depot_tools/tryserver', @@ -59,8 +60,9 @@ TEST_BUILDERS = { } -def derive_compile_bot_name(builder_name, builder_spec): - builder_cfg = builder_spec['builder_cfg'] +def derive_compile_bot_name(api): + builder_name = api.properties['buildername'] + builder_cfg = api.builder_name_schema.DictForBuilderName(builder_name) if builder_cfg['role'] == 'Housekeeper': return 'Build-Ubuntu-GCC-x86_64-Release-Shared' if builder_cfg['role'] in ('Test', 'Perf'): @@ -77,16 +79,14 @@ def derive_compile_bot_name(builder_name, builder_spec): os = 'Mac' elif 'Win' in os: os = 'Win' - builder_name = 'Build-%s-%s-%s-%s' % ( - os, - builder_cfg['compiler'], - builder_cfg['arch'], - builder_cfg['configuration'] - ) - if extra_config: - builder_name += '-%s' % extra_config - if builder_cfg['is_trybot']: - builder_name += '-Trybot' + return api.builder_name_schema.MakeBuilderName( + role=api.builder_name_schema.BUILDER_ROLE_BUILD, + os=os, + compiler=builder_cfg['compiler'], + target_arch=builder_cfg['arch'], + configuration=builder_cfg['configuration'], + extra_config=extra_config, + is_trybot=api.builder_name_schema.IsTrybot(builder_name)) return builder_name @@ -280,7 +280,8 @@ def infra_swarm(api, got_revision, infrabots_dir, extra_isolate_hashes): builder_spec = { 'builder_cfg': { 'role': 'Infra', - 'is_trybot': api.properties['buildername'].endswith('-Trybot'), + 'is_trybot': api.builder_name_schema.IsTrybot( + api.properties['buildername']) } } task = trigger_task( @@ -301,12 +302,10 @@ def infra_swarm(api, got_revision, infrabots_dir, extra_isolate_hashes): def compile_steps_swarm(api, builder_spec, got_revision, infrabots_dir, extra_isolate_hashes, cipd_packages): - builder_name = derive_compile_bot_name(api.properties['buildername'], - builder_spec) + builder_name = derive_compile_bot_name(api) compile_builder_spec = builder_spec if builder_name != api.properties['buildername']: - compile_builder_spec = api.core.get_builder_spec( - api.path['slave_build'].join('skia'), builder_name) + compile_builder_spec = api.vars.get_builder_spec(builder_name) extra_hashes = extra_isolate_hashes[:] @@ -314,8 +313,8 @@ def compile_steps_swarm(api, builder_spec, got_revision, infrabots_dir, if 'Win' in builder_name: version_file = infrabots_dir.join('assets', 'win_toolchain', 'VERSION') version = api.run.readfile(version_file, - name='read win_toolchain VERSION', - test_data='0').rstrip() + name='read win_toolchain VERSION', + test_data='0').rstrip() version = 'version:%s' % version pkg = ('t', 'skia/bots/win_toolchain', version) cipd_packages.append(pkg) @@ -603,8 +602,7 @@ def RunSteps(api): if 'Infra' in api.properties['buildername']: return infra_swarm(api, got_revision, infrabots_dir, extra_hashes) - builder_spec = api.core.get_builder_spec(api.path['checkout'], - api.properties['buildername']) + builder_spec = api.vars.get_builder_spec(api.properties['buildername']) builder_cfg = builder_spec['builder_cfg'] if 'RecreateSKPs' in api.properties['buildername']: |