diff options
5 files changed, 20 insertions, 22 deletions
diff --git a/infra/bots/assets/linux_vulkan_intel_driver_debug/VERSION b/infra/bots/assets/linux_vulkan_intel_driver_debug/VERSION index d8263ee986..e440e5c842 100644 --- a/infra/bots/assets/linux_vulkan_intel_driver_debug/VERSION +++ b/infra/bots/assets/linux_vulkan_intel_driver_debug/VERSION @@ -1 +1 @@ -2
\ No newline at end of file +3
\ No newline at end of file diff --git a/infra/bots/assets/linux_vulkan_intel_driver_release/VERSION b/infra/bots/assets/linux_vulkan_intel_driver_release/VERSION index d8263ee986..7813681f5b 100644 --- a/infra/bots/assets/linux_vulkan_intel_driver_release/VERSION +++ b/infra/bots/assets/linux_vulkan_intel_driver_release/VERSION @@ -1 +1 @@ -2
\ No newline at end of file +5
\ No newline at end of file diff --git a/infra/bots/recipe_modules/sktest/api.py b/infra/bots/recipe_modules/sktest/api.py index 17878984ad..464a8548bf 100644 --- a/infra/bots/recipe_modules/sktest/api.py +++ b/infra/bots/recipe_modules/sktest/api.py @@ -405,8 +405,7 @@ def dm_flags(bot): match.append('~GPUMemorySize') if 'Vulkan' in bot and 'IntelIris540' in bot and 'Ubuntu' in bot: - match.extend(['~VkHeapTests', # skia:6245 - '~XfermodeImageFilterCroppedInput_Gpu']) #skia:6280 + match.extend(['~VkHeapTests']) # skia:6245 if 'IntelIris540' in bot and 'ANGLE' in bot: match.append('~IntTexture') # skia:6086 diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan.json index c7b020c89d..bef690547b 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan.json @@ -327,8 +327,7 @@ "_", ".SRW", "--match", - "~VkHeapTests", - "~XfermodeImageFilterCroppedInput_Gpu" + "~VkHeapTests" ], "cwd": "[START_DIR]/skia", "env": { diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json index b7da022270..202bffff38 100644 --- a/infra/bots/tasks.json +++ b/infra/bots/tasks.json @@ -7460,7 +7460,7 @@ { "name": "skia/bots/linux_vulkan_intel_driver_debug", "path": "linux_vulkan_intel_driver_debug", - "version": "version:2" + "version": "version:3" } ], "dependencies": [ @@ -7514,7 +7514,7 @@ { "name": "skia/bots/linux_vulkan_intel_driver_release", "path": "linux_vulkan_intel_driver_release", - "version": "version:2" + "version": "version:5" } ], "dependencies": [ @@ -7568,7 +7568,7 @@ { "name": "skia/bots/linux_vulkan_intel_driver_debug", "path": "linux_vulkan_intel_driver_debug", - "version": "version:2" + "version": "version:3" } ], "dependencies": [ @@ -7627,7 +7627,7 @@ { "name": "skia/bots/linux_vulkan_intel_driver_debug", "path": "linux_vulkan_intel_driver_debug", - "version": "version:2" + "version": "version:3" } ], "dependencies": [ @@ -7681,7 +7681,7 @@ { "name": "skia/bots/linux_vulkan_intel_driver_release", "path": "linux_vulkan_intel_driver_release", - "version": "version:2" + "version": "version:5" } ], "dependencies": [ @@ -7740,7 +7740,7 @@ { "name": "skia/bots/linux_vulkan_intel_driver_release", "path": "linux_vulkan_intel_driver_release", - "version": "version:2" + "version": "version:5" } ], "dependencies": [ @@ -7794,7 +7794,7 @@ { "name": "skia/bots/linux_vulkan_intel_driver_debug", "path": "linux_vulkan_intel_driver_debug", - "version": "version:2" + "version": "version:3" } ], "dependencies": [ @@ -7848,7 +7848,7 @@ { "name": "skia/bots/linux_vulkan_intel_driver_release", "path": "linux_vulkan_intel_driver_release", - "version": "version:2" + "version": "version:5" } ], "dependencies": [ @@ -13516,7 +13516,7 @@ { "name": "skia/bots/linux_vulkan_intel_driver_debug", "path": "linux_vulkan_intel_driver_debug", - "version": "version:2" + "version": "version:3" } ], "dependencies": [ @@ -13570,7 +13570,7 @@ { "name": "skia/bots/linux_vulkan_intel_driver_release", "path": "linux_vulkan_intel_driver_release", - "version": "version:2" + "version": "version:5" } ], "dependencies": [ @@ -13624,7 +13624,7 @@ { "name": "skia/bots/linux_vulkan_intel_driver_debug", "path": "linux_vulkan_intel_driver_debug", - "version": "version:2" + "version": "version:3" } ], "dependencies": [ @@ -13683,7 +13683,7 @@ { "name": "skia/bots/linux_vulkan_intel_driver_debug", "path": "linux_vulkan_intel_driver_debug", - "version": "version:2" + "version": "version:3" } ], "dependencies": [ @@ -13737,7 +13737,7 @@ { "name": "skia/bots/linux_vulkan_intel_driver_release", "path": "linux_vulkan_intel_driver_release", - "version": "version:2" + "version": "version:5" } ], "dependencies": [ @@ -13796,7 +13796,7 @@ { "name": "skia/bots/linux_vulkan_intel_driver_release", "path": "linux_vulkan_intel_driver_release", - "version": "version:2" + "version": "version:5" } ], "dependencies": [ @@ -13850,7 +13850,7 @@ { "name": "skia/bots/linux_vulkan_intel_driver_debug", "path": "linux_vulkan_intel_driver_debug", - "version": "version:2" + "version": "version:3" } ], "dependencies": [ @@ -13904,7 +13904,7 @@ { "name": "skia/bots/linux_vulkan_intel_driver_release", "path": "linux_vulkan_intel_driver_release", - "version": "version:2" + "version": "version:5" } ], "dependencies": [ |