Use SVGs CIPD package and use SVG as a DM source

infra/bots/recipes/swarm_test.py

 # Copyright 2016 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 
 # Recipe module for Skia Swarming test.
 
 
 DEPS = [
   'build/file',
@@ skipping 22 matching lines @@
       'Test-Android-GCC-NexusPlayer-CPU-SSE4-x86-Release',
       'Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug',
       'Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug',
       'Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug',
       'Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug',
       'Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer',
       'Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot',
       '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',
       'Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot',
       'Test-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE',
     ],
   },
 }
 
 
@@ skipping 78 matching lines @@
 
   # Vulkan bot *only* runs the vk config.
   if 'Vulkan' in bot:
     configs = ['vk']
 
   args.append('--config')
   args.extend(configs)
 
   # 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'))
 
   blacklist = []
 
   # TODO: ???
   blacklist.extend('f16 _ _ dstreadshuffle'.split(' '))
   blacklist.extend('f16 image _ _'.split(' '))
   blacklist.extend('srgb image _ _'.split(' '))
@@ skipping 269 matching lines @@
     properties.extend([
       'issue',    api.vars.issue,
       'patchset', api.vars.patchset,
     ])
 
   args = [
     'dm',
     '--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 use the SVGs.

[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(
         api.flavor.device_dirs.images_dir, 'colorspace'),
     '--nameByHash',
     '--properties'
   ] + properties
 
   args.append('--key')
   args.extend(key_params(api))
@@ skipping 47 matching lines @@
     test_data = (
         api.step_data(
             'get EXTERNAL_STORAGE dir',
             stdout=api.raw_io.output('/storage/emulated/legacy')) +
         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(
+        api.step_data(
+            'read SVG_VERSION',
+            stdout=api.raw_io.output('42')) +
+        api.step_data(
             'exists skia_dm',
             stdout=api.raw_io.output(''))
     )
     if 'GalaxyS3' not in builder:
       test_data += api.step_data(
           'adb root',
           stdout=api.raw_io.output('restarting adbd as root'))
     if adb:
       test_data += api.step_data(
           'which adb',
@@ skipping 16 matching lines @@
                          buildnumber=5,
                          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')
           )
         )
         if ('Android' in builder and
             ('Test' in builder or 'Perf' in builder) and
             not 'Appurify' in builder):
           test += AndroidTestData(builder)
         if 'Trybot' in builder:
           test += api.properties(issue=500,
                                  patchset=1,
@@ skipping 13 matching lines @@
                    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')
     ) +
     api.step_data('dm', retcode=1)
   )
 
   builder = 'Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug'
   yield (
     api.test('failed_get_hashes') +
     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('42')) +
     api.step_data('get uninteresting hashes', retcode=1)
   )
 
   yield (
     api.test('download_and_push_skps') +
     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('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(''))
   )
 
   yield (
     api.test('missing_SKP_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',
                   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(''))
   )
 
   yield (
     api.test('download_and_push_skimage') +
     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('2')) +
+    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('missing_SK_IMAGE_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',
                   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',
                    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, 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'))
   )
 
   builder = 'Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot'
   yield (
     api.test('big_issue_number') +
     api.properties(buildername=builder,
                      mastername='client.skia.compile',
                      slavename='skiabot-linux-swarm-000',
                      buildnumber=5,
                      revision='abc123',
                      path_config='kitchen',
                      swarm_out_dir='[SWARM_OUT_DIR]',
                      rietveld='https://codereview.chromium.org',
                      patchset=1,
                      issue=2147533002L) +
     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')
     ) +
     api.platform('win', 64)
   )