commit f81037d7fe941f26f3e2a5810be66a7b34d9ab3f
author Corentin Wallez <cwallez@chromium.org> Tue Mar 05 15:29:42 2024 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Mar 05 15:29:42 2024 +0000
tree 1067b446320f0b0329e65d928bb6d16f952ca905
parent 2fda87f88a1a46e8d0ac8f831e7e9289550fc4e1

Broaden suppression of BufferMappingTests AllowSpontaneous on Windows

Bug: dawn:2449
Change-Id: I7b1837a3c7c1965755a0fc51cc69f86c459f77bd
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/177800
Reviewed-by: Stephen White <senorblanco@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
Kokoro: Kokoro <noreply+kokoro@google.com>

src/dawn/tests/end2end/BufferTests.cpp

diff --git a/src/dawn/tests/end2end/BufferTests.cpp b/src/dawn/tests/end2end/BufferTests.cpp
index 3b2e94d..d057ec6 100644
--- a/src/dawn/tests/end2end/BufferTests.cpp
+++ b/src/dawn/tests/end2end/BufferTests.cpp
@@ -52,6 +52,12 @@
         DAWN_TEST_UNSUPPORTED_IF(UsesWire() && GetParam().mFutureCallbackMode &&
                                  *GetParam().mFutureCallbackMode ==
                                      wgpu::CallbackMode::WaitAnyOnly);
+
+        // TODO(dawn:2449): These tests are hitting an ASSERT in Mutex.cpp on Windows with the
+        // spontaneous callback mode.
+        DAWN_SUPPRESS_TEST_IF(IsWindows() && GetParam().mFutureCallbackMode &&
+                              GetParam().mFutureCallbackMode.value() ==
+                                  wgpu::CallbackMode::AllowSpontaneous);
     }
 
     void MapAsyncAndWait(const wgpu::Buffer& buffer,
@@ -582,12 +588,6 @@
 
 // Test that Get(Const)MappedRange work inside map-write callback.
 TEST_P(BufferMappingTests, MapWrite_InCallbackDefault) {
-    // TODO(dawn:2449): This test is hitting an ASSERT in Mutex.cpp on Windows with the spontaneous
-    // callback mode.
-    DAWN_SUPPRESS_TEST_IF(IsWindows() && GetParam().mFutureCallbackMode &&
-                          GetParam().mFutureCallbackMode.value() ==
-                              wgpu::CallbackMode::AllowSpontaneous);
-
     wgpu::Buffer buffer = CreateMapWriteBuffer(4);
 
     static constexpr uint32_t myData = 2934875;