Remove tests from blacklist for Vk AMD

From recent changes these should now all pass.

BUG=skia:6396

Change-Id: I4423de1a192017794a732e5bb6eeef7ccc87407c
Reviewed-on: https://skia-review.googlesource.com/10048
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>

diff --git a/infra/bots/recipe_modules/sktest/api.py b/infra/bots/recipe_modules/sktest/api.py
index 384e9fe..12fd58c 100644 (file)
--- a/infra/bots/recipe_modules/sktest/api.py
+++ b/infra/bots/recipe_modules/sktest/api.py
@@ -405,13 +405,6 @@ def dm_flags(bot):
     # skia:6092
     match.append('~GPUMemorySize')
 
-  if 'Vulkan' in bot and 'RadeonR9M470X' in bot and 'Win' in bot:
-    # skia:6396
-    match.append('~ComposedImageFilterBounds_Gpu')
-    match.append('~CopySurface')
-    match.append('~ImageFilterZeroBlurSigma_Gpu')
-    match.append('~XfermodeImageFilterCroppedInput_Gpu')
-
   if 'Vulkan' in bot and 'IntelIris540' in bot and 'Ubuntu' in bot:
     match.extend(['~VkHeapTests', # skia:6245
                   '~XfermodeImageFilterCroppedInput_Gpu']) #skia:6280

diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-Vulkan.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-Vulkan.json
index fb4188c..360b300 100644 (file)
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-Vulkan.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-Vulkan.json
@@ -369,12 +369,7 @@
       "_",
       "image",
       "_",
-      ".SRW",
-      "--match",
-      "~ComposedImageFilterBounds_Gpu",
-      "~CopySurface",
-      "~ImageFilterZeroBlurSigma_Gpu",
-      "~XfermodeImageFilterCroppedInput_Gpu"
+      ".SRW"
     ],
     "env": {
       "BUILDTYPE": "Debug_x64",