commit b0ed5485ea45b3c02c857f7a122c1f77a0308b02
author Brian Sheedy <bsheedy@google.com> Mon Sep 19 21:19:51 2022 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Sep 19 21:19:51 2022 +0000
tree 18a97e8296ea3f341ab3227dceed3a4ddcf1f882
parent 2fa818f14d5ac95ab1fc343a6bfd8b8831b2bb56

[M105] Suppress Mac 12.5 failures

Suppresses existing failures on M105 that occur on Mac 12.4 to
also be suppressed on Mac 12.5.

Submitted with no-try since Dawn trybots don't like release
branches.

Bug: dawn:1463
No-Try: true
Change-Id: If1055816f13a644ef76ef6d5fd9145bdfcd117ac
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/102884
Commit-Queue: Brian Sheedy <bsheedy@google.com>
Reviewed-by: Austin Eng <enga@chromium.org>

src/dawn/tests/end2end/RenderPassLoadOpTests.cpp

diff --git a/src/dawn/tests/end2end/RenderPassLoadOpTests.cpp b/src/dawn/tests/end2end/RenderPassLoadOpTests.cpp
index cc989a7..2729b0e 100644
--- a/src/dawn/tests/end2end/RenderPassLoadOpTests.cpp
+++ b/src/dawn/tests/end2end/RenderPassLoadOpTests.cpp
@@ -244,7 +244,7 @@
 
     // TODO(crbug.com/dawn/1463): Re-enable, might be the same as above just on
     // 12.4 instead of 11.5.
-    DAWN_SUPPRESS_TEST_IF(IsMetal() && IsIntel() && IsMacOS(12, 4));
+    DAWN_SUPPRESS_TEST_IF(IsMetal() && IsIntel() && (IsMacOS(12, 4) || IsMacOS(12, 5)));
 
     constexpr double kUint32MaxDouble = 4294967295.0;
     constexpr uint32_t kUint32Max = static_cast<uint32_t>(kUint32MaxDouble);
@@ -398,7 +398,7 @@
 
     // TODO(crbug.com/dawn/1463): Re-enable, might be the same as above just on
     // 12.4 instead of 11.5.
-    DAWN_SUPPRESS_TEST_IF(IsMetal() && IsIntel() && IsMacOS(12, 4));
+    DAWN_SUPPRESS_TEST_IF(IsMetal() && IsIntel() && (IsMacOS(12, 4) || IsMacOS(12, 5)));
 
     constexpr uint64_t kUint32Max = std::numeric_limits<uint32_t>::max();
 
@@ -433,7 +433,7 @@
 
     // TODO(crbug.com/dawn/1463): Re-enable, might be the same as above just on
     // 12.4 instead of 11.5.
-    DAWN_SUPPRESS_TEST_IF(IsMetal() && IsIntel() && IsMacOS(12, 4));
+    DAWN_SUPPRESS_TEST_IF(IsMetal() && IsIntel() && (IsMacOS(12, 4) || IsMacOS(12, 5)));
 
     constexpr int64_t kSint32Max = std::numeric_limits<int32_t>::max();
     constexpr int64_t kSint32Min = std::numeric_limits<int32_t>::min();