commit 44fc6e3ab55d9222ca5563466b30af0916730185
author Jiawei Shao <jiawei.shao@intel.com> Wed May 26 01:04:32 2021 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed May 26 01:04:32 2021 +0000
tree 2b7d5d0c7a89b1641106133f04f9f94fcc853cfc
parent 84f67301017d05867169b49d57862cb0c4479306

Remove DAWN_SKIP_TEST_IF -- Part II

This is the last patch to replace DAWN_SKIP_TEST_IF with
DAWN_SUPPRESS_TEST_IF or DAWN_TEST_UNSUPPORTED_IF. With this patch
DAWN_SKIP_TEST_IF will be completely removed from Dawn.

BUG=dawn:779

Change-Id: I5aec03697877ff9c6fa175f8d16eba951dd94cfa
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/51806
Commit-Queue: Jiawei Shao <jiawei.shao@intel.com>
Reviewed-by: Austin Eng <enga@chromium.org>

src/tests/end2end/GpuMemorySynchronizationTests.cpp

diff --git a/src/tests/end2end/GpuMemorySynchronizationTests.cpp b/src/tests/end2end/GpuMemorySynchronizationTests.cpp
index 82e0420..05523e2 100644
--- a/src/tests/end2end/GpuMemorySynchronizationTests.cpp
+++ b/src/tests/end2end/GpuMemorySynchronizationTests.cpp
@@ -230,7 +230,7 @@
 TEST_P(GpuMemorySyncTests, SampledAndROStorageTextureInComputePass) {
     // TODO(crbug.com/dawn/646): diagnose and fix this OpenGL ES backend validation failure.
     // "GL_INVALID_OPERATION error generated. Image variable update is not allowed."
-    DAWN_SKIP_TEST_IF(IsOpenGLES() && IsBackendValidationEnabled());
+    DAWN_SUPPRESS_TEST_IF(IsOpenGLES() && IsBackendValidationEnabled());
 
     // Create a storage + sampled texture of one texel initialized to 1
     wgpu::TextureDescriptor texDesc;
@@ -631,7 +631,7 @@
     // TODO(crbug.com/dawn/646): diagnose and fix this OpenGL ES failure.
     // "Push constant block cannot be expressed as neither std430 nor std140. ES-targets do not
     // support GL_ARB_enhanced_layouts."
-    DAWN_SKIP_TEST_IF(IsOpenGLES());
+    DAWN_SUPPRESS_TEST_IF(IsOpenGLES());
 
     // Create pipeline, bind group, and a complex buffer for compute pass.
     wgpu::ShaderModule csModule = utils::CreateShaderModule(device, R"(