From 0290620b605a560c78508b58fdb8c8cef251d398 Mon Sep 17 00:00:00 2001 From: Brian Salomon <bsalomon@google.com> Date: Tue, 18 Oct 2016 13:36:32 -0400 Subject: [PATCH] Make ANGLE bot only run ANGLE configs CQ_INCLUDE_TRYBOTS=master.client.skia:Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE-Trybot GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=3597 Change-Id: Id948caa1f28f415c453895fd30ff032bcadbb3d3 Reviewed-on: https://skia-review.googlesource.com/3597 Commit-Queue: Brian Salomon <bsalomon@google.com> Commit-Queue: Mike Klein <mtklein@chromium.org> Reviewed-by: Mike Klein <mtklein@chromium.org> --- ...huttleB-GPU-GTX960-x86_64-Debug-ANGLE.json | 168 ------------------ infra/bots/recipes/swarm_test.py | 9 +- 2 files changed, 4 insertions(+), 173 deletions(-) diff --git a/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json b/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json index 56581f6818..e09e5fd6c7 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json @@ -220,14 +220,6 @@ "[CUSTOM_[SWARM_OUT_DIR]]\\dm", "--nocpu", "--config", - "8888", - "gpu", - "gpusrgb", - "pdf", - "msaa16", - "serialize-8888", - "tiles_rt-8888", - "pic-8888", "angle_d3d11_es2", "angle_d3d9_es2", "angle_d3d11_es2_msaa4", @@ -238,10 +230,6 @@ "colorImage", "svg", "--blacklist", - "gpusrgb", - "image", - "_", - "_", "_", "image", "gen_platf", @@ -294,162 +282,6 @@ "svg", "_", "Nebraska-StateSeal.svg", - "serialize-8888", - "gm", - "_", - "bleed_image", - "serialize-8888", - "gm", - "_", - "c_gms", - "serialize-8888", - "gm", - "_", - "colortype", - "serialize-8888", - "gm", - "_", - "colortype_xfermodes", - "serialize-8888", - "gm", - "_", - "drawfilter", - "serialize-8888", - "gm", - "_", - "fontmgr_bounds_0.75_0", - "serialize-8888", - "gm", - "_", - "fontmgr_bounds_1_-0.25", - "serialize-8888", - "gm", - "_", - "fontmgr_bounds", - "serialize-8888", - "gm", - "_", - "fontmgr_match", - "serialize-8888", - "gm", - "_", - "fontmgr_iter", - "serialize-8888", - "gm", - "_", - "imagemasksubset", - "serialize-8888", - "gm", - "_", - "bitmapfilters", - "serialize-8888", - "gm", - "_", - "bitmapshaders", - "serialize-8888", - "gm", - "_", - "bleed", - "serialize-8888", - "gm", - "_", - "bleed_alpha_bmp", - "serialize-8888", - "gm", - "_", - "bleed_alpha_bmp_shader", - "serialize-8888", - "gm", - "_", - "convex_poly_clip", - "serialize-8888", - "gm", - "_", - "extractalpha", - "serialize-8888", - "gm", - "_", - "filterbitmap_checkerboard_32_32_g8", - "serialize-8888", - "gm", - "_", - "filterbitmap_image_mandrill_64", - "serialize-8888", - "gm", - "_", - "shadows", - "serialize-8888", - "gm", - "_", - "simpleaaclip_aaclip", - "serialize-8888", - "gm", - "_", - "composeshader_bitmap", - "serialize-8888", - "gm", - "_", - "scaled_tilemodes_npot", - "serialize-8888", - "gm", - "_", - "scaled_tilemodes", - "serialize-8888", - "gm", - "_", - "typefacerendering_pfaMac", - "serialize-8888", - "gm", - "_", - "bleed_alpha_image", - "serialize-8888", - "gm", - "_", - "bleed_alpha_image_shader", - "serialize-8888", - "gm", - "_", - "verylargebitmap", - "serialize-8888", - "gm", - "_", - "verylarge_picture_image", - "pic-8888", - "gm", - "_", - "drawfilter", - "pic-8888", - "gm", - "_", - "image-cacherator-from-picture", - "serialize-8888", - "gm", - "_", - "image-cacherator-from-picture", - "pic-8888", - "gm", - "_", - "image-cacherator-from-raster", - "serialize-8888", - "gm", - "_", - "image-cacherator-from-raster", - "pic-8888", - "gm", - "_", - "image-cacherator-from-ctable", - "serialize-8888", - "gm", - "_", - "image-cacherator-from-ctable", - "pic-8888", - "gm", - "_", - "gamut", - "serialize-8888", - "gm", - "_", - "gamut", "_", "image", "_", diff --git a/infra/bots/recipes/swarm_test.py b/infra/bots/recipes/swarm_test.py index f525845be7..480d78d306 100644 --- a/infra/bots/recipes/swarm_test.py +++ b/infra/bots/recipes/swarm_test.py @@ -114,11 +114,6 @@ def dm_flags(bot): configs.extend(mode + '-8888' for mode in ['serialize', 'tiles_rt', 'pic']) - if 'ANGLE' in bot: - configs.extend(['angle_d3d11_es2', - 'angle_d3d9_es2', - 'angle_d3d11_es2_msaa4']) - # We want to run gpudft on atleast the mali 400 if 'GalaxyS3' in bot: configs.append('gpudft') @@ -137,6 +132,10 @@ def dm_flags(bot): if 'CommandBuffer' in bot: configs = ['commandbuffer'] + # ANGLE bot *only* runs the angle configs + if 'ANGLE' in bot: + configs = ['angle_d3d11_es2', 'angle_d3d9_es2', 'angle_d3d11_es2_msaa4'] + # Vulkan bot *only* runs the vk config. if 'Vulkan' in bot: configs = ['vk']