From bfc63c1ea41047fc5e299ebf2086309eaa8e79ce Mon Sep 17 00:00:00 2001 From: Brian Salomon Date: Mon, 16 Jul 2018 15:48:22 -0400 Subject: Stop running gltestpersistentcache in PreAbandonContext mode The config fails to initialized in push_sinks because readbacks in test draw don't match (as the GrContext is already in abandoned mode). Change-Id: I73c68ab52df3e83b688ab43fbe74cf4c1ae8c19d Reviewed-on: https://skia-review.googlesource.com/141562 Auto-Submit: Brian Salomon Reviewed-by: Brian Osman Commit-Queue: Brian Osman --- ...l-Valgrind_PreAbandonGpuContext_SK_CPU_LIMIT_SSE41.json | 14 -------------- infra/bots/recipes/test.py | 3 ++- 2 files changed, 2 insertions(+), 15 deletions(-) (limited to 'infra') diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_PreAbandonGpuContext_SK_CPU_LIMIT_SSE41.json b/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_PreAbandonGpuContext_SK_CPU_LIMIT_SSE41.json index c0363162a0..ee25c36060 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_PreAbandonGpuContext_SK_CPU_LIMIT_SSE41.json +++ b/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_PreAbandonGpuContext_SK_CPU_LIMIT_SSE41.json @@ -184,8 +184,6 @@ "gldft", "glsrgb", "glmsaa8", - "gl1010102", - "gltestpersistentcache", "--src", "tests", "gm", @@ -193,18 +191,6 @@ "colorImage", "svg", "--blacklist", - "gl1010102", - "image", - "_", - "_", - "gltestpersistentcache", - "gm", - "_", - "atlastext", - "gltestpersistentcache", - "gm", - "_", - "dftext", "_", "svg", "_", diff --git a/infra/bots/recipes/test.py b/infra/bots/recipes/test.py index 4fcd270290..c95e92a9d2 100644 --- a/infra/bots/recipes/test.py +++ b/infra/bots/recipes/test.py @@ -248,7 +248,8 @@ def dm_flags(api, bot): # Test 1010102 on our Linux/NVIDIA bots and the persistent cache config # on the GL bots. - if 'QuadroP400' in bot and api.vars.is_linux: + if ('QuadroP400' in bot and 'PreAbandonGpuContext' not in bot and + api.vars.is_linux): if 'Vulkan' in bot: configs.append('vk1010102') # Decoding transparent images to 1010102 just looks bad -- cgit v1.2.3