Test GrContextOptions persistent cache on linux/quadrop400 bots.

Change-Id: I181ed6d294774a9c6886fde8252bfdde99adc572
Reviewed-on: https://skia-review.googlesource.com/140982
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

7 files changed, 25 insertions, 3 deletions

diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp
index d524b1bea2..4f139eb634 100644
--- a/dm/DMSrcSink.cpp
+++ b/dm/DMSrcSink.cpp
@@ -1653,7 +1653,7 @@ Error GPUPersistentCacheTestingSink::draw(const Src& src, SkBitmap* dst, SkWStre
     if (!refErr.isEmpty()) {
         return refErr;
     }
-    SkASSERT(memoryCache.numCacheMisses());
+    SkASSERT(!memoryCache.numCacheMisses());
 
     return compare_bitmaps(reference, *dst);
 }
diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1.json b/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1.json
index 5d0a37c191..b83a2a8fd8 100644
--- a/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1.json
+++ b/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1.json
@@ -270,6 +270,10 @@
       "image",
       "_",
       "_",
+      "gltestpersistentcache",
+      "gm",
+      "_",
+      "atlastext",
       "_",
       "svg",
       "_",
diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3.json b/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3.json
index fa734bdd4e..89fc001878 100644
--- a/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3.json
+++ b/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3.json
@@ -270,6 +270,10 @@
       "image",
       "_",
       "_",
+      "gltestpersistentcache",
+      "gm",
+      "_",
+      "atlastext",
       "_",
       "svg",
       "_",
diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41.json b/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41.json
index 7efbeb3bc9..5c828f445b 100644
--- a/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41.json
+++ b/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41.json
@@ -185,6 +185,7 @@
       "glsrgb",
       "glmsaa8",
       "gl1010102",
+      "gltestpersistentcache",
       "--src",
       "tests",
       "gm",
@@ -196,6 +197,10 @@
       "image",
       "_",
       "_",
+      "gltestpersistentcache",
+      "gm",
+      "_",
+      "atlastext",
       "_",
       "svg",
       "_",
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 cc3ad73aad..17985b42cc 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
@@ -185,6 +185,7 @@
       "glsrgb",
       "glmsaa8",
       "gl1010102",
+      "gltestpersistentcache",
       "--src",
       "tests",
       "gm",
@@ -196,6 +197,10 @@
       "image",
       "_",
       "_",
+      "gltestpersistentcache",
+      "gm",
+      "_",
+      "atlastext",
       "_",
       "svg",
       "_",
diff --git a/infra/bots/recipes/test.py b/infra/bots/recipes/test.py
index b8f0deaea3..e4278a9c8e 100644
--- a/infra/bots/recipes/test.py
+++ b/infra/bots/recipes/test.py
@@ -246,16 +246,19 @@ def dm_flags(api, bot):
     if 'Vulkan' in bot:
       configs = ['vk']
 
-    # Test 1010102 on our Linux/NVIDIA bots
+    # 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 'Vulkan' in bot:
         configs.append('vk1010102')
         # Decoding transparent images to 1010102 just looks bad
         blacklist('vk1010102 image _ _')
       else:
-        configs.append('gl1010102')
+        configs.extend(['gl1010102', 'gltestpersistentcache'])
         # Decoding transparent images to 1010102 just looks bad
         blacklist('gl1010102 image _ _')
+        # This test produces slightly different pixels run to run on NV.
+        blacklist('gltestpersistentcache gm _ atlastext')
 
     if 'ChromeOS' in bot:
       # Just run GLES for now - maybe add gles_msaa4 in the future
diff --git a/tools/LsanSuppressions.cpp b/tools/LsanSuppressions.cpp
index c81184f3b0..0ebcb301c2 100644
--- a/tools/LsanSuppressions.cpp
+++ b/tools/LsanSuppressions.cpp
@@ -19,6 +19,7 @@ extern "C" {
     const char* __lsan_default_suppressions() {
         return "leak:libfontconfig\n"    // FontConfig looks like it leaks, but it doesn't.
                "leak:libGL.so\n"         // For NVidia driver.
+               "leak:libGLX_nvidia.so\n" // For NVidia driver.
                "leak:__strdup\n"         // An eternal mystery, skia:2916.
                ;
     }