Commit 0e3bef3e authored by vitaliii's avatar vitaliii Committed by Commit Bot

Reland "Disable some LayerTreeHostBlendingPixelTest on Linux, because flaky."

This is a reland of bd08401c92882ed1c69503217a67b17274439621
(Note that the original CL is no longer in the tree; it landed during yesterday's
Gerrit outage and was reset out of existence. So this is the first time it has
"officially" landed in the tree.)

Original change's description:
> Disable some LayerTreeHostBlendingPixelTest on Linux, because flaky.
>
> Disable on Linux
>
> LayerTreeHostBlendingPixelTest.BlendingWithRenderPassShadersWithMaskColorMatrixAA_GL
> LayerTreeHostBlendingPixelTest.BlendingWithRenderPassWithMaskColorMatrixAA_GL
> LayerTreeHostBlendingPixelTest.BlendingWithRenderPassWithMaskAA_GL
> LayerTreeHostBlendingPixelTest.BlendingWithRenderPassShadersWithMaskColorMatrix_GL_TextureRect
> LayerTreeHostBlendingPixelTest.BlendingWithRenderPassShadersColorMatrixAA_GL
> LayerTreeHostBlendingPixelTest.BlendingWithRenderPassShadersWithMaskColorMatrix_GL
> LayerTreeHostBlendingPixelTest.BlendingWithRenderPassShadersWithMaskAA_GL
> LayerTreeHostBlendingPixelTest.BlendingWithRenderPassColorMatrixAA_GL
>
> because flaky.
>
> TBR=ajuma@chromium.org
>
> Bug:872733
> Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;master.tryserver.blink:linux_trusty_blink_rel
> Change-Id: I61a0b1cc99172da0437eec8f10149f0c46c966eb
> Reviewed-on: https://chromium-review.googlesource.com/1169204
> Reviewed-by: vitaliii <vitaliii@chromium.org>
> Commit-Queue: vitaliii <vitaliii@chromium.org>

TBR=ajuma@chromium.org

Bug: 872733
Change-Id: I044022d2db22b1cccb20692cf7300c3784ba2859
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;master.tryserver.blink:linux_trusty_blink_rel
Reviewed-on: https://chromium-review.googlesource.com/1170543Reviewed-by: default avatarMatt Giuca <mgiuca@chromium.org>
Commit-Queue: Matt Giuca <mgiuca@chromium.org>
Cr-Commit-Position: refs/heads/master@{#582085}
parent 1b5a44ba
...@@ -374,7 +374,16 @@ TEST_F(LayerTreeHostBlendingPixelTest, ...@@ -374,7 +374,16 @@ TEST_F(LayerTreeHostBlendingPixelTest,
SOFTWARE, FILE_PATH_LITERAL("blending_render_pass_mask.png"), kUseMasks); SOFTWARE, FILE_PATH_LITERAL("blending_render_pass_mask.png"), kUseMasks);
} }
TEST_F(LayerTreeHostBlendingPixelTest, BlendingWithRenderPassWithMaskAA_GL) { // Fails on Linux CFI, see https://crbug.com/872733.
#if defined(OS_LINUX)
#define MAYBE_BlendingWithRenderPassWithMaskAA_GL \
DISABLED_BlendingWithRenderPassWithMaskAA_GL
#else
#define MAYBE_BlendingWithRenderPassWithMaskAA_GL \
BlendingWithRenderPassWithMaskAA_GL
#endif
TEST_F(LayerTreeHostBlendingPixelTest,
MAYBE_BlendingWithRenderPassWithMaskAA_GL) {
RunBlendingWithRenderPass(ZERO_COPY, RunBlendingWithRenderPass(ZERO_COPY,
FILE_PATH_LITERAL("blending_render_pass_mask.png"), FILE_PATH_LITERAL("blending_render_pass_mask.png"),
kUseMasks | kUseAntialiasing); kUseMasks | kUseAntialiasing);
...@@ -399,7 +408,16 @@ TEST_F(LayerTreeHostBlendingPixelTest, ...@@ -399,7 +408,16 @@ TEST_F(LayerTreeHostBlendingPixelTest,
SOFTWARE, FILE_PATH_LITERAL("blending_render_pass.png"), kUseColorMatrix); SOFTWARE, FILE_PATH_LITERAL("blending_render_pass.png"), kUseColorMatrix);
} }
TEST_F(LayerTreeHostBlendingPixelTest, BlendingWithRenderPassColorMatrixAA_GL) { // Fails on Linux CFI, see https://crbug.com/872733.
#if defined(OS_LINUX)
#define MAYBE_BlendingWithRenderPassColorMatrixAA_GL \
DISABLED_BlendingWithRenderPassColorMatrixAA_GL
#else
#define MAYBE_BlendingWithRenderPassColorMatrixAA_GL \
BlendingWithRenderPassColorMatrixAA_GL
#endif
TEST_F(LayerTreeHostBlendingPixelTest,
MAYBE_BlendingWithRenderPassColorMatrixAA_GL) {
RunBlendingWithRenderPass(ZERO_COPY, RunBlendingWithRenderPass(ZERO_COPY,
FILE_PATH_LITERAL("blending_render_pass.png"), FILE_PATH_LITERAL("blending_render_pass.png"),
kUseAntialiasing | kUseColorMatrix); kUseAntialiasing | kUseColorMatrix);
...@@ -427,7 +445,8 @@ TEST_F(LayerTreeHostBlendingPixelTest, ...@@ -427,7 +445,8 @@ TEST_F(LayerTreeHostBlendingPixelTest,
} }
// Often times out on Windows 10. See: https://crbug.com/870236. // Often times out on Windows 10. See: https://crbug.com/870236.
#if defined(OS_WIN) // Fails on Linux CFI, see https://crbug.com/872733.
#if (defined(OS_WIN) || defined(OS_LINUX))
#define MAYBE_BlendingWithRenderPassWithMaskColorMatrixAA_GL \ #define MAYBE_BlendingWithRenderPassWithMaskColorMatrixAA_GL \
DISABLED_BlendingWithRenderPassWithMaskColorMatrixAA_GL DISABLED_BlendingWithRenderPassWithMaskColorMatrixAA_GL
#else #else
...@@ -474,8 +493,16 @@ TEST_F(LayerTreeHostBlendingPixelTest, ...@@ -474,8 +493,16 @@ TEST_F(LayerTreeHostBlendingPixelTest,
kUseMasks | kForceShaders); kUseMasks | kForceShaders);
} }
// Fails on Linux CFI, see https://crbug.com/872733.
#if defined(OS_LINUX)
#define MAYBE_BlendingWithRenderPassShadersWithMaskAA_GL \
DISABLED_BlendingWithRenderPassShadersWithMaskAA_GL
#else
#define MAYBE_BlendingWithRenderPassShadersWithMaskAA_GL \
BlendingWithRenderPassShadersWithMaskAA_GL
#endif
TEST_F(LayerTreeHostBlendingPixelTest, TEST_F(LayerTreeHostBlendingPixelTest,
BlendingWithRenderPassShadersWithMaskAA_GL) { MAYBE_BlendingWithRenderPassShadersWithMaskAA_GL) {
RunBlendingWithRenderPass(ZERO_COPY, RunBlendingWithRenderPass(ZERO_COPY,
FILE_PATH_LITERAL("blending_render_pass_mask.png"), FILE_PATH_LITERAL("blending_render_pass_mask.png"),
kUseMasks | kUseAntialiasing | kForceShaders); kUseMasks | kUseAntialiasing | kForceShaders);
...@@ -495,29 +522,54 @@ TEST_F(LayerTreeHostBlendingPixelTest, ...@@ -495,29 +522,54 @@ TEST_F(LayerTreeHostBlendingPixelTest,
kUseColorMatrix | kForceShaders); kUseColorMatrix | kForceShaders);
} }
// Fails on Linux CFI, see https://crbug.com/872733.
#if defined(OS_LINUX)
#define MAYBE_BlendingWithRenderPassShadersColorMatrixAA_GL \
DISABLED_BlendingWithRenderPassShadersColorMatrixAA_GL
#else
#define MAYBE_BlendingWithRenderPassShadersColorMatrixAA_GL \
BlendingWithRenderPassShadersColorMatrixAA_GL
#endif
TEST_F(LayerTreeHostBlendingPixelTest, TEST_F(LayerTreeHostBlendingPixelTest,
BlendingWithRenderPassShadersColorMatrixAA_GL) { MAYBE_BlendingWithRenderPassShadersColorMatrixAA_GL) {
RunBlendingWithRenderPass(ZERO_COPY, RunBlendingWithRenderPass(ZERO_COPY,
FILE_PATH_LITERAL("blending_render_pass.png"), FILE_PATH_LITERAL("blending_render_pass.png"),
kUseAntialiasing | kUseColorMatrix | kForceShaders); kUseAntialiasing | kUseColorMatrix | kForceShaders);
} }
// Fails on Linux CFI, see https://crbug.com/872733.
#if defined(OS_LINUX)
#define MAYBE_BlendingWithRenderPassShadersWithMaskColorMatrix_GL \
DISABLED_BlendingWithRenderPassShadersWithMaskColorMatrix_GL
#else
#define MAYBE_BlendingWithRenderPassShadersWithMaskColorMatrix_GL \
BlendingWithRenderPassShadersWithMaskColorMatrix_GL
#endif
TEST_F(LayerTreeHostBlendingPixelTest, TEST_F(LayerTreeHostBlendingPixelTest,
BlendingWithRenderPassShadersWithMaskColorMatrix_GL) { MAYBE_BlendingWithRenderPassShadersWithMaskColorMatrix_GL) {
RunBlendingWithRenderPass(ZERO_COPY, RunBlendingWithRenderPass(ZERO_COPY,
FILE_PATH_LITERAL("blending_render_pass_mask.png"), FILE_PATH_LITERAL("blending_render_pass_mask.png"),
kUseMasks | kUseColorMatrix | kForceShaders); kUseMasks | kUseColorMatrix | kForceShaders);
} }
// Fails on Linux CFI, see https://crbug.com/872733.
#if defined(OS_LINUX)
#define MAYBE_BlendingWithRenderPassShadersWithMaskColorMatrix_GL_TextureRect \
DISABLED_BlendingWithRenderPassShadersWithMaskColorMatrix_GL_TextureRect
#else
#define MAYBE_BlendingWithRenderPassShadersWithMaskColorMatrix_GL_TextureRect \
BlendingWithRenderPassShadersWithMaskColorMatrix_GL_TextureRect
#endif
TEST_F(LayerTreeHostBlendingPixelTest, TEST_F(LayerTreeHostBlendingPixelTest,
BlendingWithRenderPassShadersWithMaskColorMatrix_GL_TextureRect) { MAYBE_BlendingWithRenderPassShadersWithMaskColorMatrix_GL_TextureRect) {
RunBlendingWithRenderPass(ZERO_COPY, RunBlendingWithRenderPass(ZERO_COPY,
FILE_PATH_LITERAL("blending_render_pass_mask.png"), FILE_PATH_LITERAL("blending_render_pass_mask.png"),
kUseMasks | kUseColorMatrix | kForceShaders); kUseMasks | kUseColorMatrix | kForceShaders);
} }
// Often times out on Windows 10. See: https://crbug.com/870236. // Often times out on Windows 10. See: https://crbug.com/870236.
#if defined(OS_WIN) // Fails on Linux CFI, see https://crbug.com/872733.
#if (defined(OS_WIN) || defined(OS_LINUX))
#define MAYBE_BlendingWithRenderPassShadersWithMaskColorMatrixAA_GL \ #define MAYBE_BlendingWithRenderPassShadersWithMaskColorMatrixAA_GL \
DISABLED_BlendingWithRenderPassShadersWithMaskColorMatrixAA_GL DISABLED_BlendingWithRenderPassShadersWithMaskColorMatrixAA_GL
#else #else
......
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