diff options
Diffstat (limited to 'infra/bots/recipes/test.py')
| -rw-r--r-- | infra/bots/recipes/test.py | 35 |
1 files changed, 27 insertions, 8 deletions
diff --git a/infra/bots/recipes/test.py b/infra/bots/recipes/test.py index c95e92a9d2..8ef50581a2 100644 --- a/infra/bots/recipes/test.py +++ b/infra/bots/recipes/test.py @@ -11,7 +11,6 @@ DEPS = [ 'flavor', 'recipe_engine/context', 'recipe_engine/file', - 'recipe_engine/json', 'recipe_engine/path', 'recipe_engine/platform', 'recipe_engine/properties', @@ -301,7 +300,7 @@ def dm_flags(api, bot): args.extend(configs) # Run tests, gms, and image decoding tests everywhere. - args.extend('--src tests gm image colorImage svg skp'.split(' ')) + args.extend('--src tests gm image lottie colorImage svg skp'.split(' ')) if api.vars.builder_cfg.get('cpu_or_gpu') == 'GPU': # Don't run the 'svgparse_*' svgs on GPU. blacklist('_ svg _ svgparse_') @@ -325,15 +324,30 @@ def dm_flags(api, bot): args.remove('image') args.remove('colorImage') + def remove_from_args(arg): + if arg in args: + args.remove(arg) + if 'DDL' in bot: # The DDL bots just render the large skps and the gms - args.remove('tests') - args.remove('image') - args.remove('colorImage') - args.remove('svg') + remove_from_args('tests') + remove_from_args('image') + remove_from_args('colorImage') + remove_from_args('svg') else: # Currently, only the DDL bots render skps - args.remove('skp') + remove_from_args('skp') + + if 'Lottie' in api.vars.builder_cfg.get('extra_config', ''): + # Only run the lotties on Lottie bots. + remove_from_args('tests') + remove_from_args('gm') + remove_from_args('image') + remove_from_args('colorImage') + remove_from_args('svg') + remove_from_args('skp') + else: + remove_from_args('lottie') # TODO: ??? blacklist('f16 _ _ dstreadshuffle') @@ -948,6 +962,8 @@ def test_steps(api): ] + properties args.extend(['--svgs', api.flavor.device_dirs.svg_dir]) + if 'Lottie' in api.vars.builder_cfg.get('extra_config', ''): + args.extend(['--lotties', api.flavor.device_dirs.lotties_dir]) args.append('--key') args.extend(key_params(api)) @@ -988,8 +1004,10 @@ def RunSteps(api): try: if 'Chromecast' in api.vars.builder_name: api.flavor.install(resources=True, skps=True) + elif 'Lottie' in api.vars.builder_name: + api.flavor.install(resources=True, lotties=True) else: - api.flavor.install_everything() + api.flavor.install(skps=True, images=True, svgs=True, resources=True) test_steps(api) finally: api.flavor.cleanup_steps() @@ -1020,6 +1038,7 @@ TEST_BUILDERS = [ ('Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All' '-SK_USE_DISCARDABLE_SCALEDIMAGECACHE'), 'Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-T8888', + 'Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-Lottie', ('Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All' '-SK_FORCE_RASTER_PIPELINE_BLITTER'), 'Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-TSAN', |