Commit 30e927be authored by Chong Gu's avatar Chong Gu Committed by Commit Bot

[cc] Disable failing cc_unittests on Fuchsia

Disable skia_gl renderer for Fuchsia since it's not supported


Bug: 1043399
Change-Id: I44a25bb3745282b701ba86ad44c19b8a466f39b4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2008235Reviewed-by: default avatarRobert Kroeger <rjkroege@chromium.org>
Reviewed-by: default avatarweiliangc <weiliangc@chromium.org>
Commit-Queue: Chong Gu <chonggu@google.com>
Cr-Commit-Position: refs/heads/master@{#737454}
parent 09ad54d0
......@@ -791,6 +791,14 @@ cc_test("cc_unittests") {
"//third_party/mesa_headers",
]
defines = []
# TODO(crbug.com/1047032): Enable SKIA renderers on emulators with Swiftshader
# support.
if (!is_fuchsia) {
defines += [ "GL_ON_PLATFORM" ]
}
if (enable_vulkan) {
deps += [
"//gpu/vulkan:test_support",
......@@ -801,7 +809,7 @@ cc_test("cc_unittests") {
# CFI issue: https://crbug.com/967819
# LSAN issue: https://crbug.com/971325
if (use_x11 && !is_cfi && !is_lsan) {
defines = [ "ENABLE_CC_VULKAN_TESTS" ]
defines += [ "ENABLE_CC_VULKAN_TESTS" ]
}
}
}
......
......@@ -260,7 +260,9 @@ class LayerTreeHostBlendingPixelTest
std::vector<PixelResourceTestCase> const kTestCases = {
{LayerTreeTest::RENDERER_SOFTWARE, SOFTWARE},
{LayerTreeTest::RENDERER_GL, ZERO_COPY},
#if defined(GL_ON_PLATFORM)
{LayerTreeTest::RENDERER_SKIA_GL, GPU},
#endif
#if defined(ENABLE_CC_VULKAN_TESTS)
{LayerTreeTest::RENDERER_SKIA_VK, GPU},
#endif
......
......@@ -72,7 +72,9 @@ class LayerTreeHostFiltersPixelTest
LayerTreeTest::RendererType const kRendererTypes[] = {
LayerTreeTest::RENDERER_GL,
#if defined(GL_ON_PLATFORM)
LayerTreeTest::RENDERER_SKIA_GL,
#endif
LayerTreeTest::RENDERER_SOFTWARE,
#if defined(ENABLE_CC_VULKAN_TESTS)
LayerTreeTest::RENDERER_SKIA_VK,
......@@ -87,7 +89,9 @@ using LayerTreeHostFiltersPixelTestGPU = LayerTreeHostFiltersPixelTest;
LayerTreeTest::RendererType const kRendererTypesGpu[] = {
LayerTreeTest::RENDERER_GL,
#if defined(GL_ON_PLATFORM)
LayerTreeTest::RENDERER_SKIA_GL,
#endif
#if defined(ENABLE_CC_VULKAN_TESTS)
LayerTreeTest::RENDERER_SKIA_VK,
#endif
......
......@@ -33,9 +33,11 @@ std::vector<PixelResourceTestCase> const kTestCases = {
{LayerTreeTest::RENDERER_GL, GPU},
{LayerTreeTest::RENDERER_GL, ONE_COPY},
{LayerTreeTest::RENDERER_GL, ZERO_COPY},
#if defined(GL_ON_PLATFORM)
{LayerTreeTest::RENDERER_SKIA_GL, GPU},
{LayerTreeTest::RENDERER_SKIA_GL, ONE_COPY},
{LayerTreeTest::RENDERER_SKIA_GL, ZERO_COPY},
#endif
#if defined(ENABLE_CC_VULKAN_TESTS)
{LayerTreeTest::RENDERER_SKIA_VK, GPU},
#endif
......@@ -877,9 +879,11 @@ MaskTestConfig const kTestConfigs[] = {
MaskTestConfig{{LayerTreeTest::RENDERER_GL, ZERO_COPY}, kForceShaders},
MaskTestConfig{{LayerTreeTest::RENDERER_GL, ZERO_COPY},
kUseAntialiasing | kForceShaders},
#if defined(GL_ON_PLATFORM)
MaskTestConfig{{LayerTreeTest::RENDERER_SKIA_GL, ZERO_COPY}, 0},
MaskTestConfig{{LayerTreeTest::RENDERER_SKIA_GL, ZERO_COPY},
kUseAntialiasing},
#endif
#if defined(ENABLE_CC_VULKAN_TESTS)
MaskTestConfig{{LayerTreeTest::RENDERER_SKIA_VK, ZERO_COPY}, 0},
MaskTestConfig{{LayerTreeTest::RENDERER_SKIA_VK, ZERO_COPY},
......
......@@ -26,7 +26,9 @@ class LayerTreeHostMirrorPixelTest
const LayerTreeTest::RendererType kRendererTypes[] = {
LayerTreeTest::RENDERER_GL,
#if defined(GL_ON_PLATFORM)
LayerTreeTest::RENDERER_SKIA_GL,
#endif
LayerTreeTest::RENDERER_SOFTWARE,
#if defined(ENABLE_CC_VULKAN_TESTS)
LayerTreeTest::RENDERER_SKIA_VK,
......
......@@ -420,6 +420,7 @@ ReadbackTestConfig const kTestConfigs[] = {
ReadbackTestConfig{LayerTreeTest::RENDERER_SOFTWARE, READBACK_BITMAP},
ReadbackTestConfig{LayerTreeTest::RENDERER_GL, READBACK_TEXTURE},
ReadbackTestConfig{LayerTreeTest::RENDERER_GL, READBACK_BITMAP},
#if defined(GL_ON_PLATFORM)
#if !defined(OS_WIN)
// TODO(crbug.com/1046788): The skia readback path doesn't support
// RGBA_TEXTURE readback requests yet. Don't run these tests on platforms
......@@ -427,6 +428,7 @@ ReadbackTestConfig const kTestConfigs[] = {
ReadbackTestConfig{LayerTreeTest::RENDERER_SKIA_GL, READBACK_TEXTURE},
#endif
ReadbackTestConfig{LayerTreeTest::RENDERER_SKIA_GL, READBACK_BITMAP},
#endif // GL_ON_PLATFORM
#if defined(ENABLE_CC_VULKAN_TESTS)
ReadbackTestConfig{LayerTreeTest::RENDERER_SKIA_VK, READBACK_BITMAP},
#endif
......@@ -442,6 +444,7 @@ ReadbackTestConfig const kMaybeVulkanTestConfigs[] = {
ReadbackTestConfig{LayerTreeTest::RENDERER_SOFTWARE, READBACK_BITMAP},
ReadbackTestConfig{LayerTreeTest::RENDERER_GL, READBACK_TEXTURE},
ReadbackTestConfig{LayerTreeTest::RENDERER_GL, READBACK_BITMAP},
#if defined(GL_ON_PLATFORM)
#if !defined(OS_WIN)
// TODO(crbug.com/1046788): The skia readback path doesn't support
// RGBA_TEXTURE readback requests yet. Don't run these tests on platforms
......@@ -449,6 +452,7 @@ ReadbackTestConfig const kMaybeVulkanTestConfigs[] = {
ReadbackTestConfig{LayerTreeTest::RENDERER_SKIA_GL, READBACK_TEXTURE},
#endif
ReadbackTestConfig{LayerTreeTest::RENDERER_SKIA_GL, READBACK_BITMAP},
#endif // GL_ON_PLATFORM
#if defined(ENABLE_CC_VULKAN_TESTS) && !defined(THREAD_SANITIZER) && \
!defined(MEMORY_SANITIZER)
ReadbackTestConfig{LayerTreeTest::RENDERER_SKIA_VK, READBACK_BITMAP},
......
......@@ -78,7 +78,9 @@ class PaintedScrollbar : public FakeScrollbar {
LayerTreeTest::RendererType const kRendererTypes[] = {
LayerTreeTest::RENDERER_GL,
#if defined(GL_ON_PLATFORM)
LayerTreeTest::RENDERER_SKIA_GL,
#endif
#if defined(ENABLE_CC_VULKAN_TESTS)
LayerTreeTest::RENDERER_SKIA_VK,
#endif
......
......@@ -59,7 +59,9 @@ class LayerTreeHostSynchronousPixelTest
LayerTreeTest::RendererType const kRendererTypesGpu[] = {
LayerTreeTest::RENDERER_GL,
#if defined(GL_ON_PLATFORM)
LayerTreeTest::RENDERER_SKIA_GL,
#endif
#if defined(ENABLE_CC_VULKAN_TESTS)
LayerTreeTest::RENDERER_SKIA_VK,
#endif
......
......@@ -180,8 +180,10 @@ std::vector<TilesTestConfig> const kTestCases = {
{LayerTreeTest::RENDERER_SOFTWARE, BITMAP},
{LayerTreeTest::RENDERER_GL, ONE_COPY},
{LayerTreeTest::RENDERER_GL, GPU},
#if defined(GL_ON_PLATFORM)
{LayerTreeTest::RENDERER_SKIA_GL, ONE_COPY},
{LayerTreeTest::RENDERER_SKIA_GL, GPU},
#endif
#if defined(ENABLE_CC_VULKAN_TESTS)
{LayerTreeTest::RENDERER_SKIA_VK, ONE_COPY},
{LayerTreeTest::RENDERER_SKIA_VK, GPU},
......@@ -207,7 +209,9 @@ TEST_P(LayerTreeHostTilesTestPartialInvalidation, FullRaster) {
std::vector<TilesTestConfig> const kTestCasesMultiThread = {
{LayerTreeTest::RENDERER_GL, ONE_COPY},
#if defined(GL_ON_PLATFORM)
{LayerTreeTest::RENDERER_SKIA_GL, ONE_COPY},
#endif
#if defined(ENABLE_CC_VULKAN_TESTS)
{LayerTreeTest::RENDERER_SKIA_VK, ONE_COPY},
#endif
......@@ -252,8 +256,10 @@ INSTANTIATE_TEST_SUITE_P(
All,
LayerTreeHostTilesTestPartialInvalidationLowBitDepth,
::testing::Values(
TilesTestConfig{LayerTreeTest::RENDERER_GL, GPU_LOW_BIT_DEPTH},
TilesTestConfig{LayerTreeTest::RENDERER_SKIA_GL, GPU_LOW_BIT_DEPTH}));
#if defined(GL_ON_PLATFORM)
TilesTestConfig{LayerTreeTest::RENDERER_SKIA_GL, GPU_LOW_BIT_DEPTH},
#endif
TilesTestConfig{LayerTreeTest::RENDERER_GL, GPU_LOW_BIT_DEPTH}));
TEST_P(LayerTreeHostTilesTestPartialInvalidationLowBitDepth, PartialRaster) {
use_partial_raster_ = true;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment