commit 8fe24272fa6d2fa9eb2458221ed9852d6ec16f56
author Brian Salomon <bsalomon@google.com> Fri Jul 07 12:56:11 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Jul 07 20:47:38 2017 +0000
tree 85277ea7a49b36a18243768d7a2f27e44742aa84
parent a531f2502846c4d4eed42b91589d70525c8de0d2

Add mock config to tools and run through gms and benchs without crashing.

Change-Id: I7e2474129ef2b15899ad2baeb8d18f39d05da98c
Reviewed-on: https://skia-review.googlesource.com/21820
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>

tests/TestConfigParsing.cpp

diff --git a/tests/TestConfigParsing.cpp b/tests/TestConfigParsing.cpp
index 83051aa..ca91f5b 100644
--- a/tests/TestConfigParsing.cpp
+++ b/tests/TestConfigParsing.cpp
@@ -75,12 +75,50 @@
     // Parses all default configs and returns correct "tag".
 
     SkCommandLineFlags::StringArray config1 = make_string_array({
-        "565", "8888", "debuggl", "gl", "gldft", "nullgl", "glmsaa8", "glmsaa4",
-        "nonrendering", "nullgl", "gles", "glnvpr8", "glnvpr4", "glnvprdit8", "glesnvprdit4",
-        "pdf", "skp", "svg", "xps", "angle_d3d11_es2", "angle_gl_es2", "commandbuffer", "mesa",
-        "hwui", "glf16", "glessrgb", "gl", "glnvpr4", "glnvprdit4", "glsrgb", "glmsaa4", "vk",
-        "glinst", "glinst4", "glinstdit4", "glinst8", "glinstdit8", "glesinst", "glesinst4",
-        "glesinstdit4", "glwide", "glnarrow", "glnostencils"
+        "565",
+        "8888",
+        "debuggl",
+        "gl",
+        "gldft",
+        "nullgl",
+        "glmsaa8",
+        "glmsaa4",
+        "nonrendering",
+        "nullgl",
+        "gles",
+        "glnvpr8",
+        "glnvpr4",
+        "glnvprdit8",
+        "glesnvprdit4",
+        "pdf",
+        "skp",
+        "svg",
+        "xps",
+        "angle_d3d11_es2",
+        "angle_gl_es2",
+        "commandbuffer",
+        "mesa",
+        "hwui",
+        "glf16",
+        "glessrgb",
+        "gl",
+        "glnvpr4",
+        "glnvprdit4",
+        "glsrgb",
+        "glmsaa4",
+        "vk",
+        "glinst",
+        "glinst4",
+        "glinstdit4",
+        "glinst8",
+        "glinstdit8",
+        "glesinst",
+        "glesinst4",
+        "glesinstdit4",
+        "glwide",
+        "glnarrow",
+        "glnostencils",
+        "mock"
     });
 
     SkCommandLineConfigArray configs;
@@ -147,6 +185,12 @@
     REPORTER_ASSERT(reporter, configs[41]->asConfigGpu()->getColorSpace()->gammaIsLinear());
     REPORTER_ASSERT(reporter, *as_CSB(configs[41]->asConfigGpu()->getColorSpace())->toXYZD50() !=
                     *as_CSB(srgbColorSpace)->toXYZD50());
+    REPORTER_ASSERT(reporter, configs[42]->asConfigGpu()->getContextType() ==
+                              GrContextFactory::kGL_ContextType);
+    REPORTER_ASSERT(reporter, SkToBool(configs[42]->asConfigGpu()->getContextOverrides() &
+                              SkCommandLineConfigGpu::ContextOverrides::kAvoidStencilBuffers));
+    REPORTER_ASSERT(reporter, configs[43]->asConfigGpu()->getContextType() ==
+                              GrContextFactory::kMock_ContextType);
     REPORTER_ASSERT(reporter, configs[32]->asConfigGpu()->getUseInstanced());
     REPORTER_ASSERT(reporter, configs[33]->asConfigGpu()->getContextType() ==
                               GrContextFactory::kGL_ContextType);
@@ -215,6 +259,7 @@
         "gpu[api=gles]",
         "gpu[api=gl]",
         "gpu[api=vulkan]",
+        "gpu[api=mock]",
     });
 
     SkCommandLineConfigArray configs;
@@ -260,6 +305,8 @@
     REPORTER_ASSERT(reporter, !configs[7]->asConfigGpu()->getUseDIText());
     REPORTER_ASSERT(reporter, configs[7]->asConfigGpu()->getSamples() == 0);
 #endif
+    REPORTER_ASSERT(reporter, configs[8]->asConfigGpu()->getContextType() ==
+                   GrContextFactory::kMock_ContextType);
 #endif
 }