diff options
author | Mike Klein <mtklein@chromium.org> | 2016-10-17 14:36:18 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-10-18 16:54:25 +0000 |
commit | b9eb887f8baa3dcf89b0106a799aff03b5c1cbba (patch) | |
tree | bc24a9e642b34ca13eaf3728dd98111870286a98 /infra/bots | |
parent | 2e68865813d6aa9442c5e9e785a217e23120abe4 (diff) |
Some GN-related recipe cleanup.
All our bots but the iOS ones are on GN now. This cleans up a bunch of GYP and other obsolete stuff.
- Nothing's using default_flavor.py any more except as a base class.
- There are no -CMake, -Shared or -VisualBench bots anymore.
- Only the iOS bots care about GYP_DEFINES.
You'll see the PDFium bot's GYP_DEFINES change, but that doesn't matter... it's using PDFium's own (GN) build system, and it ignores GYP_DEFINES.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=3567
Change-Id: I699e10f013ea77df4dcaa1cb559c51c5bf55dfdb
Reviewed-on: https://skia-review.googlesource.com/3567
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
Diffstat (limited to 'infra/bots')
20 files changed, 20 insertions, 1145 deletions
diff --git a/infra/bots/recipe_modules/flavor/api.py b/infra/bots/recipe_modules/flavor/api.py index 7fe14c84a4..08b9972dc8 100644 --- a/infra/bots/recipe_modules/flavor/api.py +++ b/infra/bots/recipe_modules/flavor/api.py @@ -8,7 +8,6 @@ from recipe_engine import recipe_api -from . import cmake_flavor from . import default_flavor from . import gn_android_flavor from . import gn_flavor @@ -27,9 +26,8 @@ VERSION_FILE_SVG = 'SVG_VERSION' VERSION_NONE = -1 - -def is_cmake(builder_cfg): - return 'CMake' in builder_cfg.get('extra_config', '') +def is_android(builder_cfg): + return 'Android' in builder_cfg.get('extra_config', '') def is_ios(builder_cfg): @@ -48,16 +46,8 @@ def is_valgrind(builder_cfg): class SkiaFlavorApi(recipe_api.RecipeApi): def get_flavor(self, builder_cfg): """Return a flavor utils object specific to the given builder.""" - gn_android = gn_android_flavor.GNAndroidFlavorUtils(self.m) - if gn_android.supported(): - return gn_android - - gn = gn_flavor.GNFlavorUtils(self.m) - if gn.supported(): - return gn - - if is_cmake(builder_cfg): - return cmake_flavor.CMakeFlavorUtils(self.m) + if is_android(builder_cfg): + return gn_android_flavor.GNAndroidFlavorUtils(self.m) elif is_ios(builder_cfg): return ios_flavor.iOSFlavorUtils(self.m) elif is_pdfium(builder_cfg): @@ -65,7 +55,7 @@ class SkiaFlavorApi(recipe_api.RecipeApi): elif is_valgrind(builder_cfg): return valgrind_flavor.ValgrindFlavorUtils(self.m) else: - return default_flavor.DefaultFlavorUtils(self.m) + return gn_flavor.GNFlavorUtils(self.m) def setup(self): self._f = self.get_flavor(self.m.vars.builder_cfg) diff --git a/infra/bots/recipe_modules/flavor/cmake_flavor.py b/infra/bots/recipe_modules/flavor/cmake_flavor.py deleted file mode 100644 index 5a127dff52..0000000000 --- a/infra/bots/recipe_modules/flavor/cmake_flavor.py +++ /dev/null @@ -1,14 +0,0 @@ -# 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. - -import default_flavor - -"""CMake flavor utils, used for building Skia with CMake.""" - -class CMakeFlavorUtils(default_flavor.DefaultFlavorUtils): - def compile(self, target, **kwargs): - """Build Skia with CMake. Ignores `target`.""" - cmake_build = self.m.vars.skia_dir.join('cmake', 'cmake_build') - self.m.run(self.m.step, 'cmake_build', cmd=[cmake_build], - cwd=self.m.path['checkout'], **kwargs) diff --git a/infra/bots/recipe_modules/flavor/default_flavor.py b/infra/bots/recipe_modules/flavor/default_flavor.py index 9b148f4daf..dacb0fd056 100644 --- a/infra/bots/recipe_modules/flavor/default_flavor.py +++ b/infra/bots/recipe_modules/flavor/default_flavor.py @@ -84,37 +84,6 @@ class DefaultFlavorUtils(object): if not self.m.path.exists(win_toolchain_asset_path): self._win_toolchain_dir = self.m.vars.slave_dir - - def step(self, name, cmd, **kwargs): - """Wrapper for the Step API; runs a step as appropriate for this flavor.""" - path_to_app = self.m.vars.skia_out.join( - self.m.vars.configuration, cmd[0]) - if (self.m.platform.is_linux and - 'x86_64' in self.m.vars.builder_name and - not 'TSAN' in self.m.vars.builder_name): - new_cmd = ['catchsegv', path_to_app] - else: - new_cmd = [path_to_app] - new_cmd.extend(cmd[1:]) - return self.m.run(self.m.step, - name, cmd=new_cmd, **kwargs) - - @property - def chrome_path(self): - """Path to a checkout of Chrome on this machine.""" - return self._win_toolchain_dir.join('src') - - def compile(self, target, **kwargs): - """Build the given target.""" - env = kwargs.pop('env', {}) - # The CHROME_PATH environment variable is needed for builders that use - # toolchains downloaded by Chrome. - env['CHROME_PATH'] = self.chrome_path - make_cmd = ['make'] - cmd = make_cmd + [target] - self.m.run(self.m.step, 'build %s' % target, cmd=cmd, - env=env, cwd=self.m.path['checkout'], **kwargs) - def copy_extra_build_products(self, swarming_out_dir): pass diff --git a/infra/bots/recipe_modules/flavor/gn_android_flavor.py b/infra/bots/recipe_modules/flavor/gn_android_flavor.py index 92afee5dcf..1fc7230ebd 100644 --- a/infra/bots/recipe_modules/flavor/gn_android_flavor.py +++ b/infra/bots/recipe_modules/flavor/gn_android_flavor.py @@ -25,9 +25,6 @@ class GNAndroidFlavorUtils(default_flavor.DefaultFlavorUtils): svg_dir = _data_dir + 'svgs', tmp_dir = _data_dir) - def supported(self): - return 'GN_Android' in self.m.vars.builder_cfg.get('extra_config', '') - def _run(self, title, *cmd, **kwargs): self.m.vars.default_env = {k: v for (k,v) in self.m.vars.default_env.iteritems() diff --git a/infra/bots/recipe_modules/flavor/gn_flavor.py b/infra/bots/recipe_modules/flavor/gn_flavor.py index b7ef1dd643..6e01dee1c2 100644 --- a/infra/bots/recipe_modules/flavor/gn_flavor.py +++ b/infra/bots/recipe_modules/flavor/gn_flavor.py @@ -6,29 +6,6 @@ import default_flavor """GN flavor utils, used for building Skia with GN.""" class GNFlavorUtils(default_flavor.DefaultFlavorUtils): - def supported(self): - # TODO: simplify! - extra_config = self.m.vars.builder_cfg.get('extra_config', '') - os = self.m.vars.builder_cfg.get('os', '') - target_arch = self.m.vars.builder_cfg.get('target_arch', '') - - return any([ - 'CT' in extra_config, - 'SAN' in extra_config, - extra_config == 'ANGLE', - extra_config == 'CommandBuffer', - extra_config == 'Exceptions', - extra_config == 'Fast', - extra_config == 'GDI', - extra_config == 'GN', - extra_config == 'Mesa', - extra_config == 'NoGPU', - extra_config.startswith('SK'), - extra_config == 'Vulkan', - os == 'Ubuntu' and target_arch == 'x86', - 'Win' in os, - ]) - def _strip_environment(self): self.m.vars.default_env = {k: v for (k,v) in self.m.vars.default_env.iteritems() 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 deleted file mode 100644 index eadb623e7c..0000000000 --- a/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-x86_64-Release-CMake.json +++ /dev/null @@ -1,180 +0,0 @@ -[ - { - "cmd": [ - "python", - "-u", - "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[CUSTOM_/_B_WORK]", - "511" - ], - "name": "makedirs checkout_path", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import sys, os@@@", - "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@", - "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@", - "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@", - "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@", - "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@", - "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "config", - "--spec", - "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Release-CMake" - }, - "name": "gclient setup" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "sync", - "--verbose", - "--with_branch_heads", - "--nohooks", - "-j8", - "--reset", - "--force", - "--upstream", - "--no-nag-max", - "--delete_unversioned_trees", - "--revision", - "skia@abc123", - "--output-json", - "/path/to/tmp/json" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Release-CMake" - }, - "name": "gclient sync", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"revision\": \"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@", - "@@@STEP_LOG_LINE@json.output@ }@@@", - "@@@STEP_LOG_LINE@json.output@ }@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@", - "@@@SET_BUILD_PROPERTY@got_revision@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.name", - "local_bot" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Release-CMake" - }, - "name": "gclient recurse (git config user.name)" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.email", - "local_bot@example.com" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Release-CMake" - }, - "name": "gclient recurse (git config user.email)" - }, - { - "cmd": [ - "[CUSTOM_/_B_WORK]/skia/cmake/cmake_build" - ], - "cwd": "[CUSTOM_/_B_WORK]/skia", - "env": { - "BUILDTYPE": "Release", - "CC": "/usr/bin/clang", - "CHROME_HEADLESS": "1", - "CXX": "/usr/bin/clang++", - "GYP_DEFINES": "skia_arch_type=x86_64 skia_clang_build=1 skia_warnings_as_errors=1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Release-CMake" - }, - "name": "cmake_build" - }, - { - "cmd": [ - "python", - "-u", - "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['dm', 'dm.exe', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'lib/*.so', 'iOSShell.app', 'iOSShell.ipa', 'visualbench', 'visualbench.exe', 'vulkan-1.dll']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", - "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Release-CMake/Release", - "[CUSTOM_[SWARM_OUT_DIR]]/out/Release" - ], - "name": "copy build products", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@import errno@@@", - "@@@STEP_LOG_LINE@python.inline@import glob@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import shutil@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@src = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@dst = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@build_products_whitelist = ['dm', 'dm.exe', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'lib/*.so', 'iOSShell.app', 'iOSShell.ipa', 'visualbench', 'visualbench.exe', 'vulkan-1.dll']@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ os.makedirs(dst)@@@", - "@@@STEP_LOG_LINE@python.inline@except OSError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ if e.errno != errno.EEXIST:@@@", - "@@@STEP_LOG_LINE@python.inline@ raise@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@for pattern in build_products_whitelist:@@@", - "@@@STEP_LOG_LINE@python.inline@ path = os.path.join(src, pattern)@@@", - "@@@STEP_LOG_LINE@python.inline@ for f in glob.glob(path):@@@", - "@@@STEP_LOG_LINE@python.inline@ dst_path = os.path.join(dst, os.path.relpath(f, src))@@@", - "@@@STEP_LOG_LINE@python.inline@ if not os.path.isdir(os.path.dirname(dst_path)):@@@", - "@@@STEP_LOG_LINE@python.inline@ os.makedirs(os.path.dirname(dst_path))@@@", - "@@@STEP_LOG_LINE@python.inline@ print 'Copying build product %s to %s' % (f, dst_path)@@@", - "@@@STEP_LOG_LINE@python.inline@ shutil.move(f, dst_path)@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "name": "$result", - "recipe_result": null, - "status_code": 0 - } -]
\ No newline at end of file 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 deleted file mode 100644 index ae8016f802..0000000000 --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-CMake.json +++ /dev/null @@ -1,178 +0,0 @@ -[ - { - "cmd": [ - "python", - "-u", - "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[CUSTOM_/_B_WORK]", - "511" - ], - "name": "makedirs checkout_path", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import sys, os@@@", - "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@", - "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@", - "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@", - "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@", - "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@", - "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "config", - "--spec", - "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-CMake" - }, - "name": "gclient setup" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "sync", - "--verbose", - "--with_branch_heads", - "--nohooks", - "-j8", - "--reset", - "--force", - "--upstream", - "--no-nag-max", - "--delete_unversioned_trees", - "--revision", - "skia@abc123", - "--output-json", - "/path/to/tmp/json" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-CMake" - }, - "name": "gclient sync", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"revision\": \"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@", - "@@@STEP_LOG_LINE@json.output@ }@@@", - "@@@STEP_LOG_LINE@json.output@ }@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@", - "@@@SET_BUILD_PROPERTY@got_revision@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.name", - "local_bot" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-CMake" - }, - "name": "gclient recurse (git config user.name)" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.email", - "local_bot@example.com" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-CMake" - }, - "name": "gclient recurse (git config user.email)" - }, - { - "cmd": [ - "[CUSTOM_/_B_WORK]/skia/cmake/cmake_build" - ], - "cwd": "[CUSTOM_/_B_WORK]/skia", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "GYP_DEFINES": "skia_arch_type=x86_64 skia_warnings_as_errors=1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-CMake" - }, - "name": "cmake_build" - }, - { - "cmd": [ - "python", - "-u", - "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['dm', 'dm.exe', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'lib/*.so', 'iOSShell.app', 'iOSShell.ipa', 'visualbench', 'visualbench.exe', 'vulkan-1.dll']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", - "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-CMake/Release", - "[CUSTOM_[SWARM_OUT_DIR]]/out/Release" - ], - "name": "copy build products", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@import errno@@@", - "@@@STEP_LOG_LINE@python.inline@import glob@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import shutil@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@src = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@dst = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@build_products_whitelist = ['dm', 'dm.exe', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'lib/*.so', 'iOSShell.app', 'iOSShell.ipa', 'visualbench', 'visualbench.exe', 'vulkan-1.dll']@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ os.makedirs(dst)@@@", - "@@@STEP_LOG_LINE@python.inline@except OSError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ if e.errno != errno.EEXIST:@@@", - "@@@STEP_LOG_LINE@python.inline@ raise@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@for pattern in build_products_whitelist:@@@", - "@@@STEP_LOG_LINE@python.inline@ path = os.path.join(src, pattern)@@@", - "@@@STEP_LOG_LINE@python.inline@ for f in glob.glob(path):@@@", - "@@@STEP_LOG_LINE@python.inline@ dst_path = os.path.join(dst, os.path.relpath(f, src))@@@", - "@@@STEP_LOG_LINE@python.inline@ if not os.path.isdir(os.path.dirname(dst_path)):@@@", - "@@@STEP_LOG_LINE@python.inline@ os.makedirs(os.path.dirname(dst_path))@@@", - "@@@STEP_LOG_LINE@python.inline@ print 'Copying build product %s to %s' % (f, dst_path)@@@", - "@@@STEP_LOG_LINE@python.inline@ shutil.move(f, dst_path)@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "name": "$result", - "recipe_result": null, - "status_code": 0 - } -]
\ No newline at end of file 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 4b46ba34fe..23ddaf7649 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 @@ -134,7 +134,7 @@ "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", - "GYP_DEFINES": "skia_arch_type=x86_64 skia_warnings_as_errors=1", + "GYP_DEFINES": "", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-PDFium" }, @@ -167,7 +167,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools", - "GYP_DEFINES": "skia_arch_type=x86_64 skia_warnings_as_errors=1", + "GYP_DEFINES": "", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-PDFium" }, @@ -219,7 +219,7 @@ "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "CHROMIUM_BUILDTOOLS_PATH": "[CUSTOM_/_B_WORK]/pdfium/buildtools", - "GYP_DEFINES": "skia_arch_type=x86_64 skia_warnings_as_errors=1", + "GYP_DEFINES": "", "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-PDFium" }, 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 deleted file mode 100644 index 8290bc3b81..0000000000 --- a/infra/bots/recipes/swarm_compile.expected/Build-Ubuntu-GCC-x86_64-Release-Shared.json +++ /dev/null @@ -1,180 +0,0 @@ -[ - { - "cmd": [ - "python", - "-u", - "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[CUSTOM_/_B_WORK]", - "511" - ], - "name": "makedirs checkout_path", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import sys, os@@@", - "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@", - "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@", - "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@", - "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@", - "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@", - "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "config", - "--spec", - "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-Shared" - }, - "name": "gclient setup" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "sync", - "--verbose", - "--with_branch_heads", - "--nohooks", - "-j8", - "--reset", - "--force", - "--upstream", - "--no-nag-max", - "--delete_unversioned_trees", - "--revision", - "skia@abc123", - "--output-json", - "/path/to/tmp/json" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-Shared" - }, - "name": "gclient sync", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"revision\": \"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@", - "@@@STEP_LOG_LINE@json.output@ }@@@", - "@@@STEP_LOG_LINE@json.output@ }@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@", - "@@@SET_BUILD_PROPERTY@got_revision@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.name", - "local_bot" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-Shared" - }, - "name": "gclient recurse (git config user.name)" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.email", - "local_bot@example.com" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-Shared" - }, - "name": "gclient recurse (git config user.email)" - }, - { - "cmd": [ - "make", - "most" - ], - "cwd": "[CUSTOM_/_B_WORK]/skia", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "CHROME_PATH": "[SLAVE_BUILD]/src", - "GYP_DEFINES": "skia_arch_type=x86_64 skia_shared_lib=1 skia_warnings_as_errors=1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-Shared" - }, - "name": "build most" - }, - { - "cmd": [ - "python", - "-u", - "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['dm', 'dm.exe', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'lib/*.so', 'iOSShell.app', 'iOSShell.ipa', 'visualbench', 'visualbench.exe', 'vulkan-1.dll']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n", - "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Release-Shared/Release", - "[CUSTOM_[SWARM_OUT_DIR]]/out/Release" - ], - "name": "copy build products", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@import errno@@@", - "@@@STEP_LOG_LINE@python.inline@import glob@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import shutil@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@src = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@dst = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@build_products_whitelist = ['dm', 'dm.exe', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'lib/*.so', 'iOSShell.app', 'iOSShell.ipa', 'visualbench', 'visualbench.exe', 'vulkan-1.dll']@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ os.makedirs(dst)@@@", - "@@@STEP_LOG_LINE@python.inline@except OSError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ if e.errno != errno.EEXIST:@@@", - "@@@STEP_LOG_LINE@python.inline@ raise@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@for pattern in build_products_whitelist:@@@", - "@@@STEP_LOG_LINE@python.inline@ path = os.path.join(src, pattern)@@@", - "@@@STEP_LOG_LINE@python.inline@ for f in glob.glob(path):@@@", - "@@@STEP_LOG_LINE@python.inline@ dst_path = os.path.join(dst, os.path.relpath(f, src))@@@", - "@@@STEP_LOG_LINE@python.inline@ if not os.path.isdir(os.path.dirname(dst_path)):@@@", - "@@@STEP_LOG_LINE@python.inline@ os.makedirs(os.path.dirname(dst_path))@@@", - "@@@STEP_LOG_LINE@python.inline@ print 'Copying build product %s to %s' % (f, dst_path)@@@", - "@@@STEP_LOG_LINE@python.inline@ shutil.move(f, dst_path)@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "name": "$result", - "recipe_result": null, - "status_code": 0 - } -]
\ No newline at end of file diff --git a/infra/bots/recipes/swarm_compile.expected/failed_compile.json b/infra/bots/recipes/swarm_compile.expected/failed_compile.json deleted file mode 100644 index b6b22230a5..0000000000 --- a/infra/bots/recipes/swarm_compile.expected/failed_compile.json +++ /dev/null @@ -1,148 +0,0 @@ -[ - { - "cmd": [ - "python", - "-u", - "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[CUSTOM_/_B_WORK]", - "511" - ], - "name": "makedirs checkout_path", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import sys, os@@@", - "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@", - "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@", - "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@", - "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@", - "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@", - "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "config", - "--spec", - "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug" - }, - "name": "gclient setup" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "sync", - "--verbose", - "--with_branch_heads", - "--nohooks", - "-j8", - "--reset", - "--force", - "--upstream", - "--no-nag-max", - "--delete_unversioned_trees", - "--revision", - "skia@abc123", - "--output-json", - "/path/to/tmp/json" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug" - }, - "name": "gclient sync", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"revision\": \"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@", - "@@@STEP_LOG_LINE@json.output@ }@@@", - "@@@STEP_LOG_LINE@json.output@ }@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@", - "@@@SET_BUILD_PROPERTY@got_revision@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.name", - "local_bot" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug" - }, - "name": "gclient recurse (git config user.name)" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", - "recurse", - "git", - "config", - "user.email", - "local_bot@example.com" - ], - "cwd": "[CUSTOM_/_B_WORK]", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug" - }, - "name": "gclient recurse (git config user.email)" - }, - { - "cmd": [ - "make", - "most" - ], - "cwd": "[CUSTOM_/_B_WORK]/skia", - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "CHROME_PATH": "[SLAVE_BUILD]/src", - "GYP_DEFINES": "skia_arch_type=x86_64 skia_warnings_as_errors=1", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86_64-Debug" - }, - "name": "build most", - "~followup_annotations": [ - "step returned non-zero exit code: 1", - "@@@STEP_FAILURE@@@" - ] - }, - { - "name": "$result", - "reason": "Step('build most') failed with return_code 1", - "recipe_result": null, - "status_code": 1 - } -]
\ No newline at end of file diff --git a/infra/bots/recipes/swarm_compile.py b/infra/bots/recipes/swarm_compile.py index 4f6aed20cc..cf4f46fa59 100644 --- a/infra/bots/recipes/swarm_compile.py +++ b/infra/bots/recipes/swarm_compile.py @@ -25,7 +25,6 @@ TEST_BUILDERS = { 'Build-Mac-Clang-Arm7-Release-iOS', 'Build-Mac-Clang-mipsel-Debug-GN_Android', 'Build-Mac-Clang-x86_64-Debug-CommandBuffer', - 'Build-Mac-Clang-x86_64-Release-CMake', 'Build-Mac-Clang-x86_64-Release-GN', 'Build-Ubuntu-Clang-arm64-Release-GN_Android', 'Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan', @@ -39,11 +38,9 @@ TEST_BUILDERS = { 'Build-Ubuntu-GCC-x86_64-Debug-NoGPU', 'Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE', 'Build-Ubuntu-GCC-x86_64-Release-ANGLE', - 'Build-Ubuntu-GCC-x86_64-Release-CMake', 'Build-Ubuntu-GCC-x86_64-Release-Fast', 'Build-Ubuntu-GCC-x86_64-Release-Mesa', 'Build-Ubuntu-GCC-x86_64-Release-PDFium', - 'Build-Ubuntu-GCC-x86_64-Release-Shared', 'Build-Ubuntu-GCC-x86_64-Release-Valgrind', 'Build-Win-MSVC-x86-Debug', 'Build-Win-MSVC-x86-Debug-ANGLE', @@ -80,103 +77,12 @@ def get_extra_env_vars(builder_dict): def get_gyp_defines(builder_dict): gyp_defs = {} - # skia_arch_type. - arch = builder_dict['target_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] - - # skia_warnings_as_errors. - werr = False - 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', ''): - # 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', ''): - gyp_defs['qt_sdk'] = 'C:/Qt/4.8.5/' - - # ANGLE. - if builder_dict.get('extra_config') == 'ANGLE': - 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': - gyp_defs['skia_gdi'] = '1' - - # Build with Exceptions on Windows. - if ('Win' in builder_dict.get('os', '') and - builder_dict.get('extra_config') == 'Exceptions'): - 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': - gyp_defs['skia_fast'] = '1' - - # Clang. - if builder_dict.get('compiler') == 'Clang': + gyp_defs['skia_arch_type'] = 'arm' 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('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'): - gyp_defs['skia_mesa'] = '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' - - # NoGPU. - if 'NoGPU' in builder_dict.get('extra_config', ''): - gyp_defs['skia_gpu'] = 0 + gyp_defs['skia_os'] = 'ios' + gyp_defs['skia_warnings_as_errors'] = 1 return gyp_defs @@ -250,22 +156,6 @@ def GenTests(api): mastername = 'client.skia.compile' slavename = 'skiabot-win-compile-000' - buildername = 'Build-Ubuntu-GCC-x86_64-Debug' - yield ( - api.test('failed_compile') + - api.properties(buildername=buildername, - mastername=mastername, - slavename=slavename, - buildnumber=5, - revision='abc123', - path_config='kitchen', - swarm_out_dir='[SWARM_OUT_DIR]') + - api.path.exists( - api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt') - ) + - api.step_data('build most', retcode=1) - ) - buildername = 'Build-Win-MSVC-x86-Debug' yield ( api.test('big_issue_number') + diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-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 deleted file mode 100644 index 7c481a91ee..0000000000 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench.json +++ /dev/null @@ -1,217 +0,0 @@ -[ - { - "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/" - ], - "name": "Get downloaded SKP VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "42", - "[SLAVE_BUILD]/tmp/SKP_VERSION" - ], - "name": "write SKP_VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION", - "/path/to/tmp/" - ], - "name": "Get downloaded skimage VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "42", - "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION" - ], - "name": "write SK_IMAGE_VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION", - "/path/to/tmp/" - ], - "name": "Get downloaded SVG VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "42", - "[SLAVE_BUILD]/tmp/SVG_VERSION" - ], - "name": "write SVG_VERSION" - }, - { - "cmd": [ - "python", - "-u", - "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n", - "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench/data" - ], - "env": { - "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts" - }, - "name": "rmtree data", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os, sys@@@", - "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@", - "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench/data", - "511" - ], - "name": "makedirs data", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import sys, os@@@", - "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@", - "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@", - "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@", - "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@", - "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@", - "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "catchsegv", - "[SLAVE_BUILD]/out/Release/visualbench", - "--undefok", - "-i", - "[SLAVE_BUILD]/skia/resources", - "--skps", - "[SLAVE_BUILD]/skp", - "--images", - "[SLAVE_BUILD]/skimage/nanobench", - "--svgs", - "[SLAVE_BUILD]/svg", - "--nocpu", - "--pre_log", - "--images", - "--gpuStatsDump", - "true", - "--scales", - "1.0", - "1.1", - "--config", - "8888", - "gpu", - "nonrendering", - "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_1337000001.json", - "--properties", - "gitHash", - "abc123", - "build_number", - "5", - "--key", - "arch", - "x86_64", - "compiler", - "GCC", - "cpu_or_gpu", - "GPU", - "cpu_or_gpu_value", - "GTX550Ti", - "extra_config", - "VisualBench", - "model", - "ShuttleA", - "os", - "Ubuntu" - ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, - "name": "visualbench" - }, - { - "cmd": [ - "python", - "-u", - "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench/data", - "511" - ], - "name": "makedirs perf_dir", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import sys, os@@@", - "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@", - "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@", - "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@", - "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@", - "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@", - "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "name": "$result", - "recipe_result": null, - "status_code": 0 - } -]
\ No newline at end of file diff --git a/infra/bots/recipes/swarm_perf.py b/infra/bots/recipes/swarm_perf.py index b080fd2612..31d6dbefe8 100644 --- a/infra/bots/recipes/swarm_perf.py +++ b/infra/bots/recipes/swarm_perf.py @@ -34,7 +34,6 @@ TEST_BUILDERS = { 'Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer', 'Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN', 'Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind', - 'Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench', 'Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-ANGLE', 'Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug', 'Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release', @@ -191,8 +190,6 @@ def perf_steps(api): ]) target = 'nanobench' - if 'VisualBench' in api.vars.builder_name: - target = 'visualbench' args = [ target, '--undefok', # This helps branches that may not know new flags. diff --git a/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug.json index fc810bd4ce..da3e99e2ae 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug.json @@ -175,7 +175,6 @@ }, { "cmd": [ - "catchsegv", "[SLAVE_BUILD]/out/Debug/dm", "--undefok", "--resourcePath", @@ -571,11 +570,7 @@ "_", "blurcircles" ], - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, + "cwd": "[SLAVE_BUILD]/skia", "name": "dm" }, { diff --git a/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json index ab8cab84de..7d23f4303b 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json @@ -175,7 +175,6 @@ }, { "cmd": [ - "catchsegv", "[SLAVE_BUILD]/out/Debug/dm", "--undefok", "--resourcePath", @@ -473,11 +472,7 @@ "_", "gamut" ], - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, + "cwd": "[SLAVE_BUILD]/skia", "name": "dm" }, { diff --git a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json index 2cd24f5ffa..1674ba530f 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json @@ -175,6 +175,7 @@ }, { "cmd": [ + "catchsegv", "[SLAVE_BUILD]/out/Debug/dm", "--undefok", "--resourcePath", @@ -454,11 +455,7 @@ "_", "gamut" ], - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, + "cwd": "[SLAVE_BUILD]/skia", "name": "dm" }, { 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 e1ee93a842..a25f4b1b5e 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 @@ -453,11 +453,7 @@ "_", "gamut" ], - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, + "cwd": "[SLAVE_BUILD]/skia", "name": "dm" }, { diff --git a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json index 34af6db4f0..6b15ec6c00 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json @@ -455,11 +455,7 @@ "_", "gamut" ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, + "cwd": "[SLAVE_BUILD]/skia", "name": "dm" }, { diff --git a/infra/bots/recipes/swarm_test.expected/failed_dm.json b/infra/bots/recipes/swarm_test.expected/failed_dm.json index 4ccb9d7999..d4477cf137 100644 --- a/infra/bots/recipes/swarm_test.expected/failed_dm.json +++ b/infra/bots/recipes/swarm_test.expected/failed_dm.json @@ -453,11 +453,7 @@ "_", "gamut" ], - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, + "cwd": "[SLAVE_BUILD]/skia", "name": "dm", "~followup_annotations": [ "step returned non-zero exit code: 1", diff --git a/infra/bots/recipes/swarm_test.expected/recipe_with_gerrit_patch.json b/infra/bots/recipes/swarm_test.expected/recipe_with_gerrit_patch.json index c5e011cdbf..a00b4537c6 100644 --- a/infra/bots/recipes/swarm_test.expected/recipe_with_gerrit_patch.json +++ b/infra/bots/recipes/swarm_test.expected/recipe_with_gerrit_patch.json @@ -175,6 +175,7 @@ }, { "cmd": [ + "catchsegv", "[SLAVE_BUILD]/out/Debug/dm", "--undefok", "--resourcePath", @@ -458,11 +459,7 @@ "_", "gamut" ], - "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", - "SKIA_OUT": "[SLAVE_BUILD]/out" - }, + "cwd": "[SLAVE_BUILD]/skia", "name": "dm" }, { |