commit 6e554e3a109c4244db40179716ec852805c8701e
author Brian Salomon <bsalomon@google.com> Fri Jun 23 12:08:10 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Jun 23 20:42:04 2017 +0000
tree 9897f240269c57f846b4f3e481c9265b9e5c3180
parent df669811b16e317b307b335822c4c7c881c1d163

Reduce ANGLE correctness testing blacklists

Bug: skia:
Change-Id: Ie98d574a9840dd073a396da829aee041fb6595dc
Reviewed-on: https://skia-review.googlesource.com/20601
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Brian Salomon <bsalomon@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 6839497..4cc58d3 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
@@ -418,30 +418,30 @@
       "image",
       "_",
       ".SRW",
+      "angle_d3d9_es2",
+      "gm",
       "_",
+      "multipicturedraw_invpathclip_simple",
+      "angle_d3d9_es2",
+      "gm",
+      "_",
+      "multipicturedraw_noclip_simple",
+      "angle_d3d9_es2",
+      "gm",
+      "_",
+      "multipicturedraw_pathclip_simple",
+      "angle_d3d9_es2",
+      "gm",
+      "_",
+      "multipicturedraw_rectclip_simple",
+      "angle_d3d9_es2",
+      "gm",
+      "_",
+      "multipicturedraw_rrectclip_simple",
+      "angle_d3d9_es2",
       "gm",
       "_",
       "discard",
-      "angle_d3d9_es2",
-      "gm",
-      "_",
-      "multipicturedraw_invpathclip_simple",
-      "angle_d3d9_es2",
-      "gm",
-      "_",
-      "multipicturedraw_noclip_simple",
-      "angle_d3d9_es2",
-      "gm",
-      "_",
-      "multipicturedraw_pathclip_simple",
-      "angle_d3d9_es2",
-      "gm",
-      "_",
-      "multipicturedraw_rectclip_simple",
-      "angle_d3d9_es2",
-      "gm",
-      "_",
-      "multipicturedraw_rrectclip_simple",
       "angle_d3d11_es2",
       "gm",
       "_",
@@ -462,6 +462,10 @@
       "gm",
       "_",
       "multipicturedraw_rrectclip_simple",
+      "angle_d3d11_es2",
+      "gm",
+      "_",
+      "discard",
       "angle_gl_es2",
       "gm",
       "_",
@@ -482,8 +486,10 @@
       "gm",
       "_",
       "multipicturedraw_rrectclip_simple",
-      "--match",
-      "~IntTexture"
+      "angle_gl_es2",
+      "gm",
+      "_",
+      "discard"
     ],
     "env": {
       "BUILDTYPE": "Debug_x64",

infra/bots/recipes/test.py

diff --git a/infra/bots/recipes/test.py b/infra/bots/recipes/test.py
index 0decb80..39bbca2 100644
--- a/infra/bots/recipes/test.py
+++ b/infra/bots/recipes/test.py
@@ -516,15 +516,15 @@
     match.append('~XfermodeImageFilterCroppedInput_Gpu')
 
   if 'IntelIris540' in bot and 'ANGLE' in bot:
-    match.append('~IntTexture') # skia:6086
-    blacklist(['_', 'gm', '_', 'discard']) # skia:6141
-    # skia:6103
     for config in ['angle_d3d9_es2', 'angle_d3d11_es2', 'angle_gl_es2']:
+      # skia:6103
       blacklist([config, 'gm', '_', 'multipicturedraw_invpathclip_simple'])
       blacklist([config, 'gm', '_', 'multipicturedraw_noclip_simple'])
       blacklist([config, 'gm', '_', 'multipicturedraw_pathclip_simple'])
       blacklist([config, 'gm', '_', 'multipicturedraw_rectclip_simple'])
       blacklist([config, 'gm', '_', 'multipicturedraw_rrectclip_simple'])
+      # skia:6141
+      blacklist([config, 'gm', '_', 'discard'])
 
   if 'IntelBayTrail' in bot and 'Ubuntu' in bot:
     match.append('~ImageStorageLoad') # skia:6358