Skip AdapterCreationTest on TSAN bots.
These tests are timed out on those bots.
Bug: 345685638
Change-Id: Ib21ac19e3e8fa19a0283daf6aad280bc74722cca
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/192281
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Quyen Le <lehoangquyen@chromium.org>
diff --git a/src/dawn/tests/DawnTest.cpp b/src/dawn/tests/DawnTest.cpp
index 78a2d90..fdfe569 100644
--- a/src/dawn/tests/DawnTest.cpp
+++ b/src/dawn/tests/DawnTest.cpp
@@ -1003,7 +1003,8 @@
return HasToggleEnabled("use_dxc");
}
-bool DawnTestBase::IsAsan() const {
+// static
+bool DawnTestBase::IsAsan() {
#if defined(ADDRESS_SANITIZER)
return true;
#else
@@ -1011,7 +1012,8 @@
#endif
}
-bool DawnTestBase::IsTsan() const {
+// static
+bool DawnTestBase::IsTsan() {
#if defined(THREAD_SANITIZER)
return true;
#else
diff --git a/src/dawn/tests/DawnTest.h b/src/dawn/tests/DawnTest.h
index 208d0c4..bbc9366 100644
--- a/src/dawn/tests/DawnTest.h
+++ b/src/dawn/tests/DawnTest.h
@@ -285,8 +285,8 @@
bool IsDXC() const;
- bool IsAsan() const;
- bool IsTsan() const;
+ static bool IsAsan();
+ static bool IsTsan();
bool HasToggleEnabled(const char* workaround) const;
diff --git a/src/dawn/tests/end2end/AdapterCreationTests.cpp b/src/dawn/tests/end2end/AdapterCreationTests.cpp
index 066b436..c52fcf4 100644
--- a/src/dawn/tests/end2end/AdapterCreationTests.cpp
+++ b/src/dawn/tests/end2end/AdapterCreationTests.cpp
@@ -33,6 +33,7 @@
#include "dawn/common/GPUInfo.h"
#include "dawn/dawn_proc.h"
#include "dawn/native/DawnNative.h"
+#include "dawn/tests/DawnTest.h"
#include "dawn/tests/MockCallback.h"
#include "dawn/webgpu_cpp.h"
#include "gtest/gtest.h"
@@ -47,6 +48,9 @@
class AdapterCreationTest : public ::testing::TestWithParam<std::optional<wgpu::CallbackMode>> {
protected:
void SetUp() override {
+ // TODO(345685638): these tests are timed out on TSAN bots.
+ DAWN_TEST_UNSUPPORTED_IF(DawnTest::IsTsan());
+
dawnProcSetProcs(&native::GetProcs());
{
