| Index: scripts/slave/recipes/skia/skia.py
|
| diff --git a/scripts/slave/recipes/skia/skia.py b/scripts/slave/recipes/skia/skia.py
|
| index 6254b1153c7b906267262ed0203badcc3a8cbacd..9930cd116f13204ee1bc91f672f0ca3a45ba28d9 100644
|
| --- a/scripts/slave/recipes/skia/skia.py
|
| +++ b/scripts/slave/recipes/skia/skia.py
|
| @@ -7,6 +7,7 @@
|
|
|
|
|
| DEPS = [
|
| + 'depot_tools/infra_paths',
|
| 'recipe_engine/json',
|
| 'recipe_engine/path',
|
| 'recipe_engine/platform',
|
| @@ -110,9 +111,9 @@ def GenTests(api):
|
| slavename=slavename,
|
| buildnumber=5,
|
| revision='abc123') +
|
| - api.path.exists(
|
| - api.path['slave_build'].join('skia'),
|
| - api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
|
| + api.infra_paths.exists(
|
| + api.infra_paths['slave_build'].join('skia'),
|
| + api.infra_paths['slave_build'].join('tmp', 'uninteresting_hashes.txt')
|
| )
|
| )
|
| if 'Android' in builder:
|
| @@ -135,8 +136,8 @@ def GenTests(api):
|
| if 'Win' in builder and 'Swarming' not in builder:
|
| test += api.platform('win', 64)
|
| if builder == 'Build-Win-MSVC-x86-Debug-VS2015':
|
| - test += api.path.exists(
|
| - api.path['slave_build'].join('skia', 'infra', 'bots',
|
| + test += api.infra_paths.exists(
|
| + api.infra_paths['slave_build'].join('skia', 'infra', 'bots',
|
| 'win_toolchain_hash.json'))
|
| test += api.step_data('Get downloaded WIN_TOOLCHAIN_HASH',
|
| retcode=1)
|
| @@ -182,9 +183,9 @@ def GenTests(api):
|
| api.step_data('read SK_IMAGE_VERSION',
|
| stdout=api.raw_io.output('42')) +
|
| api.step_data('get uninteresting hashes', retcode=1) +
|
| - api.path.exists(
|
| - api.path['slave_build'].join('skia'),
|
| - api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
|
| + api.infra_paths.exists(
|
| + api.infra_paths['slave_build'].join('skia'),
|
| + api.infra_paths['slave_build'].join('tmp', 'uninteresting_hashes.txt')
|
| )
|
| )
|
|
|
| @@ -207,9 +208,9 @@ def GenTests(api):
|
| api.step_data(
|
| 'exists skps',
|
| stdout=api.raw_io.output('')) +
|
| - api.path.exists(
|
| - api.path['slave_build'].join('skia'),
|
| - api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
|
| + api.infra_paths.exists(
|
| + api.infra_paths['slave_build'].join('skia'),
|
| + api.infra_paths['slave_build'].join('tmp', 'uninteresting_hashes.txt')
|
| )
|
| )
|
|
|
| @@ -231,9 +232,9 @@ def GenTests(api):
|
| api.step_data(
|
| 'exists skps',
|
| stdout=api.raw_io.output('')) +
|
| - api.path.exists(
|
| - api.path['slave_build'].join('skia'),
|
| - api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
|
| + api.infra_paths.exists(
|
| + api.infra_paths['slave_build'].join('skia'),
|
| + api.infra_paths['slave_build'].join('tmp', 'uninteresting_hashes.txt')
|
| )
|
| )
|
|
|
| @@ -256,9 +257,9 @@ def GenTests(api):
|
| api.step_data(
|
| 'exists skia_images',
|
| stdout=api.raw_io.output('')) +
|
| - api.path.exists(
|
| - api.path['slave_build'].join('skia'),
|
| - api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
|
| + api.infra_paths.exists(
|
| + api.infra_paths['slave_build'].join('skia'),
|
| + api.infra_paths['slave_build'].join('tmp', 'uninteresting_hashes.txt')
|
| )
|
| )
|
|
|
| @@ -280,9 +281,9 @@ def GenTests(api):
|
| api.step_data(
|
| 'exists skia_images',
|
| stdout=api.raw_io.output('')) +
|
| - api.path.exists(
|
| - api.path['slave_build'].join('skia'),
|
| - api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
|
| + api.infra_paths.exists(
|
| + api.infra_paths['slave_build'].join('skia'),
|
| + api.infra_paths['slave_build'].join('tmp', 'uninteresting_hashes.txt')
|
| )
|
| )
|
|
|
| @@ -297,9 +298,9 @@ def GenTests(api):
|
| buildnumber=6,
|
| revision='abc123') +
|
| api.step_data('Get downloaded SKP_VERSION', retcode=1) +
|
| - api.path.exists(
|
| - api.path['slave_build'].join('skia'),
|
| - api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
|
| + api.infra_paths.exists(
|
| + api.infra_paths['slave_build'].join('skia'),
|
| + api.infra_paths['slave_build'].join('tmp', 'uninteresting_hashes.txt')
|
| )
|
| )
|
|
|
| @@ -311,8 +312,8 @@ def GenTests(api):
|
| buildnumber=6,
|
| revision='abc123') +
|
| api.step_data('Get downloaded SK_IMAGE_VERSION', retcode=1) +
|
| - api.path.exists(
|
| - api.path['slave_build'].join('skia'),
|
| - api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
|
| + api.infra_paths.exists(
|
| + api.infra_paths['slave_build'].join('skia'),
|
| + api.infra_paths['slave_build'].join('tmp', 'uninteresting_hashes.txt')
|
| )
|
| )
|
|
|