scripts/slave/recipe_modules/skia/default_flavor.py - Issue 1916263003: Reland "Skia: Maintain a checkout on swarming (compile) bots"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: scripts/slave/recipe_modules/skia/default_flavor.py

Issue 1916263003: Reland "Skia: Maintain a checkout on swarming (compile) bots" (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master

Patch Set: Fix expectations after roll Created 4 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: scripts/slave/recipe_modules/skia/default_flavor.py

diff --git a/scripts/slave/recipe_modules/skia/default_flavor.py b/scripts/slave/recipe_modules/skia/default_flavor.py

index 59910d164474eefeb095782c53075e2ae4cac519..f3b631d11a5be157edfe1f68af9556cc466a437a 100644

--- a/scripts/slave/recipe_modules/skia/default_flavor.py

+++ b/scripts/slave/recipe_modules/skia/default_flavor.py

@@ -83,8 +83,8 @@ class DefaultFlavorUtils(object):

def maybe_download_win_toolchain(self):

"""Download the Win toolchain if necessary."""

- toolchain_hash_file = self._skia_api.skia_dir.join(

- 'infra', 'bots', 'win_toolchain_hash.json')

+ toolchain_hash_file = self._skia_api.infrabots_dir.join(

+ 'win_toolchain_hash.json')

if (self._skia_api.m.path.exists(toolchain_hash_file) and

self._skia_api.builder_cfg.get('extra_config') == 'VS2015'):

# Find the desired toolchain version.

@@ -155,7 +155,7 @@ class DefaultFlavorUtils(object):

"""Path to a checkout of Chrome on this machine."""

if self._chrome_path is None:

if self._skia_api.running_in_swarming:

- self._chrome_path = self._skia_api.slave_dir.join('src')

+ self._chrome_path = self._skia_api.checkout_root.join('src')

return self._chrome_path

if self._skia_api.m.platform.is_win:

« no previous file with comments | « scripts/slave/recipe_modules/skia/cmake_flavor.py ('k') | scripts/slave/recipe_modules/skia/xsan_flavor.py » ('j') | no next file with comments »