Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(559)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: infra/bots/recipes/swarm_test.py

Issue 2231943002: Use SVGs CIPD package and use SVG as a DM source (Closed) Base URL: https://skia.googlesource.com/skia@master
Patch Set: Fix test Created 4 years, 4 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
« no previous file with comments | « infra/bots/recipes/swarm_perf.expected/big_issue_number.json ('k') | infra/bots/recipes/swarm_test.expected/Test-Android-GCC-AndroidOne-GPU-Mali400MP2-Arm7-Release.json » ('j') | infra/bots/recipes/swarm_trigger.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: infra/bots/recipes/swarm_test.py
diff --git a/infra/bots/recipes/swarm_test.py b/infra/bots/recipes/swarm_test.py
index bf574581ec10971459384baa02c25338a08de554..0eee569e3cd52ff79cc179e579345194eab86de9 100644
--- a/infra/bots/recipes/swarm_test.py
+++ b/infra/bots/recipes/swarm_test.py
@@ -40,6 +40,7 @@ TEST_BUILDERS = {
'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug',
'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug',
'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN',
+ '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-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan',
@@ -138,6 +139,10 @@ def dm_flags(bot):
# Run tests, gms, and image decoding tests everywhere.
args.extend('--src tests gm image colorImage'.split(' '))
+ # TODO(rmistry): Remove the below once we want to enable SVGs for all bots.
+ if (bot == 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared-Trybot' or
+ bot == 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared'):
+ args.append('svg')
if 'GalaxyS' in bot:
args.extend(('--threads', '0'))
@@ -427,6 +432,7 @@ def test_steps(api):
'--undefok', # This helps branches that may not know new flags.
'--resourcePath', api.flavor.device_dirs.resource_dir,
'--skps', api.flavor.device_dirs.skp_dir,
+ '--svgs', api.flavor.device_dirs.svg_dir,
borenet 2016/08/11 16:20:52 Only supply this for the bots which are going to u
rmistry 2016/08/11 16:41:48 Done.
'--images', api.flavor.device_path_join(
api.flavor.device_dirs.images_dir, 'dm'),
'--colorImages', api.flavor.device_path_join(
@@ -494,7 +500,10 @@ def GenTests(api):
api.step_data(
'read SK_IMAGE_VERSION',
stdout=api.raw_io.output('42')) +
- api.step_data(
+ api.step_data(
+ 'read SVG_VERSION',
+ stdout=api.raw_io.output('42')) +
+ api.step_data(
'exists skia_dm',
stdout=api.raw_io.output(''))
)
@@ -531,6 +540,8 @@ def GenTests(api):
'skimage', 'VERSION'),
api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
'skp', 'VERSION'),
+ api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
+ 'svg', 'VERSION'),
api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
)
)
@@ -564,6 +575,8 @@ def GenTests(api):
'skimage', 'VERSION'),
api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
'skp', 'VERSION'),
+ api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
+ 'svg', 'VERSION'),
api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
) +
api.step_data('dm', retcode=1)
@@ -585,6 +598,8 @@ def GenTests(api):
'skimage', 'VERSION'),
api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
'skp', 'VERSION'),
+ api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
+ 'svg', 'VERSION'),
api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
) +
AndroidTestData(builder) +
@@ -592,6 +607,8 @@ def GenTests(api):
stdout=api.raw_io.output('42')) +
api.step_data('read SK_IMAGE_VERSION',
stdout=api.raw_io.output('42')) +
+ api.step_data('read SVG_VERSION',
+ stdout=api.raw_io.output('42')) +
api.step_data('get uninteresting hashes', retcode=1)
)
@@ -610,6 +627,8 @@ def GenTests(api):
'skimage', 'VERSION'),
api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
'skp', 'VERSION'),
+ api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
+ 'svg', 'VERSION'),
api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
) +
AndroidTestData(builder) +
@@ -617,6 +636,8 @@ def GenTests(api):
stdout=api.raw_io.output('2')) +
api.step_data('read SK_IMAGE_VERSION',
stdout=api.raw_io.output('42')) +
+ api.step_data('read SVG_VERSION',
+ stdout=api.raw_io.output('42')) +
api.step_data(
'exists skps',
stdout=api.raw_io.output(''))
@@ -637,6 +658,8 @@ def GenTests(api):
'skimage', 'VERSION'),
api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
'skp', 'VERSION'),
+ api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
+ 'svg', 'VERSION'),
api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
) +
AndroidTestData(builder) +
@@ -644,6 +667,8 @@ def GenTests(api):
retcode=1) +
api.step_data('read SK_IMAGE_VERSION',
stdout=api.raw_io.output('42')) +
+ api.step_data('read SVG_VERSION',
+ stdout=api.raw_io.output('42')) +
api.step_data(
'exists skps',
stdout=api.raw_io.output(''))
@@ -664,6 +689,8 @@ def GenTests(api):
'skimage', 'VERSION'),
api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
'skp', 'VERSION'),
+ api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
+ 'svg', 'VERSION'),
api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
) +
AndroidTestData(builder) +
@@ -671,6 +698,8 @@ def GenTests(api):
stdout=api.raw_io.output('42')) +
api.step_data('read SK_IMAGE_VERSION',
stdout=api.raw_io.output('2')) +
+ api.step_data('read SVG_VERSION',
+ stdout=api.raw_io.output('42')) +
api.step_data(
'exists skia_images',
stdout=api.raw_io.output(''))
@@ -691,6 +720,8 @@ def GenTests(api):
'skimage', 'VERSION'),
api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
'skp', 'VERSION'),
+ api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
+ 'svg', 'VERSION'),
api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
) +
AndroidTestData(builder) +
@@ -698,12 +729,76 @@ def GenTests(api):
stdout=api.raw_io.output('42')) +
api.step_data('read SK_IMAGE_VERSION',
retcode=1) +
+ api.step_data('read SVG_VERSION',
+ stdout=api.raw_io.output('42')) +
api.step_data(
'exists skia_images',
stdout=api.raw_io.output(''))
)
yield (
+ api.test('download_and_push_svgs') +
+ api.properties(buildername=builder,
+ mastername='client.skia',
+ slavename='skiabot-linux-swarm-000',
+ buildnumber=6,
+ revision='abc123',
+ path_config='kitchen',
+ swarm_out_dir='[SWARM_OUT_DIR]') +
+ api.path.exists(
+ api.path['slave_build'].join('skia'),
+ api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
+ 'skimage', 'VERSION'),
+ api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
+ 'skp', 'VERSION'),
+ api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
+ 'svg', 'VERSION'),
+ api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
+ ) +
+ AndroidTestData(builder) +
+ api.step_data('read SKP_VERSION',
+ stdout=api.raw_io.output('42')) +
+ api.step_data('read SK_IMAGE_VERSION',
+ stdout=api.raw_io.output('42')) +
+ api.step_data('read SVG_VERSION',
+ stdout=api.raw_io.output('2')) +
+ api.step_data(
+ 'exists svgs',
+ stdout=api.raw_io.output(''))
+ )
+
+ yield (
+ api.test('missing_SVG_VERSION_device') +
+ api.properties(buildername=builder,
+ mastername='client.skia',
+ slavename='skiabot-linux-swarm-000',
+ buildnumber=6,
+ revision='abc123',
+ path_config='kitchen',
+ swarm_out_dir='[SWARM_OUT_DIR]') +
+ api.path.exists(
+ api.path['slave_build'].join('skia'),
+ api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
+ 'skimage', 'VERSION'),
+ api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
+ 'skp', 'VERSION'),
+ api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
+ 'svg', 'VERSION'),
+ api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
+ ) +
+ AndroidTestData(builder) +
+ api.step_data('read SKP_VERSION',
+ stdout=api.raw_io.output('42')) +
+ api.step_data('read SK_IMAGE_VERSION',
+ stdout=api.raw_io.output('42')) +
+ api.step_data('read SVG_VERSION',
+ retcode=1) +
+ api.step_data(
+ 'exists svgs',
+ stdout=api.raw_io.output(''))
+ )
+
+ yield (
api.test('adb_in_path') +
api.properties(buildername=builder,
mastername='client.skia',
@@ -718,12 +813,16 @@ def GenTests(api):
'skimage', 'VERSION'),
api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
'skp', 'VERSION'),
+ api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
+ 'svg', 'VERSION'),
api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
) +
AndroidTestData(builder, adb='/usr/bin/adb') +
api.step_data('read SKP_VERSION',
stdout=api.raw_io.output('42')) +
api.step_data('read SK_IMAGE_VERSION',
+ stdout=api.raw_io.output('42')) +
+ api.step_data('read SVG_VERSION',
stdout=api.raw_io.output('42'))
)
@@ -746,6 +845,8 @@ def GenTests(api):
'skimage', 'VERSION'),
api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
'skp', 'VERSION'),
+ api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
+ 'svg', 'VERSION'),
api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
) +
api.platform('win', 64)
« no previous file with comments | « infra/bots/recipes/swarm_perf.expected/big_issue_number.json ('k') | infra/bots/recipes/swarm_test.expected/Test-Android-GCC-AndroidOne-GPU-Mali400MP2-Arm7-Release.json » ('j') | infra/bots/recipes/swarm_trigger.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698