Run ANGLE in GL mode on test bots

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=3724

Change-Id: Ic3d6efcb331ac3947026476e357e76214f2ccdf8
Reviewed-on: https://skia-review.googlesource.com/3724
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

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 e09e5fd6c77b1e5d8ac45f737ec4f2eb181f890b..1f79dbd20932ba60a0cdbd2c8ac48845815ba3e6 100644 (file)
--- 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
@@ -223,6 +223,7 @@
       "angle_d3d11_es2",
       "angle_d3d9_es2",
       "angle_d3d11_es2_msaa4",
+      "angle_gl_es2",
       "--src",
       "tests",
       "gm",

diff --git a/infra/bots/recipes/swarm_test.py b/infra/bots/recipes/swarm_test.py
index d35373353c7e6f7eb2d5272e81cd60c2c2b95828..a84de4624b041d9e01c3412f5f98c03d463782ff 100644 (file)
--- a/infra/bots/recipes/swarm_test.py
+++ b/infra/bots/recipes/swarm_test.py
@@ -134,7 +134,10 @@ def dm_flags(bot):
 
   # ANGLE bot *only* runs the angle configs
   if 'ANGLE' in bot:
-    configs = ['angle_d3d11_es2', 'angle_d3d9_es2', 'angle_d3d11_es2_msaa4']
+    configs = ['angle_d3d11_es2',
+               'angle_d3d9_es2',
+               'angle_d3d11_es2_msaa4',
+               'angle_gl_es2']
 
   # Vulkan bot *only* runs the vk config.
   if 'Vulkan' in bot:

diff --git a/tools/flags/SkCommonFlagsConfig.cpp b/tools/flags/SkCommonFlagsConfig.cpp
index 08330a922c58c439edb359aec6f4c8f073c7fbe0..f695bf15789ab146da603361f9e374e9115e0cba 100644 (file)
--- a/tools/flags/SkCommonFlagsConfig.cpp
+++ b/tools/flags/SkCommonFlagsConfig.cpp
@@ -64,7 +64,6 @@ static const struct {
     { "angle_d3d9_es2",        "gpu", "api=angle_d3d9_es2" },
     { "angle_d3d11_es2_msaa4", "gpu", "api=angle_d3d11_es2,samples=4" },
     { "angle_gl_es2",          "gpu", "api=angle_gl_es2" },
-    { "angle_gl_es2",          "gpu", "api=angle_gl_es2" },
     { "commandbuffer",         "gpu", "api=commandbuffer" }
 #if SK_MESA
     ,{ "mesa",                 "gpu", "api=mesa" }