GN: Android perf/tests

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',
   'core',
   'recipe_engine/json',
   'recipe_engine/path',
   'recipe_engine/platform',
   'recipe_engine/properties',
   'recipe_engine/python',
   'recipe_engine/raw_io',
   'flavor',
   'run',
   'vars',
 ]
 
 
 TEST_BUILDERS = {
   'client.skia': {
     'skiabot-linux-swarm-000': [
+      'Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android',
       'Test-Android-GCC-AndroidOne-GPU-Mali400MP2-Arm7-Release',
       'Test-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Debug',
+      'Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug',
       'Test-Android-GCC-Nexus10-GPU-MaliT604-Arm7-Release',
       'Test-Android-GCC-Nexus6-GPU-Adreno420-Arm7-Debug',
       'Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug',
       'Test-Android-GCC-Nexus9-CPU-Denver-Arm64-Debug',
       '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-ASAN',
       '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',
+      'Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug',
     ],
   },
 }
 
 
 def dm_flags(bot):
   args = []
 
   # 32-bit desktop bots tend to run out of memory, because they have relatively
   # far more cores than RAM (e.g. 32 cores, 3G RAM).  Hold them back a bit.
@@ skipping 425 matching lines @@
                   cmd=abandonGpuContext, abort_on_failure=False)
     preAbandonGpuContext = list(args)
     preAbandonGpuContext.append('--preAbandonGpuContext')
     api.run(api.flavor.step, 'dm --preAbandonGpuContext',
                   cmd=preAbandonGpuContext, abort_on_failure=False,
                   env=api.vars.default_env)
 
 
 def RunSteps(api):
   api.core.setup()
-  api.flavor.install()
-  test_steps(api)
-  api.flavor.cleanup_steps()
+  try:
+    api.flavor.install()
+    test_steps(api)
+  finally:
+    api.flavor.cleanup_steps()
   api.run.check_failure()
 
 
 def GenTests(api):
   def AndroidTestData(builder, adb=None):
     test_data = (
         api.step_data(
             'get EXTERNAL_STORAGE dir',
             stdout=api.raw_io.output('/storage/emulated/legacy')) +
         api.step_data(
@@ skipping 42 matching lines @@
                                            '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 'GN' in builder and
             not 'Appurify' in builder):
           test += AndroidTestData(builder)
         if 'Trybot' in builder:
           test += api.properties(issue=500,
                                  patchset=1,
                                  rietveld='https://codereview.chromium.org')
         if 'Win' in builder:
           test += api.platform('win', 64)
 
 
@@ skipping 304 matching lines @@
       api.properties(
           buildername=builder,
           mastername='client.skia',
           slavename='skiabot-linux-swarm-000',
           buildnumber=5,
           path_config='kitchen',
           swarm_out_dir='[SWARM_OUT_DIR]',
           revision='abc123',
           **gerrit_kwargs)
   )