From 978533c302bc53a26980c96f8a348ae7eb9e3862 Mon Sep 17 00:00:00 2001 From: Greg Daniel Date: Tue, 28 Mar 2017 15:40:53 -0400 Subject: 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 Reviewed-by: Ben Wagner --- infra/bots/recipe_modules/sktest/api.py | 4 ---- .../Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-Vulkan.json | 4 +--- 2 files changed, 1 insertion(+), 7 deletions(-) (limited to 'infra/bots') 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", -- cgit v1.2.3