[dawn][tests] Update UnsupportedCount test to just wait until done. - Update the test to only care about whether an error is surfaced. Bug: 443308345 Change-Id: I512bcec6d023aa017312d1926022829ec5d94098 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/263794 Auto-Submit: Loko Kung <lokokung@google.com> Commit-Queue: Loko Kung <lokokung@google.com> Reviewed-by: Kai Ninomiya <kainino@chromium.org>
diff --git a/src/dawn/tests/end2end/EventTests.cpp b/src/dawn/tests/end2end/EventTests.cpp index 7cbb890..9e888f2 100644 --- a/src/dawn/tests/end2end/EventTests.cpp +++ b/src/dawn/tests/end2end/EventTests.cpp
@@ -543,11 +543,6 @@ TEST_P(WaitAnyTests, UnsupportedCount) { for (uint64_t timeout : {uint64_t(0), uint64_t(1)}) { - // TODO(crbug.com/443308345): D3D11's delay flush queue doesn't seem to work if we are only - // using a small timeout. It works if we increase the timeout to 0.2-0.3ms, but it should - // really be immediate. - DAWN_TEST_UNSUPPORTED_IF(timeout > 0 && HasToggleEnabled("d3d11_delay_flush_to_gpu")); - // We don't support values higher than the default (64), and if you ask for lower than 64 // you still get 64. DawnTest doesn't request anything (so requests 0) so gets 64. for (size_t count : {kTimedWaitAnyMaxCountDefault, kTimedWaitAnyMaxCountDefault + 1}) { @@ -560,10 +555,9 @@ FlushWire(); wgpu::WaitStatus status = instance.WaitAny(infos.size(), infos.data(), timeout); if (timeout == 0) { - ASSERT_TRUE(status == wgpu::WaitStatus::Success || - status == wgpu::WaitStatus::TimedOut); + ASSERT_NE(status, wgpu::WaitStatus::Error); } else if (count <= 64) { - ASSERT_EQ(status, wgpu::WaitStatus::Success); + ASSERT_NE(status, wgpu::WaitStatus::Error); } else { ASSERT_EQ(status, wgpu::WaitStatus::Error); }