From dacfa917783581a7368a103f0ce2ae228989d6f7 Mon Sep 17 00:00:00 2001 From: Tim Van Patten Date: Thu, 28 Oct 2021 12:49:33 -0600 Subject: [PATCH] Disable flaky multithreaded tests The following multithreaded tests are flaky in CQ and are being suppressed: VulkanMultithreadingTest.MultiContextDrawSmallDescriptorPools/ES3_Vulkan MultithreadingTestES3.MultithreadFenceDraw/ES3_Vulkan_SwiftShader Bug: angleproject:5418 Bug: angleproject:6633 Change-Id: I170085064597165972b7206d98130917bb46fcaf Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3251684 Reviewed-by: Tim Van Patten Reviewed-by: Jamie Madill Commit-Queue: Tim Van Patten --- src/tests/gl_tests/MultithreadingTest.cpp | 2 +- src/tests/gl_tests/VulkanMultithreadingTest.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/tests/gl_tests/MultithreadingTest.cpp b/src/tests/gl_tests/MultithreadingTest.cpp index d4326703f..c649741bb 100644 --- a/src/tests/gl_tests/MultithreadingTest.cpp +++ b/src/tests/gl_tests/MultithreadingTest.cpp @@ -725,7 +725,7 @@ void MultithreadingTestES3::mainThreadDraw(bool useDraw) TEST_P(MultithreadingTestES3, MultithreadFenceDraw) { // http://anglebug.com/5418 - ANGLE_SKIP_TEST_IF(IsLinux() && IsIntel() && IsVulkan()); + ANGLE_SKIP_TEST_IF(IsLinux() && IsVulkan() && (IsIntel() || IsSwiftshaderDevice())); // Have the secondary thread use glDrawArrays() mainThreadDraw(true); diff --git a/src/tests/gl_tests/VulkanMultithreadingTest.cpp b/src/tests/gl_tests/VulkanMultithreadingTest.cpp index 812778a88..c0a74a176 100644 --- a/src/tests/gl_tests/VulkanMultithreadingTest.cpp +++ b/src/tests/gl_tests/VulkanMultithreadingTest.cpp @@ -126,6 +126,8 @@ class VulkanMultithreadingTest : public ANGLETest // descriptor pools. TEST_P(VulkanMultithreadingTest, MultiContextDrawSmallDescriptorPools) { + // TODO(http://anglebug.com/6633: Flaky on linux. + ANGLE_SKIP_TEST_IF(IsLinux()); ANGLE_SKIP_TEST_IF(!platformSupportsMultithreading()); // Verify the extension is enabled. ASSERT_TRUE(IsGLExtensionEnabled(kExtensionName));