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

Remove some non-inclusive language in recipes

Browse Source 
Bug: chromium:1101491
Bug: b/161896447

Change-Id: I84854612611cbf191ad286853b9069978d5e1dd7
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/307231
Reviewed-by: Leon Scroggins <scroggo@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
This commit is contained in:
Eric Boren 2020-07-31 14:50:39 -04:00 committed by Skia Commit-Bot
parent 982fff264d
commit 8e77631a80
16 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
infra/bots/recipe_modules/build/android.py
View File

@ -32,7 +32,7 @@ def compile_fn(api, checkout_root, out_dir):
quote = lambda x: '"%s"' % x
args = {
'ndk': quote(api.vars.slave_dir.join(ndk_path)),
'ndk': quote(api.vars.workdir.join(ndk_path)),
'target_cpu': quote(target_arch),
'werror': 'true',
}
@ -79,8 +79,8 @@ def compile_fn(api, checkout_root, out_dir):
# Build the APK.
ndk_asset = 'android_ndk_linux'
sdk_asset = 'android_sdk_linux'
android_ndk = api.vars.slave_dir.join(ndk_asset)
android_home = api.vars.slave_dir.join(sdk_asset, 'android-sdk')
android_ndk = api.vars.workdir.join(ndk_asset)
android_home = api.vars.workdir.join(sdk_asset, 'android-sdk')
env = {
'ANDROID_NDK': android_ndk,
'ANDROID_HOME': android_home,

2
infra/bots/recipe_modules/build/chromebook.py
View File

@ -21,7 +21,7 @@ def compile_fn(api, checkout_root, out_dir):
# Currently we mount this directory to /SRC in Docker.
# TODO(westont): Add docker module API to match binding to actual structure.
top_level = '/SRC' if 'Docker' in builder_name else str(api.vars.slave_dir)
top_level = '/SRC' if 'Docker' in builder_name else str(api.vars.workdir)
clang_linux = os.path.join(top_level, 'clang_linux')
# This is a pretty typical arm-linux-gnueabihf sysroot

24
infra/bots/recipe_modules/build/default.py
View File

@ -31,7 +31,7 @@ def compile_swiftshader(api, extra_tokens, swiftshader_root, cc, cxx, out):
'-DSWIFTSHADER_BUILD_TESTS=OFF',
'-DSWIFTSHADER_WARNINGS_AS_ERRORS=0',
]
cmake_bin = str(api.vars.slave_dir.join('cmake_linux', 'bin'))
cmake_bin = str(api.vars.workdir.join('cmake_linux', 'bin'))
env = {
'CC': cc,
'CXX': cxx,
@ -47,7 +47,7 @@ def compile_swiftshader(api, extra_tokens, swiftshader_root, cc, cxx, out):
if san:
short,full = san
clang_linux = str(api.vars.slave_dir.join('clang_linux'))
clang_linux = str(api.vars.workdir.join('clang_linux'))
libcxx = clang_linux + '/' + short
cflags = ' '.join([
'-fsanitize=' + full,
@ -80,8 +80,8 @@ def compile_fn(api, checkout_root, out_dir):
os = api.vars.builder_cfg.get('os', '')
target_arch = api.vars.builder_cfg.get('target_arch', '')
clang_linux = str(api.vars.slave_dir.join('clang_linux'))
win_toolchain = str(api.vars.slave_dir.join('win_toolchain'))
clang_linux = str(api.vars.workdir.join('clang_linux'))
win_toolchain = str(api.vars.workdir.join('win_toolchain'))
cc, cxx, ccache = None, None, None
extra_cflags = []
@ -99,7 +99,7 @@ def compile_fn(api, checkout_root, out_dir):
XCODE_BUILD_VERSION = '11e503a'
extra_cflags.append(
'-DDUMMY_xcode_build_version=%s' % XCODE_BUILD_VERSION)
mac_toolchain_cmd = api.vars.slave_dir.join(
mac_toolchain_cmd = api.vars.workdir.join(
'mac_toolchain', 'mac_toolchain')
xcode_app_path = api.vars.cache_dir.join('Xcode.app')
# Copied from
@ -139,12 +139,12 @@ def compile_fn(api, checkout_root, out_dir):
# ccache + clang-tidy.sh chokes on the argument list.
if (api.vars.is_linux or os == 'Mac' or os == 'Mac10.15.5') and 'Tidy' not in extra_tokens:
if api.vars.is_linux:
ccache = api.vars.slave_dir.join('ccache_linux', 'bin', 'ccache')
ccache = api.vars.workdir.join('ccache_linux', 'bin', 'ccache')
# As of 2020-02-07, the sum of each Debian10-Clang-x86
# non-flutter/android/chromebook build takes less than 75G cache space.
env['CCACHE_MAXSIZE'] = '75G'
else:
ccache = api.vars.slave_dir.join('ccache_mac', 'bin', 'ccache')
ccache = api.vars.workdir.join('ccache_mac', 'bin', 'ccache')
# As of 2020-02-10, the sum of each Build-Mac-Clang- non-android build
# takes ~30G cache space.
env['CCACHE_MAXSIZE'] = '50G'
@ -280,12 +280,12 @@ def compile_fn(api, checkout_root, out_dir):
args['skia_use_opencl'] = 'true'
if api.vars.is_linux:
extra_cflags.append(
'-isystem%s' % api.vars.slave_dir.join('opencl_headers'))
'-isystem%s' % api.vars.workdir.join('opencl_headers'))
extra_ldflags.append(
'-L%s' % api.vars.slave_dir.join('opencl_ocl_icd_linux'))
'-L%s' % api.vars.workdir.join('opencl_ocl_icd_linux'))
elif 'Win' in os:
extra_cflags.append(
'-imsvc%s' % api.vars.slave_dir.join('opencl_headers'))
'-imsvc%s' % api.vars.workdir.join('opencl_headers'))
extra_ldflags.append(
'/LIBPATH:%s' %
skia_dir.join('third_party', 'externals', 'opencl-lib', '3-0', 'lib',
@ -294,11 +294,11 @@ def compile_fn(api, checkout_root, out_dir):
# Bots use Chromium signing cert.
args['skia_ios_identity'] = '".*GS9WA.*"'
# Get mobileprovision via the CIPD package.
args['skia_ios_profile'] = '"%s"' % api.vars.slave_dir.join(
args['skia_ios_profile'] = '"%s"' % api.vars.workdir.join(
'provisioning_profile_ios',
'Upstream_Testing_Provisioning_Profile.mobileprovision')
if compiler == 'Clang' and 'Win' in os:
args['clang_win'] = '"%s"' % api.vars.slave_dir.join('clang_win')
args['clang_win'] = '"%s"' % api.vars.workdir.join('clang_win')
extra_cflags.append('-DDUMMY_clang_win_version=%s' %
api.run.asset_version('clang_win', skia_dir))

2
infra/bots/recipe_modules/flavor/android.py
View File

@ -348,7 +348,7 @@ if actual_freq != str(freq):
def _asan_setup_path(self):
return self.m.vars.slave_dir.join(
return self.m.vars.workdir.join(
'android_ndk_linux', 'toolchains', 'llvm', 'prebuilt', 'linux-x86_64',
'lib64', 'clang', '9.0.8', 'bin', 'asan_device_setup')

22
infra/bots/recipe_modules/flavor/default.py
View File

@ -127,22 +127,22 @@ class DefaultFlavor(object):
path = []
ld_library_path = []
slave_dir = self.m.vars.slave_dir
clang_linux = str(slave_dir.join('clang_linux'))
workdir = self.m.vars.workdir
clang_linux = str(workdir.join('clang_linux'))
extra_tokens = self.m.vars.extra_tokens
if self.m.vars.is_linux:
if (self.m.vars.builder_cfg.get('cpu_or_gpu', '') == 'GPU'
and 'Intel' in self.m.vars.builder_cfg.get('cpu_or_gpu_value', '')):
dri_path = slave_dir.join('mesa_intel_driver_linux')
dri_path = workdir.join('mesa_intel_driver_linux')
ld_library_path.append(dri_path)
env['LIBGL_DRIVERS_PATH'] = str(dri_path)
env['VK_ICD_FILENAMES'] = str(dri_path.join('intel_icd.x86_64.json'))
if 'Vulkan' in extra_tokens:
env['VULKAN_SDK'] = str(slave_dir.join('linux_vulkan_sdk'))
path.append(slave_dir.join('linux_vulkan_sdk', 'bin'))
ld_library_path.append(slave_dir.join('linux_vulkan_sdk', 'lib'))
env['VULKAN_SDK'] = str(workdir.join('linux_vulkan_sdk'))
path.append(workdir.join('linux_vulkan_sdk', 'bin'))
ld_library_path.append(workdir.join('linux_vulkan_sdk', 'lib'))
# Enable layers for Debug only to avoid affecting perf results on
# Release.
# ASAN reports leaks in the Vulkan SDK when the debug layer is enabled.
@ -150,15 +150,15 @@ class DefaultFlavor(object):
if (self.m.vars.builder_cfg.get('configuration', '') != 'Release' and
'ASAN' not in extra_tokens and
'TSAN' not in extra_tokens):
env['VK_LAYER_PATH'] = str(slave_dir.join(
env['VK_LAYER_PATH'] = str(workdir.join(
'linux_vulkan_sdk', 'etc', 'vulkan', 'explicit_layer.d'))
if 'OpenCL' in extra_tokens:
ld_library_path.append(slave_dir.join('opencl_ocl_icd_linux'))
ld_library_path.append(workdir.join('opencl_ocl_icd_linux'))
# TODO(dogben): Limit to the appropriate GPUs when we start running on
# GPUs other than IntelIris640.
# Skylake and later use the NEO driver.
neo_path = slave_dir.join('opencl_intel_neo_linux')
neo_path = workdir.join('opencl_intel_neo_linux')
ld_library_path.append(neo_path)
# Generate vendors dir contaning the ICD file pointing to the NEO OpenCL
# library.
@ -191,7 +191,7 @@ class DefaultFlavor(object):
elif 'ProcDump' in extra_tokens:
dumps_dir = self.m.path.join(self.m.vars.swarming_out_dir, 'dumps')
self.m.file.ensure_directory('makedirs dumps', dumps_dir)
procdump = str(self.m.vars.slave_dir.join('procdump_win',
procdump = str(self.m.vars.workdir.join('procdump_win',
'procdump64.exe'))
# Full docs for ProcDump here:
# https://docs.microsoft.com/en-us/sysinternals/downloads/procdump
@ -242,7 +242,7 @@ class DefaultFlavor(object):
if name in to_symbolize and self.m.vars.is_linux:
# Convert path objects or placeholders into strings such that they can
# be passed to symbolize_stack_trace.py
args = [slave_dir] + [str(x) for x in cmd]
args = [workdir] + [str(x) for x in cmd]
with self.m.context(cwd=self.m.path['start_dir'].join('skia'), env=env):
self._py('symbolized %s' % name,
self.module.resource('symbolize_stack_trace.py'),

2
infra/bots/recipe_modules/flavor/ios.py
View File

@ -29,7 +29,7 @@ class iOSFlavor(default.DefaultFlavor):
def env(self):
return {
'IOS_BUNDLE_ID': 'com.google.%s' % self.app_name,
'IOS_MOUNT_POINT': self.m.vars.slave_dir.join('mnt_iosdevice'),
'IOS_MOUNT_POINT': self.m.vars.workdir.join('mnt_iosdevice'),
}
def context(self):

2
infra/bots/recipe_modules/flavor/valgrind.py
View File

@ -14,7 +14,7 @@ class ValgrindFlavor(default.DefaultFlavor):
super(ValgrindFlavor, self).__init__(m, app_name)
self._suppressions_file = self.m.path['start_dir'].join(
'skia', 'tools', 'valgrind.supp')
self._valgrind_cipd_dir = self.m.vars.slave_dir.join('valgrind')
self._valgrind_cipd_dir = self.m.vars.workdir.join('valgrind')
self._valgrind_fake_dir = self._valgrind_cipd_dir
self._valgrind = self._valgrind_fake_dir.join('bin', 'valgrind')
self._lib_dir = self._valgrind_fake_dir.join('lib', 'valgrind')

2
infra/bots/recipe_modules/infra/api.py
View File

@ -14,7 +14,7 @@ UPLOAD_ATTEMPTS = 5
class InfraApi(recipe_api.RecipeApi):
@property
def goroot(self):
return self.m.vars.slave_dir.join('go', 'go')
return self.m.vars.workdir.join('go', 'go')
@property
def go_bin(self):

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

@ -27,10 +27,10 @@ class SkiaVarsApi(recipe_api.RecipeApi):
# Setup
self.builder_name = self.m.properties['buildername']
self.slave_dir = self.m.path['start_dir']
self.workdir = self.m.path['start_dir']
# Special input/output directories.
self.build_dir = self.slave_dir.join('build')
self.build_dir = self.workdir.join('build')
self.default_env = self.m.context.env
self.default_env['CHROME_HEADLESS'] = '1'
@ -38,9 +38,9 @@ class SkiaVarsApi(recipe_api.RecipeApi):
self.default_env.get('PATH', '%(PATH)s'),
str(self.m.bot_update.repo_resource()),
])
self.cache_dir = self.slave_dir.join('cache')
self.cache_dir = self.workdir.join('cache')
self.swarming_out_dir = self.slave_dir.join(
self.swarming_out_dir = self.workdir.join(
self.m.properties.get('swarm_out_dir', 'tmp'))
self.tmp_dir = self.m.path['start_dir'].join('tmp')

4
infra/bots/recipe_modules/vars/examples/full.expected/Build-Debian10-Clang-x86_64-Release-SKNX_NO_SIMD.json
View File

@ -43,9 +43,9 @@
"@@@SET_BUILD_PROPERTY@patch_storage@\"gerrit\"@@@",
"@@@SET_BUILD_PROPERTY@patchset@\"None\"@@@",
"@@@SET_BUILD_PROPERTY@role@\"Build\"@@@",
"@@@SET_BUILD_PROPERTY@slave_dir@\"[START_DIR]\"@@@",
"@@@SET_BUILD_PROPERTY@swarming_out_dir@\"[START_DIR]/[SWARM_OUT_DIR]\"@@@",
"@@@SET_BUILD_PROPERTY@tmp_dir@\"[START_DIR]/tmp\"@@@"
"@@@SET_BUILD_PROPERTY@tmp_dir@\"[START_DIR]/tmp\"@@@",
"@@@SET_BUILD_PROPERTY@workdir@\"[START_DIR]\"@@@"
]
},
{

4
infra/bots/recipe_modules/vars/examples/full.expected/Housekeeper-Weekly-RecreateSKPs.json
View File

@ -43,9 +43,9 @@
"@@@SET_BUILD_PROPERTY@patch_storage@\"gerrit\"@@@",
"@@@SET_BUILD_PROPERTY@patchset@\"None\"@@@",
"@@@SET_BUILD_PROPERTY@role@\"Housekeeper\"@@@",
"@@@SET_BUILD_PROPERTY@slave_dir@\"[START_DIR]\"@@@",
"@@@SET_BUILD_PROPERTY@swarming_out_dir@\"[START_DIR]/[SWARM_OUT_DIR]\"@@@",
"@@@SET_BUILD_PROPERTY@tmp_dir@\"[START_DIR]/tmp\"@@@"
"@@@SET_BUILD_PROPERTY@tmp_dir@\"[START_DIR]/tmp\"@@@",
"@@@SET_BUILD_PROPERTY@workdir@\"[START_DIR]\"@@@"
]
},
{

4
infra/bots/recipe_modules/vars/examples/full.expected/integer_issue.json
View File

@ -43,9 +43,9 @@
"@@@SET_BUILD_PROPERTY@patch_storage@\"gerrit\"@@@",
"@@@SET_BUILD_PROPERTY@patchset@\"None\"@@@",
"@@@SET_BUILD_PROPERTY@role@\"Upload\"@@@",
"@@@SET_BUILD_PROPERTY@slave_dir@\"[START_DIR]\"@@@",
"@@@SET_BUILD_PROPERTY@swarming_out_dir@\"[START_DIR]/tmp\"@@@",
"@@@SET_BUILD_PROPERTY@tmp_dir@\"[START_DIR]/tmp\"@@@"
"@@@SET_BUILD_PROPERTY@tmp_dir@\"[START_DIR]/tmp\"@@@",
"@@@SET_BUILD_PROPERTY@workdir@\"[START_DIR]\"@@@"
]
},
{

4
infra/bots/recipe_modules/vars/examples/full.expected/win_test.json
View File

@ -43,9 +43,9 @@
"@@@SET_BUILD_PROPERTY@patch_storage@\"gerrit\"@@@",
"@@@SET_BUILD_PROPERTY@patchset@\"12\"@@@",
"@@@SET_BUILD_PROPERTY@role@\"Test\"@@@",
"@@@SET_BUILD_PROPERTY@slave_dir@\"[START_DIR]\"@@@",
"@@@SET_BUILD_PROPERTY@swarming_out_dir@\"[START_DIR]\\\\[SWARM_OUT_DIR]\"@@@",
"@@@SET_BUILD_PROPERTY@tmp_dir@\"[START_DIR]\\\\tmp\"@@@"
"@@@SET_BUILD_PROPERTY@tmp_dir@\"[START_DIR]\\\\tmp\"@@@",
"@@@SET_BUILD_PROPERTY@workdir@\"[START_DIR]\"@@@"
]
},
{

2
infra/bots/recipe_modules/vars/examples/full.py
View File

@ -36,7 +36,7 @@ def RunSteps(api):
'patch_storage',
'patchset',
'role',
'slave_dir',
'workdir',
'swarming_out_dir',
'tmp_dir',
]:

2
infra/bots/recipes/skpbench.py
View File

@ -47,7 +47,7 @@ def skpbench_steps(api):
app = api.vars.build_dir.join('skpbench')
_adb(api, 'push skpbench', 'push', app, api.flavor.device_dirs.bin_dir)
skpbench_dir = api.vars.slave_dir.join('skia', 'tools', 'skpbench')
skpbench_dir = api.vars.workdir.join('skia', 'tools', 'skpbench')
table = api.path.join(api.vars.swarming_out_dir, 'table')
if 'Vulkan' in api.vars.builder_name:

2
infra/bots/recipes/test_lottie_web.py
View File

@ -26,7 +26,7 @@ def RunSteps(api):
api.vars.setup()
checkout_root = api.path['start_dir']
out_dir = api.vars.swarming_out_dir
lottie_files_src = api.vars.slave_dir.join('lottie-samples')
lottie_files_src = api.vars.workdir.join('lottie-samples')
lottie_files_dir = '/tmp/lottie_files'
# The lottie-web repo is DEP'd in. This links to its build directory
# to make finding the lottie.min.js easier to reference from inside