commit 4cb74f447cb75eae5be5019f897b8e89e766d940
author Brian Sheedy <bsheedy@google.com> Tue Apr 16 02:28:21 2024 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Apr 16 02:28:21 2024 +0000
tree b3ca8d2a498ee8e13e4505ab3f4a9d5dafa13e1c
parent b5d89266d090eb586b756294ea09e4beb0c06bcb

Expand SurfaceTests skip

Expands the recently added skip for the experimental Linux/Intel config
in SurfaceTests to apply to more tests and backend configs since this
appears to be a flaky issue that can be hit in other test cases.

Bug: dawn:2531
Change-Id: I4a31fbf9221c09f37e1d4980bd5e4b30c39ca585
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/183982
Reviewed-by: Austin Eng <enga@chromium.org>
Commit-Queue: Austin Eng <enga@chromium.org>
Auto-Submit: Brian Sheedy <bsheedy@google.com>
Commit-Queue: Brian Sheedy <bsheedy@google.com>

src/dawn/tests/end2end/SurfaceTests.cpp

diff --git a/src/dawn/tests/end2end/SurfaceTests.cpp b/src/dawn/tests/end2end/SurfaceTests.cpp
index 5ddf02f..b78ab1f 100644
--- a/src/dawn/tests/end2end/SurfaceTests.cpp
+++ b/src/dawn/tests/end2end/SurfaceTests.cpp
@@ -51,6 +51,11 @@
         DawnTest::SetUp();
         DAWN_TEST_UNSUPPORTED_IF(UsesWire());
 
+        // TODO(crbug.com/dawn/2531): Failing on newer Linux/Intel driver version.
+        // However, IsIntel() and IsMesa() don't work with the null backend.
+        DAWN_SUPPRESS_TEST_IF(IsLinux() && IsNull());
+        DAWN_SUPPRESS_TEST_IF(IsLinux() && IsVulkan() && IsIntel() && IsMesa("23.2"));
+
         glfwSetErrorCallback([](int code, const char* message) {
             ErrorLog() << "GLFW error " << code << " " << message;
         });
@@ -282,9 +287,6 @@
     // TODO(crbug.com/1503912): Failing new ValidateImageAcquireWait in Vulkan Validation Layer.
     DAWN_SUPPRESS_TEST_IF(IsBackendValidationEnabled() && IsWindows() && IsVulkan() && IsIntel());
 
-    // TODO(crbug.com/dawn/2531): Failing on newer Linux/Intel driver version.
-    DAWN_SUPPRESS_TEST_IF(IsLinux() && IsNull() && IsIntel() && IsMesa("23.2"));
-
     wgpu::Surface surface = CreateTestSurface();
     wgpu::SurfaceConfiguration config = GetPreferredConfiguration(surface);
     wgpu::SurfaceTexture surfaceTexture;