aboutsummaryrefslogtreecommitdiffhomepage
path: root/infra/bots
diff options
context:
space:
mode:
authorGravatar Greg Daniel <egdaniel@google.com>2017-03-28 15:40:53 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-03-29 18:29:22 +0000
commit978533c302bc53a26980c96f8a348ae7eb9e3862 (patch)
tree9a2de26b6d7ffdb51bc891355e3d1f5fab88705e /infra/bots
parent769e80d23d1c1d240b1d510034ec57d19e768d07 (diff)
Remove blacklist of Vulkan GPUMemoryTest
This was blacklisted on Nvidia Windows. A recent change was made that may be a possible fix for this test involving the uploading of initial mip map memory. BUG=skia:6092 Change-Id: Ie75c4665bea1f5139a674b9e0f53a9aac4a97f98 Reviewed-on: https://skia-review.googlesource.com/10285 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Diffstat (limited to 'infra/bots')
-rw-r--r--infra/bots/recipe_modules/sktest/api.py4
-rw-r--r--infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-Vulkan.json4
2 files changed, 1 insertions, 7 deletions
diff --git a/infra/bots/recipe_modules/sktest/api.py b/infra/bots/recipe_modules/sktest/api.py
index 70293a616c..22cfeeeaaf 100644
--- a/infra/bots/recipe_modules/sktest/api.py
+++ b/infra/bots/recipe_modules/sktest/api.py
@@ -403,10 +403,6 @@ def dm_flags(bot):
'~bitmapfilters', # skia:6132
'~GrContextFactory_abandon']) #skia:6209
- if 'Vulkan' in bot and 'GTX1070' in bot and 'Win' in bot:
- # skia:6092
- match.append('~GPUMemorySize')
-
if 'Vulkan' in bot and 'IntelIris540' in bot and 'Ubuntu' in bot:
match.extend(['~VkHeapTests']) # skia:6245
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-Vulkan.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-Vulkan.json
index 860cb6d735..7e2c449308 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-Vulkan.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-Vulkan.json
@@ -369,9 +369,7 @@
"_",
"image",
"_",
- ".SRW",
- "--match",
- "~GPUMemorySize"
+ ".SRW"
],
"env": {
"BUILDTYPE": "Debug_x64",