commit 6d28730b2b13876601dec60caf49ba89e29c6fad
author Greg Daniel <egdaniel@google.com> Mon Jun 19 10:50:52 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Jun 19 15:16:21 2017 +0000
tree be9ab0fc8a8d18afd7e66b06b04136be1d9d96ab
parent c64ee46a982695dc32b9cad4dd4e635ac09cd25e

Update Angle GLPrograms test blacklist to only be on the one broked config

Bug: skia:4717, skia:6772
Change-Id: I7a50228722b6ea4034410a57e138de050398b20f
Reviewed-on: https://skia-review.googlesource.com/20222
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>

infra/bots/recipes/test.expected/Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-ANGLE.json

diff --git a/infra/bots/recipes/test.expected/Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-ANGLE.json b/infra/bots/recipes/test.expected/Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-ANGLE.json
index faa23da..ebf37b7 100644
--- a/infra/bots/recipes/test.expected/Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-ANGLE.json
+++ b/infra/bots/recipes/test.expected/Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-ANGLE.json
@@ -417,6 +417,10 @@
       "image",
       "_",
       ".SRW",
+      "angle_d3d9_es2",
+      "test",
+      "_",
+      "GLPrograms",
       "_",
       "gm",
       "_",
@@ -482,7 +486,6 @@
       "_",
       "multipicturedraw_rrectclip_simple",
       "--match",
-      "~GLPrograms",
       "~IntTexture"
     ],
     "env": {

infra/bots/recipes/test.expected/Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE.json

diff --git a/infra/bots/recipes/test.expected/Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE.json b/infra/bots/recipes/test.expected/Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE.json
index 7eb5f18..8c0122f 100644
--- a/infra/bots/recipes/test.expected/Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE.json
+++ b/infra/bots/recipes/test.expected/Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE.json
@@ -418,8 +418,10 @@
       "image",
       "_",
       ".SRW",
-      "--match",
-      "~GLPrograms"
+      "angle_d3d9_es2",
+      "test",
+      "_",
+      "GLPrograms"
     ],
     "env": {
       "BUILDTYPE": "Debug_x64",

infra/bots/recipes/test.py

diff --git a/infra/bots/recipes/test.py b/infra/bots/recipes/test.py
index 46c42be..2c26ad9 100644
--- a/infra/bots/recipes/test.py
+++ b/infra/bots/recipes/test.py
@@ -410,8 +410,9 @@
   if 'GalaxyS7_G930A' in bot:
     match.append('~WritePixels') # skia:6427
 
-  if 'ANGLE' in bot and 'Debug' in bot:
-    match.append('~GLPrograms') # skia:4717
+  if 'ANGLE' in bot:
+    # skia:4717, skia:6772
+    blacklist(['angle_d3d9_es2', 'test', '_', 'GLPrograms'])
 
   if 'MSAN' in bot:
     match.extend(['~Once', '~Shared'])  # Not sure what's up with these tests.