diff options
| author |  Brian Salomon <bsalomon@google.com> | 2017-11-13 09:34:02 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-11-13 16:20:10 +0000 |
| commit | f44754a42b9d5ced2e6f075b4bd058a498488d3a (patch) | |
| tree | 63f22f5ec8fadc9cd7ea11f11bb84d2ca9aedc52 /tests/TestConfigParsing.cpp | |
| parent | 1ff420653d72b1ba9a0621f09316febe2d82f86d (diff) | |
Drop support for OSMesa in test tools and remove build bot
Change-Id: Ic85ee05fe292a36a053ca7a20ccce24a4da4fae2
Reviewed-on: https://skia-review.googlesource.com/70026
Reviewed-by: Joe Gregorio <jcgregorio@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'tests/TestConfigParsing.cpp')
| -rw-r--r-- | tests/TestConfigParsing.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/tests/TestConfigParsing.cpp b/tests/TestConfigParsing.cpp index 8e2276c51a..22d79aa6dc 100644 --- a/tests/TestConfigParsing.cpp +++ b/tests/TestConfigParsing.cpp @@ -237,11 +237,7 @@ DEF_TEST(ParseConfigs_DefaultConfigs, reporter) { GrContextFactory::kGL_ContextType); REPORTER_ASSERT(reporter, configs[46]->asConfigGpu()->getColorType() == kRGB_565_SkColorType); REPORTER_ASSERT(reporter, configs[46]->asConfigGpu()->getAlphaType() == kOpaque_SkAlphaType); -#if SK_MESA - REPORTER_ASSERT(reporter, configs[23]->asConfigGpu()); -#else REPORTER_ASSERT(reporter, !configs[22]->asConfigGpu()); -#endif REPORTER_ASSERT(reporter, configs[26]->asConfigGpu()); REPORTER_ASSERT(reporter, configs[27]->asConfigGpu()); REPORTER_ASSERT(reporter, configs[27]->asConfigGpu()->getSamples() == 4); @@ -295,12 +291,7 @@ DEF_TEST(ParseConfigs_ExtendedGpuConfigsCorrect, reporter) { REPORTER_ASSERT(reporter, configs[2]->asConfigGpu()->getContextType() == GrContextFactory::kANGLE_GL_ES3_ContextType); REPORTER_ASSERT(reporter, configs[2]->asConfigGpu()); -#if SK_MESA - REPORTER_ASSERT(reporter, configs[3]->asConfigGpu()->getContextType() == - GrContextFactory::kMESA_ContextType); -#else REPORTER_ASSERT(reporter, !configs[3]->asConfigGpu()); -#endif REPORTER_ASSERT(reporter, configs[4]->asConfigGpu()->getContextType() == GrContextFactory::kCommandBuffer_ContextType); REPORTER_ASSERT(reporter, configs[5]->asConfigGpu()->getContextType() == |