encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix AllowedErrorTests by returning error via move. 

Bug: dawn:1336
Change-Id: I966a2385e2a7e8a81ef97cd116b85a8036312e31
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/122027
Kokoro: Kokoro <noreply+kokoro@google.com>
Commit-Queue: Loko Kung <lokokung@google.com>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
This commit is contained in:
Loko Kung 2023-02-28 19:01:40 +00:00 committed by Dawn LUCI CQ
parent 0723a3c7f8
commit c2683a9459
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/dawn/tests/unittests/native/AllowedErrorTests.cpp
View File

@ -75,7 +75,7 @@ class AllowedErrorTests : public DawnMockTest {
TEST_F(AllowedErrorTests, QueueSubmit) { TEST_F(AllowedErrorTests, QueueSubmit) {
EXPECT_CALL(*(mDeviceMock->GetQueueMock()), SubmitImpl) EXPECT_CALL(*(mDeviceMock->GetQueueMock()), SubmitImpl)
.WillOnce(Return(DAWN_OUT_OF_MEMORY_ERROR(kOomErrorMessage))); .WillOnce(Return(ByMove(DAWN_OUT_OF_MEMORY_ERROR(kOomErrorMessage))));
// Expect the device lost because of the error. // Expect the device lost because of the error.
EXPECT_CALL(mDeviceLostCb, EXPECT_CALL(mDeviceLostCb,
@ -93,7 +93,7 @@ TEST_F(AllowedErrorTests, QueueWriteBuffer) {
wgpu::Buffer buffer = wgpu::Buffer::Acquire(ToAPI(bufferMock)); wgpu::Buffer buffer = wgpu::Buffer::Acquire(ToAPI(bufferMock));
EXPECT_CALL(*(mDeviceMock->GetQueueMock()), WriteBufferImpl) EXPECT_CALL(*(mDeviceMock->GetQueueMock()), WriteBufferImpl)
.WillOnce(Return(DAWN_OUT_OF_MEMORY_ERROR(kOomErrorMessage))); .WillOnce(Return(ByMove(DAWN_OUT_OF_MEMORY_ERROR(kOomErrorMessage))));
// Expect the device lost because of the error. // Expect the device lost because of the error.
EXPECT_CALL(mDeviceLostCb, EXPECT_CALL(mDeviceLostCb,
@ -114,7 +114,7 @@ TEST_F(AllowedErrorTests, QueueWriteTexture) {
wgpu::Texture texture = wgpu::Texture::Acquire(ToAPI(textureMock)); wgpu::Texture texture = wgpu::Texture::Acquire(ToAPI(textureMock));
EXPECT_CALL(*(mDeviceMock->GetQueueMock()), WriteTextureImpl) EXPECT_CALL(*(mDeviceMock->GetQueueMock()), WriteTextureImpl)
.WillOnce(Return(DAWN_OUT_OF_MEMORY_ERROR(kOomErrorMessage))); .WillOnce(Return(ByMove(DAWN_OUT_OF_MEMORY_ERROR(kOomErrorMessage))));
// Expect the device lost because of the error. // Expect the device lost because of the error.
EXPECT_CALL(mDeviceLostCb, EXPECT_CALL(mDeviceLostCb,
@ -147,7 +147,7 @@ TEST_F(AllowedErrorTests, QueueCopyTextureForBrowserOomBuffer) {
// Copying texture for browser internally allocates a buffer which we will cause to fail here. // Copying texture for browser internally allocates a buffer which we will cause to fail here.
EXPECT_CALL(*mDeviceMock, CreateBufferImpl) EXPECT_CALL(*mDeviceMock, CreateBufferImpl)
.WillOnce(Return(DAWN_OUT_OF_MEMORY_ERROR(kOomErrorMessage))); .WillOnce(Return(ByMove(DAWN_OUT_OF_MEMORY_ERROR(kOomErrorMessage))));
// Expect the device lost because of the error. // Expect the device lost because of the error.
EXPECT_CALL(mDeviceLostCb, EXPECT_CALL(mDeviceLostCb,
@ -186,7 +186,7 @@ TEST_F(AllowedErrorTests, QueueCopyExternalTextureForBrowserOomBuffer) {
// Copying texture for browser internally allocates a buffer which we will cause to fail here. // Copying texture for browser internally allocates a buffer which we will cause to fail here.
EXPECT_CALL(*mDeviceMock, CreateBufferImpl) EXPECT_CALL(*mDeviceMock, CreateBufferImpl)
.WillOnce(Return(DAWN_OUT_OF_MEMORY_ERROR(kOomErrorMessage))); .WillOnce(Return(ByMove(DAWN_OUT_OF_MEMORY_ERROR(kOomErrorMessage))));
// Expect the device lost because of the error. // Expect the device lost because of the error.
EXPECT_CALL(mDeviceLostCb, EXPECT_CALL(mDeviceLostCb,
@ -205,7 +205,7 @@ TEST_F(AllowedErrorTests, CreateComputePipeline) {
Ref<ComputePipelineMock> computePipelineMock = ComputePipelineMock::Create(mDeviceMock, &desc); Ref<ComputePipelineMock> computePipelineMock = ComputePipelineMock::Create(mDeviceMock, &desc);
EXPECT_CALL(*computePipelineMock.Get(), Initialize) EXPECT_CALL(*computePipelineMock.Get(), Initialize)
.WillOnce(Return(DAWN_OUT_OF_MEMORY_ERROR(kOomErrorMessage))); .WillOnce(Return(ByMove(DAWN_OUT_OF_MEMORY_ERROR(kOomErrorMessage))));
EXPECT_CALL(*mDeviceMock, CreateUninitializedComputePipelineImpl) EXPECT_CALL(*mDeviceMock, CreateUninitializedComputePipelineImpl)
.WillOnce(Return(ByMove(std::move(computePipelineMock)))); .WillOnce(Return(ByMove(std::move(computePipelineMock))));
@ -226,7 +226,7 @@ TEST_F(AllowedErrorTests, CreateRenderPipeline) {
Ref<RenderPipelineMock> renderPipelineMock = RenderPipelineMock::Create(mDeviceMock, &desc); Ref<RenderPipelineMock> renderPipelineMock = RenderPipelineMock::Create(mDeviceMock, &desc);
EXPECT_CALL(*renderPipelineMock.Get(), Initialize) EXPECT_CALL(*renderPipelineMock.Get(), Initialize)
.WillOnce(Return(DAWN_OUT_OF_MEMORY_ERROR(kOomErrorMessage))); .WillOnce(Return(ByMove(DAWN_OUT_OF_MEMORY_ERROR(kOomErrorMessage))));
EXPECT_CALL(*mDeviceMock, CreateUninitializedRenderPipelineImpl) EXPECT_CALL(*mDeviceMock, CreateUninitializedRenderPipelineImpl)
.WillOnce(Return(ByMove(std::move(renderPipelineMock)))); .WillOnce(Return(ByMove(std::move(renderPipelineMock))));
@ -251,7 +251,7 @@ TEST_F(AllowedErrorTests, CreateComputePipelineAsync) {
Ref<ComputePipelineMock> computePipelineMock = ComputePipelineMock::Create(mDeviceMock, &desc); Ref<ComputePipelineMock> computePipelineMock = ComputePipelineMock::Create(mDeviceMock, &desc);
EXPECT_CALL(*computePipelineMock.Get(), Initialize) EXPECT_CALL(*computePipelineMock.Get(), Initialize)
.WillOnce(Return(DAWN_OUT_OF_MEMORY_ERROR(kOomErrorMessage))); .WillOnce(Return(ByMove(DAWN_OUT_OF_MEMORY_ERROR(kOomErrorMessage))));
EXPECT_CALL(*mDeviceMock, CreateUninitializedComputePipelineImpl) EXPECT_CALL(*mDeviceMock, CreateUninitializedComputePipelineImpl)
.WillOnce(Return(ByMove(std::move(computePipelineMock)))); .WillOnce(Return(ByMove(std::move(computePipelineMock))));
@ -277,7 +277,7 @@ TEST_F(AllowedErrorTests, CreateRenderPipelineAsync) {
Ref<RenderPipelineMock> renderPipelineMock = RenderPipelineMock::Create(mDeviceMock, &desc); Ref<RenderPipelineMock> renderPipelineMock = RenderPipelineMock::Create(mDeviceMock, &desc);
EXPECT_CALL(*renderPipelineMock.Get(), Initialize) EXPECT_CALL(*renderPipelineMock.Get(), Initialize)
.WillOnce(Return(DAWN_OUT_OF_MEMORY_ERROR(kOomErrorMessage))); .WillOnce(Return(ByMove(DAWN_OUT_OF_MEMORY_ERROR(kOomErrorMessage))));
EXPECT_CALL(*mDeviceMock, CreateUninitializedRenderPipelineImpl) EXPECT_CALL(*mDeviceMock, CreateUninitializedRenderPipelineImpl)
.WillOnce(Return(ByMove(std::move(renderPipelineMock)))); .WillOnce(Return(ByMove(std::move(renderPipelineMock))));
@ -300,7 +300,7 @@ TEST_F(AllowedErrorTests, CreateRenderPipelineAsync) {
// OOM error from buffer creation is allowed and surfaced directly. // OOM error from buffer creation is allowed and surfaced directly.
TEST_F(AllowedErrorTests, CreateBuffer) { TEST_F(AllowedErrorTests, CreateBuffer) {
EXPECT_CALL(*mDeviceMock, CreateBufferImpl) EXPECT_CALL(*mDeviceMock, CreateBufferImpl)
.WillOnce(Return(DAWN_OUT_OF_MEMORY_ERROR(kOomErrorMessage))); .WillOnce(Return(ByMove(DAWN_OUT_OF_MEMORY_ERROR(kOomErrorMessage))));
// Expect the OOM error. // Expect the OOM error.
EXPECT_CALL(mDeviceErrorCb, Call(WGPUErrorType_OutOfMemory, HasSubstr(kOomErrorMessage), this)) EXPECT_CALL(mDeviceErrorCb, Call(WGPUErrorType_OutOfMemory, HasSubstr(kOomErrorMessage), this))
@ -318,7 +318,7 @@ TEST_F(AllowedErrorTests, CreateBuffer) {
// OOM error from texture creation is allowed and surfaced directly. // OOM error from texture creation is allowed and surfaced directly.
TEST_F(AllowedErrorTests, CreateTexture) { TEST_F(AllowedErrorTests, CreateTexture) {
EXPECT_CALL(*mDeviceMock, CreateTextureImpl) EXPECT_CALL(*mDeviceMock, CreateTextureImpl)
.WillOnce(Return(DAWN_OUT_OF_MEMORY_ERROR(kOomErrorMessage))); .WillOnce(Return(ByMove(DAWN_OUT_OF_MEMORY_ERROR(kOomErrorMessage))));
// Expect the OOM error. // Expect the OOM error.
EXPECT_CALL(mDeviceErrorCb, Call(WGPUErrorType_OutOfMemory, HasSubstr(kOomErrorMessage), this)) EXPECT_CALL(mDeviceErrorCb, Call(WGPUErrorType_OutOfMemory, HasSubstr(kOomErrorMessage), this))
@ -337,7 +337,7 @@ TEST_F(AllowedErrorTests, CreateTexture) {
// OOM error from query set creation is allowed and surfaced directly. // OOM error from query set creation is allowed and surfaced directly.
TEST_F(AllowedErrorTests, CreateQuerySet) { TEST_F(AllowedErrorTests, CreateQuerySet) {
EXPECT_CALL(*mDeviceMock, CreateQuerySetImpl) EXPECT_CALL(*mDeviceMock, CreateQuerySetImpl)
.WillOnce(Return(DAWN_OUT_OF_MEMORY_ERROR(kOomErrorMessage))); .WillOnce(Return(ByMove(DAWN_OUT_OF_MEMORY_ERROR(kOomErrorMessage))));
// Expect the OOM error. // Expect the OOM error.
EXPECT_CALL(mDeviceErrorCb, Call(WGPUErrorType_OutOfMemory, HasSubstr(kOomErrorMessage), this)) EXPECT_CALL(mDeviceErrorCb, Call(WGPUErrorType_OutOfMemory, HasSubstr(kOomErrorMessage), this))