diff options
author | 2016-08-11 07:51:53 -0700 | |
---|---|---|
committer | 2016-08-11 07:51:53 -0700 | |
commit | 18655efb7a5da4907fe702164af26f0b9a99bf56 (patch) | |
tree | dbe24d19289b987ccf11cf7bb5a7dbc85373ed62 /infra/bots/recipe_modules/flavor/api.py | |
parent | 198ca42c67aaabc2d7ffea4653b31323e496e7cc (diff) |
GN: take over some exisiting bots
As an experiment, instead of replacing these with -GN twins, take
them over in-place. This should take over:
-FAST
-SKFOO
CQ_INCLUDE_TRYBOTS=master.client.skia:Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE-Trybot,Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE-Trybot,Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD-Trybot,Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Fast-Trybot
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2229463002
Review-Url: https://codereview.chromium.org/2229463002
Diffstat (limited to 'infra/bots/recipe_modules/flavor/api.py')
-rw-r--r-- | infra/bots/recipe_modules/flavor/api.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/infra/bots/recipe_modules/flavor/api.py b/infra/bots/recipe_modules/flavor/api.py index 83a3484bf7..0e8411de63 100644 --- a/infra/bots/recipe_modules/flavor/api.py +++ b/infra/bots/recipe_modules/flavor/api.py @@ -38,10 +38,6 @@ def is_cmake(builder_cfg): return 'CMake' in builder_cfg.get('extra_config', '') -def is_gn(builder_cfg): - return 'GN' == builder_cfg.get('extra_config', '') - - def is_ios(builder_cfg): return ('iOS' in builder_cfg.get('extra_config', '') or builder_cfg.get('os') == 'iOS') @@ -64,12 +60,14 @@ def is_xsan(builder_cfg): class SkiaFlavorApi(recipe_api.RecipeApi): def get_flavor(self, builder_cfg): """Return a flavor utils object specific to the given builder.""" + gn = gn_flavor.GNFlavorUtils(self.m) + if gn.supported(): + return gn + if is_android(builder_cfg): return android_flavor.AndroidFlavorUtils(self.m) elif is_cmake(builder_cfg): return cmake_flavor.CMakeFlavorUtils(self.m) - elif is_gn(builder_cfg): - return gn_flavor.GNFlavorUtils(self.m) elif is_ios(builder_cfg): return ios_flavor.iOSFlavorUtils(self.m) elif is_pdfium(builder_cfg): |