diff options
96 files changed, 1525 insertions, 131 deletions
diff --git a/infra/bots/assets/linux_vulkan_intel_driver_debug/README.md b/infra/bots/assets/linux_vulkan_intel_driver_debug/README.md new file mode 100644 index 0000000000..82b58c8c0b --- /dev/null +++ b/infra/bots/assets/linux_vulkan_intel_driver_debug/README.md @@ -0,0 +1 @@ +See [the release readme](../linux_vulkan_intel_driver_release/README.md) for information on how to make this asset.
\ No newline at end of file diff --git a/infra/bots/assets/linux_vulkan_intel_driver_debug/VERSION b/infra/bots/assets/linux_vulkan_intel_driver_debug/VERSION new file mode 100644 index 0000000000..c227083464 --- /dev/null +++ b/infra/bots/assets/linux_vulkan_intel_driver_debug/VERSION @@ -0,0 +1 @@ +0
\ No newline at end of file diff --git a/infra/bots/assets/linux_vulkan_intel_driver_debug/common.py b/infra/bots/assets/linux_vulkan_intel_driver_debug/common.py new file mode 100755 index 0000000000..4920c9b4fb --- /dev/null +++ b/infra/bots/assets/linux_vulkan_intel_driver_debug/common.py @@ -0,0 +1,26 @@ +#!/usr/bin/env python +# +# Copyright 2016 Google Inc. +# +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + + +"""Common vars used by scripts in this directory.""" + + +import os +import sys + +FILE_DIR = os.path.dirname(os.path.abspath(__file__)) +INFRA_BOTS_DIR = os.path.realpath(os.path.join(FILE_DIR, os.pardir, os.pardir)) + +sys.path.insert(0, INFRA_BOTS_DIR) +from assets import assets + +ASSET_NAME = os.path.basename(FILE_DIR) + + +def run(cmd): + """Run a command, eg. "upload" or "download". """ + assets.main([cmd, ASSET_NAME] + sys.argv[1:]) diff --git a/infra/bots/assets/linux_vulkan_intel_driver_debug/create.py b/infra/bots/assets/linux_vulkan_intel_driver_debug/create.py new file mode 100755 index 0000000000..1ce011d784 --- /dev/null +++ b/infra/bots/assets/linux_vulkan_intel_driver_debug/create.py @@ -0,0 +1,34 @@ +#!/usr/bin/env python +# +# Copyright 2016 Google Inc. +# +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + + +"""Create the asset.""" + + +import argparse +import shutil +import sys +import os + +def create_asset(target_dir, lib_path): + """Create the asset.""" + shutil.copytree(lib_path, target_dir) + + +def main(): + if 'linux' not in sys.platform: + print >> sys.stderr, 'This script only runs on Linux.' + sys.exit(1) + parser = argparse.ArgumentParser() + parser.add_argument('--target_dir', '-t', required=True) + parser.add_argument('--lib_path', '-l', required=True) + args = parser.parse_args() + create_asset(args.target_dir, args.lib_path) + + +if __name__ == '__main__': + main() diff --git a/infra/bots/assets/linux_vulkan_intel_driver_debug/create_and_upload.py b/infra/bots/assets/linux_vulkan_intel_driver_debug/create_and_upload.py new file mode 100755 index 0000000000..88c19bef0b --- /dev/null +++ b/infra/bots/assets/linux_vulkan_intel_driver_debug/create_and_upload.py @@ -0,0 +1,50 @@ +#!/usr/bin/env python +# +# Copyright 2016 Google Inc. +# +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + + +"""Create the asset and upload it.""" + + +import argparse +import common +import os +import subprocess +import sys +import utils + + +def main(): + if 'linux' not in sys.platform: + print >> sys.stderr, 'This script only runs on Linux.' + sys.exit(1) + parser = argparse.ArgumentParser() + parser.add_argument('--gsutil') + parser.add_argument('--lib_path', '-l', required=True) + args = parser.parse_args() + + with utils.tmp_dir(): + cwd = os.getcwd() + create_script = os.path.join(common.FILE_DIR, 'create.py') + upload_script = os.path.join(common.FILE_DIR, 'upload.py') + + try: + cwd = os.path.join(cwd, 'lib') + subprocess.check_call(['python', create_script, + '-t', cwd, + '--lib_path', args.lib_path]) + + cmd = ['python', upload_script, '-t', cwd] + if args.gsutil: + cmd.extend(['--gsutil', args.gsutil]) + subprocess.check_call(cmd) + except subprocess.CalledProcessError: + # Trap exceptions to avoid printing two stacktraces. + sys.exit(1) + + +if __name__ == '__main__': + main() diff --git a/infra/bots/assets/linux_vulkan_intel_driver_debug/download.py b/infra/bots/assets/linux_vulkan_intel_driver_debug/download.py new file mode 100755 index 0000000000..96cc87d43f --- /dev/null +++ b/infra/bots/assets/linux_vulkan_intel_driver_debug/download.py @@ -0,0 +1,16 @@ +#!/usr/bin/env python +# +# Copyright 2016 Google Inc. +# +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + + +"""Download the current version of the asset.""" + + +import common + + +if __name__ == '__main__': + common.run('download') diff --git a/infra/bots/assets/linux_vulkan_intel_driver_debug/upload.py b/infra/bots/assets/linux_vulkan_intel_driver_debug/upload.py new file mode 100755 index 0000000000..ba7fc8b6a1 --- /dev/null +++ b/infra/bots/assets/linux_vulkan_intel_driver_debug/upload.py @@ -0,0 +1,16 @@ +#!/usr/bin/env python +# +# Copyright 2016 Google Inc. +# +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + + +"""Upload a new version of the asset.""" + + +import common + + +if __name__ == '__main__': + common.run('upload') diff --git a/infra/bots/assets/linux_vulkan_intel_driver_release/README.md b/infra/bots/assets/linux_vulkan_intel_driver_release/README.md new file mode 100644 index 0000000000..d5a6a7dfec --- /dev/null +++ b/infra/bots/assets/linux_vulkan_intel_driver_release/README.md @@ -0,0 +1,37 @@ +Creating the Linux Vulkan driver for Intel + +This is known to work on an Intel machine running Ubuntu 16.10. + +Install all deps + + sudo apt-get install autoconf libtool scons flex bison llvm-dev libpthread-stubs0-dev x11proto-gl-dev libdrm-dev x11proto-dri2-dev x11proto-dri3-dev x11proto-present-dev libxcb1-dev libxcb-dri3-dev libxcb-present-dev libxshmfence-dev xserver-xorg-core xserver-xorg-dev x11proto-xext-dev libxext-dev libxdamage-dev libx11-xcb-dev libxcb-glx0-dev libxcb-dri2-0-dev + + sudo pip install mako + + +Get the source from ftp.freedesktop.org/pub/mesa/ + + wget ftp://ftp.freedesktop.org/pub/mesa/$MESA_VERSION/mesa-$MESA_VERSION.tar.gz + gunzip mesa-$MESA_VERSION.tar.gz + tar --extract -f mesa-$MESA_VERSION.tar + cd mesa-$MESA_VERSION/ + mv mesa-$MESA_VERSION/ mesa + + +Build the driver + + mesa$ ./autogen.sh + # For the debug resource, use --enable-debug + mesa$ ./configure --with-vulkan-drivers=intel + mesa$ make + + +Tweak icd.json file and output dir (mesa/lib) + + mesa$ cp src/intel/vulkan/intel_icd.x86_64.json lib/ + # modify the pathname in the intel_icd.x86_64.json file to be ./libvulkan_intel.so + mesa$ rm -rf lib/gallium # We don't need this + mesa$ rm lib/nouveau_vieux_dri.so lib/r200_dri.so lib/radeon_dri.so # We don't need these + + +Finally, use mesa/lib as the input directory to the create_and_upload script.
\ No newline at end of file diff --git a/infra/bots/assets/linux_vulkan_intel_driver_release/VERSION b/infra/bots/assets/linux_vulkan_intel_driver_release/VERSION new file mode 100644 index 0000000000..c227083464 --- /dev/null +++ b/infra/bots/assets/linux_vulkan_intel_driver_release/VERSION @@ -0,0 +1 @@ +0
\ No newline at end of file diff --git a/infra/bots/assets/linux_vulkan_intel_driver_release/common.py b/infra/bots/assets/linux_vulkan_intel_driver_release/common.py new file mode 100755 index 0000000000..4920c9b4fb --- /dev/null +++ b/infra/bots/assets/linux_vulkan_intel_driver_release/common.py @@ -0,0 +1,26 @@ +#!/usr/bin/env python +# +# Copyright 2016 Google Inc. +# +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + + +"""Common vars used by scripts in this directory.""" + + +import os +import sys + +FILE_DIR = os.path.dirname(os.path.abspath(__file__)) +INFRA_BOTS_DIR = os.path.realpath(os.path.join(FILE_DIR, os.pardir, os.pardir)) + +sys.path.insert(0, INFRA_BOTS_DIR) +from assets import assets + +ASSET_NAME = os.path.basename(FILE_DIR) + + +def run(cmd): + """Run a command, eg. "upload" or "download". """ + assets.main([cmd, ASSET_NAME] + sys.argv[1:]) diff --git a/infra/bots/assets/linux_vulkan_intel_driver_release/create.py b/infra/bots/assets/linux_vulkan_intel_driver_release/create.py new file mode 100755 index 0000000000..1ce011d784 --- /dev/null +++ b/infra/bots/assets/linux_vulkan_intel_driver_release/create.py @@ -0,0 +1,34 @@ +#!/usr/bin/env python +# +# Copyright 2016 Google Inc. +# +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + + +"""Create the asset.""" + + +import argparse +import shutil +import sys +import os + +def create_asset(target_dir, lib_path): + """Create the asset.""" + shutil.copytree(lib_path, target_dir) + + +def main(): + if 'linux' not in sys.platform: + print >> sys.stderr, 'This script only runs on Linux.' + sys.exit(1) + parser = argparse.ArgumentParser() + parser.add_argument('--target_dir', '-t', required=True) + parser.add_argument('--lib_path', '-l', required=True) + args = parser.parse_args() + create_asset(args.target_dir, args.lib_path) + + +if __name__ == '__main__': + main() diff --git a/infra/bots/assets/linux_vulkan_intel_driver_release/create_and_upload.py b/infra/bots/assets/linux_vulkan_intel_driver_release/create_and_upload.py new file mode 100755 index 0000000000..88c19bef0b --- /dev/null +++ b/infra/bots/assets/linux_vulkan_intel_driver_release/create_and_upload.py @@ -0,0 +1,50 @@ +#!/usr/bin/env python +# +# Copyright 2016 Google Inc. +# +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + + +"""Create the asset and upload it.""" + + +import argparse +import common +import os +import subprocess +import sys +import utils + + +def main(): + if 'linux' not in sys.platform: + print >> sys.stderr, 'This script only runs on Linux.' + sys.exit(1) + parser = argparse.ArgumentParser() + parser.add_argument('--gsutil') + parser.add_argument('--lib_path', '-l', required=True) + args = parser.parse_args() + + with utils.tmp_dir(): + cwd = os.getcwd() + create_script = os.path.join(common.FILE_DIR, 'create.py') + upload_script = os.path.join(common.FILE_DIR, 'upload.py') + + try: + cwd = os.path.join(cwd, 'lib') + subprocess.check_call(['python', create_script, + '-t', cwd, + '--lib_path', args.lib_path]) + + cmd = ['python', upload_script, '-t', cwd] + if args.gsutil: + cmd.extend(['--gsutil', args.gsutil]) + subprocess.check_call(cmd) + except subprocess.CalledProcessError: + # Trap exceptions to avoid printing two stacktraces. + sys.exit(1) + + +if __name__ == '__main__': + main() diff --git a/infra/bots/assets/linux_vulkan_intel_driver_release/download.py b/infra/bots/assets/linux_vulkan_intel_driver_release/download.py new file mode 100755 index 0000000000..96cc87d43f --- /dev/null +++ b/infra/bots/assets/linux_vulkan_intel_driver_release/download.py @@ -0,0 +1,16 @@ +#!/usr/bin/env python +# +# Copyright 2016 Google Inc. +# +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + + +"""Download the current version of the asset.""" + + +import common + + +if __name__ == '__main__': + common.run('download') diff --git a/infra/bots/assets/linux_vulkan_intel_driver_release/upload.py b/infra/bots/assets/linux_vulkan_intel_driver_release/upload.py new file mode 100755 index 0000000000..ba7fc8b6a1 --- /dev/null +++ b/infra/bots/assets/linux_vulkan_intel_driver_release/upload.py @@ -0,0 +1,16 @@ +#!/usr/bin/env python +# +# Copyright 2016 Google Inc. +# +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + + +"""Upload a new version of the asset.""" + + +import common + + +if __name__ == '__main__': + common.run('upload') diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go index f631dbf769..68cd362877 100644 --- a/infra/bots/gen_tasks.go +++ b/infra/bots/gen_tasks.go @@ -561,6 +561,14 @@ func process(b *specs.TasksCfgBuilder, name string) { if strings.Contains(name, "Ubuntu") && strings.Contains(name, "SAN") { pkgs = append(pkgs, b.MustGetCipdPackageFromAsset("clang_linux")) } + if strings.Contains(name, "Ubuntu") && strings.Contains(name, "Vulkan") { + pkgs = append(pkgs, b.MustGetCipdPackageFromAsset("linux_vulkan_sdk")) + if strings.Contains(name, "Release") { + pkgs = append(pkgs, b.MustGetCipdPackageFromAsset("linux_vulkan_intel_driver_release")) + } else { + pkgs = append(pkgs, b.MustGetCipdPackageFromAsset("linux_vulkan_intel_driver_debug")) + } + } // Skpbench only needs skps if strings.Contains(name, "Skpbench") { pkgs = []*specs.CipdPackage{ diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Mac-Clang-arm64-Debug-iOS.json b/infra/bots/recipe_modules/compile/example.expected/Build-Mac-Clang-arm64-Debug-iOS.json index 19036c4cc8..580e0f2277 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Mac-Clang-arm64-Debug-iOS.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Mac-Clang-arm64-Debug-iOS.json @@ -83,7 +83,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-arm64-Debug-iOS" }, "name": "fetch-gn" }, @@ -96,7 +99,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-arm64-Debug-iOS" }, "name": "gn gen" }, @@ -108,7 +114,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-arm64-Debug-iOS" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json b/infra/bots/recipe_modules/compile/example.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json index 8665fab84d..2c147683c0 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json @@ -120,7 +120,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer" }, "name": "fetch-gn" }, @@ -133,7 +136,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer" }, "name": "gn gen" }, @@ -145,7 +151,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Mac-Clang-x86_64-Release-GN.json b/infra/bots/recipe_modules/compile/example.expected/Build-Mac-Clang-x86_64-Release-GN.json index a964d6b663..1e8501a5a6 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Mac-Clang-x86_64-Release-GN.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Mac-Clang-x86_64-Release-GN.json @@ -83,7 +83,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "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-GN" }, "name": "fetch-gn" }, @@ -96,7 +99,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "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-GN" }, "name": "gn gen" }, @@ -108,7 +114,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "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-GN" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-x86_64-Debug-ASAN.json b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-x86_64-Debug-ASAN.json index 307e734569..ea79b534a1 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-x86_64-Debug-ASAN.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-x86_64-Debug-ASAN.json @@ -83,7 +83,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-ASAN" }, "name": "fetch-gn" }, @@ -96,7 +99,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-ASAN" }, "name": "gn gen" }, @@ -108,7 +114,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-ASAN" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-x86_64-Debug-GN.json b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-x86_64-Debug-GN.json index ab5dc2ce4e..a0e42cecc9 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-x86_64-Debug-GN.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-x86_64-Debug-GN.json @@ -83,7 +83,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-GN" }, "name": "fetch-gn" }, @@ -96,7 +99,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-GN" }, "name": "gn gen" }, @@ -108,7 +114,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-GN" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-x86_64-Release-Vulkan.json b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-x86_64-Release-Vulkan.json index 9421a3c9ba..2a5e4d125a 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-x86_64-Release-Vulkan.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-x86_64-Release-Vulkan.json @@ -83,7 +83,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Release-Vulkan" }, "name": "fetch-gn" }, @@ -96,7 +99,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Release-Vulkan" }, "name": "gn gen" }, @@ -108,7 +114,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Release-Vulkan" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86-Debug.json b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86-Debug.json index 60f79fa796..8b0d6cc4ea 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86-Debug.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86-Debug.json @@ -83,7 +83,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86-Debug" }, "name": "fetch-gn" }, @@ -96,7 +99,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86-Debug" }, "name": "gn gen" }, @@ -108,7 +114,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-GCC-x86-Debug" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Debug-GN.json b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Debug-GN.json index ec62d9299c..316d86a5b7 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Debug-GN.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Debug-GN.json @@ -83,7 +83,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "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-GN" }, "name": "fetch-gn" }, @@ -96,7 +99,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "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-GN" }, "name": "gn gen" }, @@ -108,7 +114,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "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-GN" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Debug-MSAN.json b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Debug-MSAN.json index 676f364a1c..325c8ce2bd 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Debug-MSAN.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Debug-MSAN.json @@ -83,7 +83,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "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-MSAN" }, "name": "fetch-gn" }, @@ -96,7 +99,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "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-MSAN" }, "name": "gn gen" }, @@ -108,7 +114,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "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-MSAN" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Debug-NoGPU.json b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Debug-NoGPU.json index 7b3a3eb0df..bc516331ef 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Debug-NoGPU.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Debug-NoGPU.json @@ -83,7 +83,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "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-NoGPU" }, "name": "fetch-gn" }, @@ -96,7 +99,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "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-NoGPU" }, "name": "gn gen" }, @@ -108,7 +114,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "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-NoGPU" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json index dc944ed114..f38d5cc790 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json @@ -83,7 +83,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "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-SK_USE_DISCARDABLE_SCALEDIMAGECACHE" }, "name": "fetch-gn" }, @@ -96,7 +99,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "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-SK_USE_DISCARDABLE_SCALEDIMAGECACHE" }, "name": "gn gen" }, @@ -108,7 +114,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "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-SK_USE_DISCARDABLE_SCALEDIMAGECACHE" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-ANGLE.json b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-ANGLE.json index 24f7752841..1da1bcca46 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-ANGLE.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-ANGLE.json @@ -83,7 +83,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "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-ANGLE" }, "name": "fetch-gn" }, @@ -96,7 +99,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "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-ANGLE" }, "name": "gn gen" }, @@ -108,7 +114,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "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-ANGLE" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-Fast.json b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-Fast.json index b685ff9cf6..b94935638d 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-Fast.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-Fast.json @@ -83,7 +83,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "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-Fast" }, "name": "fetch-gn" }, @@ -96,7 +99,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "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-Fast" }, "name": "gn gen" }, @@ -108,7 +114,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "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-Fast" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-Mesa.json b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-Mesa.json index 98bdad3c04..3602dabffd 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-Mesa.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-Mesa.json @@ -83,7 +83,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "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-Mesa" }, "name": "fetch-gn" }, @@ -96,7 +99,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "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-Mesa" }, "name": "gn gen" }, @@ -108,7 +114,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "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-Mesa" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-Valgrind.json b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-Valgrind.json index 5518f1fdcb..cf56f61059 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-Valgrind.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-GCC-x86_64-Release-Valgrind.json @@ -83,7 +83,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "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-Valgrind" }, "name": "fetch-gn" }, @@ -96,7 +99,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "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-Valgrind" }, "name": "gn gen" }, @@ -108,7 +114,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "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-Valgrind" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86-Debug-ANGLE.json b/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86-Debug-ANGLE.json index 23b7ce282d..422b4a6086 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86-Debug-ANGLE.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86-Debug-ANGLE.json @@ -83,7 +83,10 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-ANGLE" }, "name": "fetch-gn" }, @@ -96,7 +99,10 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-ANGLE" }, "name": "gn gen" }, @@ -108,7 +114,10 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-ANGLE" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86-Debug-Exceptions.json b/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86-Debug-Exceptions.json index ded414c02a..a962003892 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86-Debug-Exceptions.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86-Debug-Exceptions.json @@ -83,7 +83,10 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-Exceptions" }, "name": "fetch-gn" }, @@ -96,7 +99,10 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-Exceptions" }, "name": "gn gen" }, @@ -108,7 +114,10 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-Exceptions" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86-Debug.json b/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86-Debug.json index f22264983b..acceb11a24 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86-Debug.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86-Debug.json @@ -83,7 +83,10 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug" }, "name": "fetch-gn" }, @@ -96,7 +99,10 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug" }, "name": "gn gen" }, @@ -108,7 +114,10 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86-Release-GDI.json b/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86-Release-GDI.json index efefeda886..b0667a596b 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86-Release-GDI.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86-Release-GDI.json @@ -83,7 +83,10 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Release-GDI" }, "name": "fetch-gn" }, @@ -96,7 +99,10 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Release-GDI" }, "name": "gn gen" }, @@ -108,7 +114,10 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Release-GDI" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86-Release-GN.json b/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86-Release-GN.json index 7f19f9162e..90c16c48f8 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86-Release-GN.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86-Release-GN.json @@ -83,7 +83,10 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Release-GN" }, "name": "fetch-gn" }, @@ -96,7 +99,10 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Release-GN" }, "name": "gn gen" }, @@ -108,7 +114,10 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Release-GN" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json b/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json index b344b17e7b..75f81bc695 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json @@ -83,7 +83,10 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Release_x64", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86_64-Release-Vulkan" }, "name": "fetch-gn" }, @@ -96,7 +99,10 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Release_x64", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86_64-Release-Vulkan" }, "name": "gn gen" }, @@ -108,7 +114,10 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Release_x64", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86_64-Release-Vulkan" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/alternate_repo.json b/infra/bots/recipe_modules/compile/example.expected/alternate_repo.json index e29eb782b7..a0145dd668 100644 --- a/infra/bots/recipe_modules/compile/example.expected/alternate_repo.json +++ b/infra/bots/recipe_modules/compile/example.expected/alternate_repo.json @@ -83,7 +83,10 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Release_x64", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86_64-Release-Vulkan" }, "name": "fetch-gn" }, @@ -96,7 +99,10 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Release_x64", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86_64-Release-Vulkan" }, "name": "gn gen" }, @@ -108,7 +114,10 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Release_x64", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86_64-Release-Vulkan" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/big_issue_number.json b/infra/bots/recipe_modules/compile/example.expected/big_issue_number.json index 96c1a692c7..c59e0cdeca 100644 --- a/infra/bots/recipe_modules/compile/example.expected/big_issue_number.json +++ b/infra/bots/recipe_modules/compile/example.expected/big_issue_number.json @@ -89,7 +89,10 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug" }, "name": "fetch-gn" }, @@ -102,7 +105,10 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug" }, "name": "gn gen" }, @@ -114,7 +120,10 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/buildbotless_trybot_gerrit.json b/infra/bots/recipe_modules/compile/example.expected/buildbotless_trybot_gerrit.json index d865d970e2..62acb3c3cb 100644 --- a/infra/bots/recipe_modules/compile/example.expected/buildbotless_trybot_gerrit.json +++ b/infra/bots/recipe_modules/compile/example.expected/buildbotless_trybot_gerrit.json @@ -109,7 +109,10 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug" }, "name": "fetch-gn" }, @@ -122,7 +125,10 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug" }, "name": "gn gen" }, @@ -134,7 +140,10 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/buildbotless_trybot_rietveld.json b/infra/bots/recipe_modules/compile/example.expected/buildbotless_trybot_rietveld.json index d4c15e7f10..5f2951168a 100644 --- a/infra/bots/recipe_modules/compile/example.expected/buildbotless_trybot_rietveld.json +++ b/infra/bots/recipe_modules/compile/example.expected/buildbotless_trybot_rietveld.json @@ -111,7 +111,10 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug" }, "name": "fetch-gn" }, @@ -124,7 +127,10 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug" }, "name": "gn gen" }, @@ -136,7 +142,10 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/compile/example.expected/recipe_with_gerrit_patch.json b/infra/bots/recipe_modules/compile/example.expected/recipe_with_gerrit_patch.json index 5ad00142c8..8be74c8913 100644 --- a/infra/bots/recipe_modules/compile/example.expected/recipe_with_gerrit_patch.json +++ b/infra/bots/recipe_modules/compile/example.expected/recipe_with_gerrit_patch.json @@ -109,7 +109,10 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-Trybot" }, "name": "fetch-gn" }, @@ -122,7 +125,10 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-Trybot" }, "name": "gn gen" }, @@ -134,7 +140,10 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-Trybot" }, "name": "ninja" }, diff --git a/infra/bots/recipe_modules/flavor/gn_flavor.py b/infra/bots/recipe_modules/flavor/gn_flavor.py index 4eaefdfb7f..3e35f44bf2 100644 --- a/infra/bots/recipe_modules/flavor/gn_flavor.py +++ b/infra/bots/recipe_modules/flavor/gn_flavor.py @@ -6,18 +6,11 @@ import default_flavor """GN flavor utils, used for building Skia with GN.""" class GNFlavorUtils(default_flavor.DefaultFlavorUtils): - def _strip_environment(self): - self.m.vars.default_env = {k: v for (k,v) - in self.m.vars.default_env.iteritems() - if k in ['PATH']} - def _run(self, title, cmd, env=None, infra_step=False): - self._strip_environment() self.m.run(self.m.step, title, cmd=cmd, env=env, cwd=self.m.vars.skia_dir, infra_step=infra_step) def _py(self, title, script, env=None, infra_step=True, args=()): - self._strip_environment() self.m.run(self.m.python, title, script=script, args=args, env=env, cwd=self.m.vars.skia_dir, infra_step=infra_step) @@ -131,7 +124,7 @@ class GNFlavorUtils(default_flavor.DefaultFlavorUtils): def step(self, name, cmd, env=None, **kwargs): app = self.m.vars.skia_out.join(self.m.vars.configuration, cmd[0]) cmd = [app] + cmd[1:] - env = {} + env = env or {} clang_linux = str(self.m.vars.slave_dir.join('clang_linux')) extra_config = self.m.vars.builder_cfg.get('extra_config', '') diff --git a/infra/bots/recipe_modules/perf/api.py b/infra/bots/recipe_modules/perf/api.py index 7edd492601..78b83786f7 100644 --- a/infra/bots/recipe_modules/perf/api.py +++ b/infra/bots/recipe_modules/perf/api.py @@ -189,9 +189,26 @@ def perf_steps(api): if not k in keys_blacklist: args.extend([k, api.vars.builder_cfg[k]]) + env = {} + env.update(api.vars.default_env) + if 'Ubuntu' in api.vars.builder_name and 'Vulkan' in api.vars.builder_name: + sdk_path = api.vars.slave_dir.join('linux_vulkan_sdk', 'bin') + lib_path = api.vars.slave_dir.join('linux_vulkan_sdk', 'lib') + dri_path = api.vars.slave_dir.join('linux_vulkan_intel_driver_release') + if 'Debug' in api.vars.builder_name: + dri_path = api.vars.slave_dir.join('linux_vulkan_intel_driver_debug') + + + env.update({ + 'PATH':'%%(PATH)s:%s' % sdk_path, + 'LD_LIBRARY_PATH': lib_path, + 'LIBGL_DRIVERS_PATH':'%s' % dri_path, + 'VK_ICD_FILENAMES':'%s' % dri_path.join('intel_icd.x86_64.json'), + }) + api.run(api.flavor.step, target, cmd=args, abort_on_failure=False, - env=api.vars.default_env) + env=env) # See skia:2789. if ('Valgrind' in api.vars.builder_name and diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN.json index 9492e955a7..7027f7d500 100644 --- a/infra/bots/recipe_modules/perf/example.expected/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN.json +++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN.json @@ -176,6 +176,11 @@ "Mac" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "nanobench" }, { diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json index 16a2734c6e..fea58a9f9d 100644 --- a/infra/bots/recipe_modules/perf/example.expected/Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json +++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json @@ -103,6 +103,11 @@ "~inc1.webp" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "nanobench" }, { diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN.json index 3b4b94c675..52e0017e60 100644 --- a/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN.json +++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN.json @@ -176,6 +176,11 @@ "Ubuntu" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "nanobench" }, { diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-ANGLE.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-ANGLE.json index 7eda498082..a6ecfbbd86 100644 --- a/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-ANGLE.json +++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-ANGLE.json @@ -180,6 +180,11 @@ "Ubuntu" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "nanobench" }, { diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan.json new file mode 100644 index 0000000000..64f742b6ca --- /dev/null +++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan.json @@ -0,0 +1,122 @@ +[ + { + "cmd": [ + "python", + "-u", + "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "[START_DIR]/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", + "[START_DIR]/tmp/SKP_VERSION" + ], + "name": "write SKP_VERSION" + }, + { + "cmd": [ + "python", + "-u", + "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "[START_DIR]/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", + "[START_DIR]/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", + "[START_DIR]/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", + "[START_DIR]/tmp/SVG_VERSION" + ], + "name": "write SVG_VERSION" + }, + { + "cmd": [ + "[START_DIR]/out/Debug/nanobench", + "--undefok", + "-i", + "[START_DIR]/skia/resources", + "--skps", + "[START_DIR]/skp", + "--images", + "[START_DIR]/skimage/nanobench", + "--svgs", + "[START_DIR]/svg", + "--nocpu", + "--pre_log", + "--images", + "--gpuStatsDump", + "true", + "--scales", + "1.0", + "1.1", + "--config", + "vk", + "--match", + "~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" + ], + "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "LD_LIBRARY_PATH": "[START_DIR]/linux_vulkan_sdk/lib", + "LIBGL_DRIVERS_PATH": "[START_DIR]/linux_vulkan_intel_driver_debug", + "PATH": "%(PATH)s:[START_DIR]/linux_vulkan_sdk/bin", + "SKIA_OUT": "[START_DIR]/out", + "VK_ICD_FILENAMES": "[START_DIR]/linux_vulkan_intel_driver_debug/intel_icd.x86_64.json" + }, + "name": "nanobench" + }, + { + "name": "$result", + "recipe_result": null, + "status_code": 0 + } +]
\ No newline at end of file diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug.json index f3fd6492cb..582d2c1a75 100644 --- a/infra/bots/recipe_modules/perf/example.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug.json +++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug.json @@ -109,6 +109,11 @@ "~inc1.webp" ], "cwd": "[START_DIR]\\skia", + "env": { + "BUILDTYPE": "Debug_x64", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]\\out" + }, "name": "nanobench" }, { diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release.json index 9a94744ff1..cd9b96beae 100644 --- a/infra/bots/recipe_modules/perf/example.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release.json +++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release.json @@ -173,6 +173,11 @@ "Win" ], "cwd": "[START_DIR]\\skia", + "env": { + "BUILDTYPE": "Release_x64", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]\\out" + }, "name": "nanobench" }, { diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-ANGLE.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-ANGLE.json index 4db8b0ba3d..f089c468d5 100644 --- a/infra/bots/recipe_modules/perf/example.expected/Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-ANGLE.json +++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-ANGLE.json @@ -179,6 +179,11 @@ "Win10" ], "cwd": "[START_DIR]\\skia", + "env": { + "BUILDTYPE": "Release_x64", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]\\out" + }, "name": "nanobench" }, { diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json index 3e02cdd9f1..7257c29ae2 100644 --- a/infra/bots/recipe_modules/perf/example.expected/Perf-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json +++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json @@ -112,6 +112,11 @@ "~inc1.webp" ], "cwd": "[START_DIR]\\skia", + "env": { + "BUILDTYPE": "Debug_x64", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]\\out" + }, "name": "nanobench" }, { diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json index c743570a0f..9a50aaf9b1 100644 --- a/infra/bots/recipe_modules/perf/example.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json +++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json @@ -181,6 +181,11 @@ "Win8" ], "cwd": "[START_DIR]\\skia", + "env": { + "BUILDTYPE": "Release_x64", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]\\out" + }, "name": "nanobench" }, { diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json b/infra/bots/recipe_modules/perf/example.expected/Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json index 772cbfb291..a14ba4c403 100644 --- a/infra/bots/recipe_modules/perf/example.expected/Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json +++ b/infra/bots/recipe_modules/perf/example.expected/Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json @@ -329,6 +329,11 @@ "[START_DIR]/out/Release/nanobench" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "package nanobench" }, { @@ -341,6 +346,11 @@ "--undefok -i resources --skps skps --images images/nanobench --svgs svgs --nocpu --pre_log --images --gpuStatsDump true --scales 1.0 1.1 --skps ignore_skps --config 8888 gpu nonrendering hwui f16 srgb msaa16 nvpr16 nvprdit16 --match ~blurroundrect ~patch_grid ~desk_carsvg ~keymobi ~path_hairline ~GLInstancedArraysBench ~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 perf/nanobench_abc123_1337000001.json --properties gitHash abc123 build_number 5 --key arch arm compiler Clang cpu_or_gpu GPU cpu_or_gpu_value GX6450 model iPadMini4 os iOS" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "nanobench" }, { @@ -371,6 +381,11 @@ "perf", "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release/data" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "pull_if_needed perf" }, { diff --git a/infra/bots/recipe_modules/perf/example.expected/big_issue_number.json b/infra/bots/recipe_modules/perf/example.expected/big_issue_number.json index 2817618709..8e475f53df 100644 --- a/infra/bots/recipe_modules/perf/example.expected/big_issue_number.json +++ b/infra/bots/recipe_modules/perf/example.expected/big_issue_number.json @@ -181,6 +181,11 @@ "Win8" ], "cwd": "[START_DIR]\\skia", + "env": { + "BUILDTYPE": "Release_x64", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]\\out" + }, "name": "nanobench" }, { diff --git a/infra/bots/recipe_modules/perf/example.expected/nobuildbot.json b/infra/bots/recipe_modules/perf/example.expected/nobuildbot.json index 01b485bc21..080091f328 100644 --- a/infra/bots/recipe_modules/perf/example.expected/nobuildbot.json +++ b/infra/bots/recipe_modules/perf/example.expected/nobuildbot.json @@ -215,6 +215,11 @@ "Win8" ], "cwd": "[START_DIR]\\skia", + "env": { + "BUILDTYPE": "Release_x64", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]\\out" + }, "name": "nanobench" }, { diff --git a/infra/bots/recipe_modules/perf/example.py b/infra/bots/recipe_modules/perf/example.py index f78eadb2da..2bcf6be866 100644 --- a/infra/bots/recipe_modules/perf/example.py +++ b/infra/bots/recipe_modules/perf/example.py @@ -30,8 +30,9 @@ TEST_BUILDERS = { 'Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN', '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-ANGLE', + 'Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind', + 'Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan', 'Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug', 'Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release', 'Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-ANGLE', diff --git a/infra/bots/recipe_modules/run/api.py b/infra/bots/recipe_modules/run/api.py index 0b247c9c0e..11b5863cfb 100644 --- a/infra/bots/recipe_modules/run/api.py +++ b/infra/bots/recipe_modules/run/api.py @@ -75,7 +75,7 @@ class SkiaStepApi(recipe_api.RecipeApi): def __call__(self, steptype, name, abort_on_failure=True, fail_build_on_failure=True, env=None, **kwargs): """Run a step. If it fails, keep going but mark the build status failed.""" - env = dict(env or {}) + env = env or {} env.update(self.m.vars.default_env) try: return steptype(name=name, env=env, **kwargs) diff --git a/infra/bots/recipe_modules/sktest/api.py b/infra/bots/recipe_modules/sktest/api.py index fdc61baa4c..8566db06ac 100644 --- a/infra/bots/recipe_modules/sktest/api.py +++ b/infra/bots/recipe_modules/sktest/api.py @@ -508,9 +508,26 @@ def test_steps(api): args.append(skip_flag) args.extend(dm_flags(api.vars.builder_name)) + env = {} + env.update(api.vars.default_env) + if 'Ubuntu' in api.vars.builder_name and 'Vulkan' in api.vars.builder_name: + sdk_path = api.vars.slave_dir.join('linux_vulkan_sdk', 'bin') + lib_path = api.vars.slave_dir.join('linux_vulkan_sdk', 'lib') + dri_path = api.vars.slave_dir.join('linux_vulkan_intel_driver_release') + if 'Debug' in api.vars.builder_name: + dri_path = api.vars.slave_dir.join('linux_vulkan_intel_driver_debug') + + + env.update({ + 'PATH':'%%(PATH)s:%s' % sdk_path, + 'LD_LIBRARY_PATH': lib_path, + 'LIBGL_DRIVERS_PATH':'%s' % dri_path, + 'VK_ICD_FILENAMES':'%s' % dri_path.join('intel_icd.x86_64.json'), + }) + api.run(api.flavor.step, 'dm', cmd=args, abort_on_failure=False, - env=api.vars.default_env) + env=env) if api.vars.upload_dm_results: # Copy images and JSON to host machine if needed. diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug.json index 84335d6f77..05cca5fc47 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug.json @@ -617,6 +617,11 @@ "blurcircles" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "dm" }, { diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json index 09c180e93b..5d6f40c78e 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json @@ -519,6 +519,11 @@ "complexclip4_aa" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "dm" }, { diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json index 21e42dc0e2..c2b0e5ddd4 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json @@ -414,6 +414,11 @@ ".SRW" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "dm" }, { diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json index 119556e5fb..d50ec58c6a 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json @@ -517,6 +517,11 @@ "complexclip4_aa" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "dm" }, { diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-ASAN.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-ASAN.json index 3691e2d4de..5e6bd8bb96 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-ASAN.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-ASAN.json @@ -400,8 +400,11 @@ "cwd": "[START_DIR]/skia", "env": { "ASAN_OPTIONS": "symbolize=1 detect_leaks=1", + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", "LSAN_OPTIONS": "symbolize=1 print_suppressions=1", "PATH": "%(PATH)s:[START_DIR]/clang_linux/bin", + "SKIA_OUT": "[START_DIR]/out", "UBSAN_OPTIONS": "symbolize=1 print_stacktrace=1" }, "name": "dm" diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json index a7265ad14d..b48160e4d7 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json @@ -402,8 +402,11 @@ ], "cwd": "[START_DIR]/skia", "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", "LD_LIBRARY_PATH": "[START_DIR]/clang_linux/msan", - "PATH": "%(PATH)s:[START_DIR]/clang_linux/bin" + "PATH": "%(PATH)s:[START_DIR]/clang_linux/bin", + "SKIA_OUT": "[START_DIR]/out" }, "name": "dm" }, diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json index c4248ae3db..9723400115 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json @@ -515,6 +515,11 @@ "complexclip4_aa" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "dm" }, { diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json index 7a822cd1b7..0bc6d73b5f 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json @@ -517,6 +517,11 @@ "complexclip4_aa" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "dm" }, { diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json index 111c924432..bba45c1c69 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json @@ -403,7 +403,10 @@ ], "cwd": "[START_DIR]/skia", "env": { - "PATH": "%(PATH)s:[START_DIR]/clang_linux/bin" + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:[START_DIR]/clang_linux/bin", + "SKIA_OUT": "[START_DIR]/out" }, "name": "dm" }, diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan.json new file mode 100644 index 0000000000..4fe7ed4dd9 --- /dev/null +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan.json @@ -0,0 +1,341 @@ +[ + { + "cmd": [ + "python", + "-u", + "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "[START_DIR]/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", + "[START_DIR]/tmp/SKP_VERSION" + ], + "name": "write SKP_VERSION" + }, + { + "cmd": [ + "python", + "-u", + "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "[START_DIR]/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", + "[START_DIR]/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", + "[START_DIR]/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", + "[START_DIR]/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]]/dm" + ], + "env": { + "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" + }, + "name": "rmtree dm", + "~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]]/dm", + "511" + ], + "name": "makedirs dm", + "~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", + "\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", + "[START_DIR]/tmp", + "511" + ], + "name": "makedirs tmp_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@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[1], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", + "[START_DIR]/tmp/uninteresting_hashes.txt" + ], + "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]/out" + }, + "name": "get uninteresting hashes", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import contextlib@@@", + "@@@STEP_LOG_LINE@python.inline@import math@@@", + "@@@STEP_LOG_LINE@python.inline@import socket@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@import time@@@", + "@@@STEP_LOG_LINE@python.inline@import urllib2@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@HASHES_URL = 'https://gold.skia.org/_/hashes'@@@", + "@@@STEP_LOG_LINE@python.inline@RETRIES = 5@@@", + "@@@STEP_LOG_LINE@python.inline@TIMEOUT = 60@@@", + "@@@STEP_LOG_LINE@python.inline@WAIT_BASE = 15@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@socket.setdefaulttimeout(TIMEOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@for retry in range(RETRIES):@@@", + "@@@STEP_LOG_LINE@python.inline@ try:@@@", + "@@@STEP_LOG_LINE@python.inline@ with contextlib.closing(@@@", + "@@@STEP_LOG_LINE@python.inline@ urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:@@@", + "@@@STEP_LOG_LINE@python.inline@ hashes = w.read()@@@", + "@@@STEP_LOG_LINE@python.inline@ with open(sys.argv[1], 'w') as f:@@@", + "@@@STEP_LOG_LINE@python.inline@ f.write(hashes)@@@", + "@@@STEP_LOG_LINE@python.inline@ break@@@", + "@@@STEP_LOG_LINE@python.inline@ except Exception as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ print 'Failed to get uninteresting hashes from %s:' % HASHES_URL@@@", + "@@@STEP_LOG_LINE@python.inline@ print e@@@", + "@@@STEP_LOG_LINE@python.inline@ if retry == RETRIES:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise@@@", + "@@@STEP_LOG_LINE@python.inline@ waittime = WAIT_BASE * math.pow(2, retry)@@@", + "@@@STEP_LOG_LINE@python.inline@ print 'Retry in %d seconds.' % waittime@@@", + "@@@STEP_LOG_LINE@python.inline@ time.sleep(waittime)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] + }, + { + "cmd": [ + "[START_DIR]/out/Debug/dm", + "--undefok", + "--resourcePath", + "[START_DIR]/skia/resources", + "--skps", + "[START_DIR]/skp", + "--images", + "[START_DIR]/skimage/dm", + "--colorImages", + "[START_DIR]/skimage/colorspace", + "--nameByHash", + "--properties", + "gitHash", + "abc123", + "master", + "client.skia", + "builder", + "Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan", + "build_number", + "5", + "--svgs", + "[START_DIR]/svg", + "--key", + "arch", + "x86_64", + "compiler", + "Clang", + "configuration", + "Debug", + "cpu_or_gpu", + "GPU", + "cpu_or_gpu_value", + "IntelIris540", + "extra_config", + "Vulkan", + "model", + "NUC", + "os", + "Ubuntu16", + "--uninterestingHashesFile", + "[START_DIR]/tmp/uninteresting_hashes.txt", + "--writePath", + "[CUSTOM_[SWARM_OUT_DIR]]/dm", + "--nocpu", + "--config", + "vk", + "--src", + "tests", + "gm", + "image", + "colorImage", + "svg", + "--blacklist", + "_", + "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" + ], + "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "LD_LIBRARY_PATH": "[START_DIR]/linux_vulkan_sdk/lib", + "LIBGL_DRIVERS_PATH": "[START_DIR]/linux_vulkan_intel_driver_debug", + "PATH": "%(PATH)s:[START_DIR]/linux_vulkan_sdk/bin", + "SKIA_OUT": "[START_DIR]/out", + "VK_ICD_FILENAMES": "[START_DIR]/linux_vulkan_intel_driver_debug/intel_icd.x86_64.json" + }, + "name": "dm" + }, + { + "name": "$result", + "recipe_result": null, + "status_code": 0 + } +]
\ No newline at end of file diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-ANGLE.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-ANGLE.json index 4472f5443d..bcd253b1eb 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-ANGLE.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-ANGLE.json @@ -372,6 +372,11 @@ "~IntTexture" ], "cwd": "[START_DIR]\\skia", + "env": { + "BUILDTYPE": "Debug_x64", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]\\out" + }, "name": "dm" }, { diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan.json index b44fc614c1..eb60928728 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan.json @@ -366,6 +366,11 @@ ".SRW" ], "cwd": "[START_DIR]\\skia", + "env": { + "BUILDTYPE": "Debug_x64", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]\\out" + }, "name": "dm" }, { diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-Vulkan.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-Vulkan.json index 0e17c8c4d5..fbf034e606 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-Vulkan.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-Vulkan.json @@ -368,6 +368,11 @@ "~GPUMemorySize" ], "cwd": "[START_DIR]\\skia", + "env": { + "BUILDTYPE": "Debug_x64", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]\\out" + }, "name": "dm" }, { diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json index 1801ba154b..f32a5f2a1b 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json @@ -504,6 +504,11 @@ "--noRAW_threading" ], "cwd": "[START_DIR]\\skia", + "env": { + "BUILDTYPE": "Release_x64", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]\\out" + }, "name": "dm" }, { diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json index 7b5a76d0f5..d772e31f88 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json @@ -380,6 +380,11 @@ "--noRAW_threading" ], "cwd": "[START_DIR]\\skia", + "env": { + "BUILDTYPE": "Debug_x64", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]\\out" + }, "name": "dm" }, { diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json b/infra/bots/recipe_modules/sktest/example.expected/Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json index f9fc56e059..a0d1404cc7 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json @@ -456,6 +456,11 @@ "[START_DIR]/out/Release/dm" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "package dm" }, { @@ -468,6 +473,11 @@ "--undefok --resourcePath resources --skps skps --images images/dm --colorImages images/colorspace --nameByHash --properties gitHash abc123 master client.skia builder Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release build_number 5 --svgs svgs --key arch arm compiler Clang configuration Release cpu_or_gpu GPU cpu_or_gpu_value GX6450 model iPadMini4 os iOS --uninterestingHashesFile tmp/uninteresting_hashes.txt --writePath dm --nocpu --config 8888 srgb gpu gpudft gpusrgb pdf msaa4 serialize-8888 tiles_rt-8888 pic-8888 --src tests gm image colorImage svg --blacklist gpusrgb image _ _ 8888 image _ _ gpu skp _ _ _ 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 _ image gen_platf inc0.png _ image gen_platf inc1.png _ image gen_platf inc2.png _ image gen_platf inc3.png _ image gen_platf inc4.png _ image gen_platf inc5.png _ image gen_platf inc6.png _ image gen_platf inc7.png _ image gen_platf inc8.png _ image gen_platf inc9.png _ image gen_platf inc10.png _ image gen_platf inc11.png _ image gen_platf inc12.png _ image gen_platf inc13.png _ image gen_platf inc14.png _ 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 _ imagemasksubset 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 _ typefacerendering_pfaMac serialize-8888 gm _ parsedpaths serialize-8888 gm _ ImageGeneratorExternal_rect serialize-8888 gm _ ImageGeneratorExternal_shader serialize-8888 gm _ shadow_utils serialize-8888 gm _ bleed_alpha_image serialize-8888 gm _ bleed_alpha_image_shader pic-8888 gm _ drawfilter pic-8888 gm _ image-cacherator-from-picture serialize-8888 gm _ image-cacherator-from-picture pic-8888 gm _ image-cacherator-from-raster serialize-8888 gm _ image-cacherator-from-raster pic-8888 gm _ image-cacherator-from-ctable serialize-8888 gm _ image-cacherator-from-ctable pic-8888 gm _ gamut serialize-8888 gm _ gamut pic-8888 gm _ complexclip4_bw serialize-8888 gm _ complexclip4_bw pic-8888 gm _ complexclip4_aa serialize-8888 gm _ complexclip4_aa tiles_rt-8888 gm _ complexclip4_bw tiles_rt-8888 gm _ complexclip4_aa _ 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" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "dm" }, { @@ -476,6 +486,11 @@ "dm", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "pull_if_needed dm" }, { diff --git a/infra/bots/recipe_modules/sktest/example.expected/big_issue_number.json b/infra/bots/recipe_modules/sktest/example.expected/big_issue_number.json index 528fd87285..152268d4ab 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/big_issue_number.json +++ b/infra/bots/recipe_modules/sktest/example.expected/big_issue_number.json @@ -504,6 +504,11 @@ "--noRAW_threading" ], "cwd": "[START_DIR]\\skia", + "env": { + "BUILDTYPE": "Release_x64", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]\\out" + }, "name": "dm" }, { diff --git a/infra/bots/recipe_modules/sktest/example.expected/failed_dm.json b/infra/bots/recipe_modules/sktest/example.expected/failed_dm.json index ae725b12b5..50340337e9 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/failed_dm.json +++ b/infra/bots/recipe_modules/sktest/example.expected/failed_dm.json @@ -515,6 +515,11 @@ "complexclip4_aa" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "dm", "~followup_annotations": [ "step returned non-zero exit code: 1", diff --git a/infra/bots/recipe_modules/sktest/example.expected/nobuildbot.json b/infra/bots/recipe_modules/sktest/example.expected/nobuildbot.json index ea110357f8..2c5192076f 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/nobuildbot.json +++ b/infra/bots/recipe_modules/sktest/example.expected/nobuildbot.json @@ -555,6 +555,11 @@ "complexclip4_aa" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "dm" }, { diff --git a/infra/bots/recipe_modules/sktest/example.expected/recipe_with_gerrit_patch.json b/infra/bots/recipe_modules/sktest/example.expected/recipe_with_gerrit_patch.json index da52db91c1..30e76ad2a6 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/recipe_with_gerrit_patch.json +++ b/infra/bots/recipe_modules/sktest/example.expected/recipe_with_gerrit_patch.json @@ -521,6 +521,11 @@ "complexclip4_aa" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "dm" }, { diff --git a/infra/bots/recipe_modules/sktest/example.py b/infra/bots/recipe_modules/sktest/example.py index cae0961a78..1172193f45 100644 --- a/infra/bots/recipe_modules/sktest/example.py +++ b/infra/bots/recipe_modules/sktest/example.py @@ -41,6 +41,7 @@ TEST_BUILDERS = { 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared', 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN', 'Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind', + 'Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan', 'Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-ANGLE', 'Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan', 'Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-Vulkan', diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-Arm7-Release.json b/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-Arm7-Release.json index 406ad39000..4eb1f0dfe7 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-Arm7-Release.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Mac-Clang-Arm7-Release.json @@ -83,7 +83,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-Arm7-Release-iOS" }, "name": "fetch-gn" }, @@ -96,7 +99,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-Arm7-Release-iOS" }, "name": "gn gen" }, @@ -108,7 +114,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-Arm7-Release-iOS" }, "name": "ninja" }, diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json index 6e268a73da..89d4437692 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json @@ -105,7 +105,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" }, "name": "fetch-gn" }, @@ -118,7 +121,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" }, "name": "gn gen" }, @@ -130,7 +136,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" }, "name": "ninja" }, diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_100k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_100k_SKPs.json index 6ad5b04f2f..ee4d8dbd0d 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_100k_SKPs.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_100k_SKPs.json @@ -105,7 +105,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" }, "name": "fetch-gn" }, @@ -118,7 +121,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" }, "name": "gn gen" }, @@ -130,7 +136,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" }, "name": "ninja" }, diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs.json index 698899b708..007b73b652 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs.json @@ -105,7 +105,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" }, "name": "fetch-gn" }, @@ -118,7 +121,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" }, "name": "gn gen" }, @@ -130,7 +136,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" }, "name": "ninja" }, diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs_Trybot.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs_Trybot.json index 3718c73961..0cf347244c 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs_Trybot.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs_Trybot.json @@ -111,7 +111,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" }, "name": "fetch-gn" }, @@ -124,7 +127,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" }, "name": "gn gen" }, @@ -136,7 +142,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" }, "name": "ninja" }, diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs.json index cc5efa0738..37db16c8d4 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs.json @@ -105,7 +105,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" }, "name": "fetch-gn" }, @@ -118,7 +121,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" }, "name": "gn gen" }, @@ -130,7 +136,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" }, "name": "ninja" }, diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json index b20aa2a170..01be8bbe8c 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json @@ -105,7 +105,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" }, "name": "fetch-gn" }, @@ -118,7 +121,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" }, "name": "gn gen" }, @@ -130,7 +136,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" }, "name": "ninja" }, diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json index 0ea9f53fb0..8d476743d0 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json @@ -105,7 +105,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" }, "name": "fetch-gn" }, @@ -118,7 +121,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" }, "name": "gn gen" }, @@ -130,7 +136,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" }, "name": "ninja" }, diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json index 11a298b8b8..fea21fc343 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json @@ -105,7 +105,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" }, "name": "fetch-gn" }, @@ -118,7 +121,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" }, "name": "gn gen" }, @@ -130,7 +136,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" }, "name": "ninja" }, diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json index 27b55e139e..04ee768813 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json @@ -105,7 +105,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" }, "name": "fetch-gn" }, @@ -118,7 +121,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" }, "name": "gn gen" }, @@ -130,7 +136,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" }, "name": "ninja" }, diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json index c7a3e219ea..a8e5c19d0b 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json @@ -105,7 +105,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" }, "name": "fetch-gn" }, @@ -118,7 +121,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" }, "name": "gn gen" }, @@ -130,7 +136,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" }, "name": "ninja" }, diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json index 3ad4ae4bb6..212d21fede 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json @@ -105,7 +105,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" }, "name": "fetch-gn" }, @@ -118,7 +121,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" }, "name": "gn gen" }, @@ -130,7 +136,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" }, "name": "ninja" }, diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json index 76b7068865..501e50b486 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json @@ -105,7 +105,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" }, "name": "fetch-gn" }, @@ -118,7 +121,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" }, "name": "gn gen" }, @@ -130,7 +136,10 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[START_DIR]/out" }, "name": "ninja" }, diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release.json b/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release.json index 64bc9ad556..4a31c25377 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release.json @@ -174,6 +174,11 @@ "Ubuntu" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "nanobench" }, { 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 8709994599..0714a75e54 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 @@ -517,6 +517,11 @@ "complexclip4_aa" ], "cwd": "[START_DIR]/skia", + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]/out" + }, "name": "dm" }, { diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json index 148c181fe2..456aa1b0a5 100644 --- a/infra/bots/tasks.json +++ b/infra/bots/tasks.json @@ -6481,6 +6481,16 @@ "name": "skia/bots/svg", "path": "svg", "version": "version:3" + }, + { + "name": "skia/bots/linux_vulkan_sdk", + "path": "linux_vulkan_sdk", + "version": "version:0" + }, + { + "name": "skia/bots/linux_vulkan_intel_driver_debug", + "path": "linux_vulkan_intel_driver_debug", + "version": "version:0" } ], "dependencies": [ @@ -6577,6 +6587,16 @@ "name": "skia/bots/svg", "path": "svg", "version": "version:3" + }, + { + "name": "skia/bots/linux_vulkan_sdk", + "path": "linux_vulkan_sdk", + "version": "version:0" + }, + { + "name": "skia/bots/linux_vulkan_intel_driver_release", + "path": "linux_vulkan_intel_driver_release", + "version": "version:0" } ], "dependencies": [ @@ -11396,6 +11416,16 @@ "name": "skia/bots/svg", "path": "svg", "version": "version:3" + }, + { + "name": "skia/bots/linux_vulkan_sdk", + "path": "linux_vulkan_sdk", + "version": "version:0" + }, + { + "name": "skia/bots/linux_vulkan_intel_driver_debug", + "path": "linux_vulkan_intel_driver_debug", + "version": "version:0" } ], "dependencies": [ @@ -11492,6 +11522,16 @@ "name": "skia/bots/svg", "path": "svg", "version": "version:3" + }, + { + "name": "skia/bots/linux_vulkan_sdk", + "path": "linux_vulkan_sdk", + "version": "version:0" + }, + { + "name": "skia/bots/linux_vulkan_intel_driver_release", + "path": "linux_vulkan_intel_driver_release", + "version": "version:0" } ], "dependencies": [ |