Skip tests if no adapter is available

Bug: dawn:208
Change-Id: I076fd497101dd017e8d83ae034edb7b1fa1f8581
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/11941
Reviewed-by: Kai Ninomiya <kainino@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Austin Eng <enga@chromium.org>

src/tests/DawnTest.cpp

@@ -164,20 +164,8 @@ void DawnTestEnvironment::SetUp() {
     mInstance->EnableBackendValidation(mEnableBackendValidation);
     mInstance->EnableBeginCaptureOnStartup(mBeginCaptureOnStartup);
 
-    static constexpr dawn_native::BackendType kWindowlessBackends[] = {
+    mInstance.get()->DiscoverDefaultAdapters();
-        dawn_native::BackendType::D3D12,
+    DiscoverOpenGLAdapter();
-        dawn_native::BackendType::Metal,
-        dawn_native::BackendType::Vulkan,
-    };
-    for (dawn_native::BackendType backend : kWindowlessBackends) {
-        if (detail::IsBackendAvailable(backend)) {
-            mInstance.get()->DiscoverDefaultAdapters();
-        }
-    }
-
-    if (detail::IsBackendAvailable(dawn_native::BackendType::OpenGL)) {
-        DiscoverOpenGLAdapter();
-    }
 
     std::cout << "Testing configuration\n"
                  "---------------------\n"
@@ -238,7 +226,9 @@ uint32_t DawnTestEnvironment::GetVendorIdFilter() const {
 
 void DawnTestEnvironment::DiscoverOpenGLAdapter() {
 #ifdef DAWN_ENABLE_BACKEND_OPENGL
-    ASSERT_TRUE(glfwInit());
+    if (!glfwInit()) {
+        return;
+    }
     glfwDefaultWindowHints();
     glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 4);
     glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 4);
@@ -407,7 +397,9 @@ void DawnTestBase::SetUp() {
             }
         }
 
-        ASSERT(mBackendAdapter);
+        if (!mBackendAdapter) {
+            return;
+        }
     }
 
     mPCIInfo = mBackendAdapter.GetPCIInfo();
@@ -478,6 +470,10 @@ void DawnTestBase::TearDown() {
     }
 }
 
+bool DawnTestBase::HasAdapter() const {
+    return !!mBackendAdapter;
+}
+
 void DawnTestBase::StartExpectDeviceError() {
     mExpectError = true;
     mError = false;

src/tests/DawnTest.h

@@ -200,6 +200,7 @@ class DawnTestBase {
                                               uint32_t pixelSize,
                                               detail::Expectation* expectation);
 
+    bool HasAdapter() const;
     void WaitABit();
     void FlushWire();
 
@@ -272,14 +273,31 @@ class DawnTestBase {
     dawn_native::Adapter mBackendAdapter;
 };
 
+// Skip a test when the given condition is satisfied.
+#define DAWN_SKIP_TEST_IF(condition)                               \
+    if (condition) {                                               \
+        std::cout << "Test skipped: " #condition "." << std::endl; \
+        GTEST_SKIP();                                              \
+        return;                                                    \
+    }
+
 template <typename Params = DawnTestParam>
 class DawnTestWithParams : public DawnTestBase, public ::testing::TestWithParam<Params> {
+  private:
+    void SetUp() override final {
+        // DawnTestBase::SetUp() gets the adapter, and creates the device and wire.
+        // It's separate from TestSetUp() so we can skip tests completely if no adapter
+        // is available.
+        DawnTestBase::SetUp();
+        DAWN_SKIP_TEST_IF(!HasAdapter());
+        TestSetUp();
+    }
+
   protected:
     DawnTestWithParams();
     ~DawnTestWithParams() override = default;
 
-    void SetUp() override {
+    virtual void TestSetUp() {
-        DawnTestBase::SetUp();
     }
 
     void TearDown() override {
@@ -303,12 +321,6 @@ using DawnTest = DawnTestWithParams<>;
             testName##params, sizeof(testName##params) / sizeof(firstParam))),   \
         testing::PrintToStringParamName())
 
-// Skip a test when the given condition is satisfied.
-#define DAWN_SKIP_TEST_IF(condition)                               \
-    if (condition) {                                               \
-        std::cout << "Test skipped: " #condition "." << std::endl; \
-        return;                                                    \
-    }
 
 namespace detail {
     // Helper functions used for DAWN_INSTANTIATE_TEST

src/tests/end2end/ColorStateTests.cpp

@@ -26,8 +26,8 @@ constexpr static unsigned int kRTSize = 64;
 
 class ColorStateTest : public DawnTest {
   protected:
-    void SetUp() override {
+    void TestSetUp() override {
-        DawnTest::SetUp();
+        DawnTest::TestSetUp();
 
         vsModule = utils::CreateShaderModule(device, utils::SingleShaderStage::Vertex, R"(
                 #version 450

src/tests/end2end/CompressedTextureFormatTests.cpp

@@ -34,8 +34,8 @@ struct CopyConfig {
 
 class CompressedTextureBCFormatTest : public DawnTest {
   protected:
-    void SetUp() override {
+    void TestSetUp() override {
-        DawnTest::SetUp();
+        DawnTest::TestSetUp();
         mBindGroupLayout = utils::MakeBindGroupLayout(
             device, {{0, dawn::ShaderStage::Fragment, dawn::BindingType::Sampler},
                      {1, dawn::ShaderStage::Fragment, dawn::BindingType::SampledTexture}});

src/tests/end2end/D3D12ResourceWrappingTests.cpp

@@ -29,8 +29,8 @@ namespace {
 
     class D3D12ResourceTestBase : public DawnTest {
       public:
-        void SetUp() override {
+        void TestSetUp() override {
-            DawnTest::SetUp();
+            DawnTest::TestSetUp();
             if (UsesWire()) {
                 return;
             }
@@ -101,8 +101,8 @@ namespace {
 // These tests are skipped if the harness is using the wire.
 class D3D12SharedHandleValidation : public D3D12ResourceTestBase {
   public:
-    void SetUp() override {
+    void TestSetUp() override {
-        D3D12ResourceTestBase::SetUp();
+        D3D12ResourceTestBase::TestSetUp();
 
         dawnDescriptor.dimension = dawn::TextureDimension::e2D;
         dawnDescriptor.format = dawn::TextureFormat::BGRA8Unorm;

src/tests/end2end/DepthStencilStateTests.cpp

@@ -22,8 +22,8 @@ constexpr static unsigned int kRTSize = 64;
 
 class DepthStencilStateTest : public DawnTest {
     protected:
-        void SetUp() override {
+        void TestSetUp() override {
-            DawnTest::SetUp();
+            DawnTest::TestSetUp();
 
             dawn::TextureDescriptor renderTargetDescriptor;
             renderTargetDescriptor.dimension = dawn::TextureDimension::e2D;

src/tests/end2end/DestroyTests.cpp

@@ -21,8 +21,8 @@ constexpr uint32_t kRTSize = 4;
 
 class DestroyTest : public DawnTest {
   protected:
-    void SetUp() override {
+    void TestSetUp() override {
-        DawnTest::SetUp();
+        DawnTest::TestSetUp();
 
         renderPass = utils::CreateBasicRenderPass(device, kRTSize, kRTSize);
 

src/tests/end2end/DrawIndexedIndirectTests.cpp

@@ -21,8 +21,8 @@ constexpr uint32_t kRTSize = 4;
 
 class DrawIndexedIndirectTest : public DawnTest {
   protected:
-    void SetUp() override {
+    void TestSetUp() override {
-        DawnTest::SetUp();
+        DawnTest::TestSetUp();
 
         renderPass = utils::CreateBasicRenderPass(device, kRTSize, kRTSize);
 

src/tests/end2end/DrawIndexedTests.cpp

@@ -21,8 +21,8 @@ constexpr uint32_t kRTSize = 4;
 
 class DrawIndexedTest : public DawnTest {
     protected:
-        void SetUp() override {
+        void TestSetUp() override {
-            DawnTest::SetUp();
+            DawnTest::TestSetUp();
 
             renderPass = utils::CreateBasicRenderPass(device, kRTSize, kRTSize);
 

src/tests/end2end/DrawIndirectTests.cpp

@@ -21,8 +21,8 @@ constexpr uint32_t kRTSize = 4;
 
 class DrawIndirectTest : public DawnTest {
   protected:
-    void SetUp() override {
+    void TestSetUp() override {
-        DawnTest::SetUp();
+        DawnTest::TestSetUp();
 
         renderPass = utils::CreateBasicRenderPass(device, kRTSize, kRTSize);
 

src/tests/end2end/DrawTests.cpp

@@ -21,8 +21,8 @@ constexpr uint32_t kRTSize = 4;
 
 class DrawTest : public DawnTest {
   protected:
-    void SetUp() override {
+    void TestSetUp() override {
-        DawnTest::SetUp();
+        DawnTest::TestSetUp();
 
         renderPass = utils::CreateBasicRenderPass(device, kRTSize, kRTSize);
 

src/tests/end2end/DynamicBufferOffsetTests.cpp

@@ -24,8 +24,8 @@ constexpr uint32_t kBindingSize = 8;
 
 class DynamicBufferOffsetTests : public DawnTest {
   protected:
-    void SetUp() override {
+    void TestSetUp() override {
-        DawnTest::SetUp();
+        DawnTest::TestSetUp();
 
         // Mix up dynamic and non dynamic resources in one bind group and using not continuous
         // binding number to cover more cases.

src/tests/end2end/FenceTests.cpp

@@ -60,8 +60,8 @@ class FenceTests : public DawnTest {
     FenceTests() : mCallIndex(0) {
     }
 
-    void SetUp() override {
+    void TestSetUp() override {
-        DawnTest::SetUp();
+        DawnTest::TestSetUp();
         mockFenceOnCompletionCallback = std::make_unique<MockFenceOnCompletionCallback>();
         mockPopErrorScopeCallback = std::make_unique<MockPopErrorScopeCallback>();
     }

src/tests/end2end/IndexFormatTests.cpp

@@ -22,8 +22,8 @@ constexpr uint32_t kRTSize = 400;
 
 class IndexFormatTest : public DawnTest {
     protected:
-        void SetUp() override {
+        void TestSetUp() override {
-            DawnTest::SetUp();
+            DawnTest::TestSetUp();
 
             renderPass = utils::CreateBasicRenderPass(device, kRTSize, kRTSize);
         }

src/tests/end2end/MultisampledRenderingTests.cpp

@@ -20,8 +20,8 @@
 
 class MultisampledRenderingTest : public DawnTest {
   protected:
-    void SetUp() override {
+    void TestSetUp() override {
-        DawnTest::SetUp();
+        DawnTest::TestSetUp();
 
         InitTexturesForTest();
     }

src/tests/end2end/NonzeroTextureCreationTests.cpp

@@ -19,8 +19,8 @@
 
 class NonzeroTextureCreationTests : public DawnTest {
   protected:
-    void SetUp() override {
+    void TestSetUp() override {
-        DawnTest::SetUp();
+        DawnTest::TestSetUp();
     }
 
     constexpr static uint32_t kSize = 128;

src/tests/end2end/OpArrayLengthTests.cpp

@@ -20,8 +20,8 @@
 
 class OpArrayLengthTest : public DawnTest {
   protected:
-    void SetUp() {
+    void TestSetUp() {
-        DawnTest::SetUp();
+        DawnTest::TestSetUp();
 
         // Create buffers of various size to check the length() implementation
         dawn::BufferDescriptor bufferDesc;

src/tests/end2end/PrimitiveTopologyTests.cpp

@@ -145,8 +145,8 @@ constexpr static float kVertices[] = {
 
 class PrimitiveTopologyTest : public DawnTest {
     protected:
-        void SetUp() override {
+        void TestSetUp() override {
-            DawnTest::SetUp();
+            DawnTest::TestSetUp();
 
             renderPass = utils::CreateBasicRenderPass(device, kRTSize, kRTSize);
 

src/tests/end2end/RenderBundleTests.cpp

@@ -26,8 +26,8 @@ constexpr RGBA8 kColors[2] = {RGBA8(0, 255, 0, 255), RGBA8(0, 0, 255, 255)};
 // tested in all other rendering tests.
 class RenderBundleTest : public DawnTest {
   protected:
-    void SetUp() override {
+    void TestSetUp() override {
-        DawnTest::SetUp();
+        DawnTest::TestSetUp();
 
         renderPass = utils::CreateBasicRenderPass(device, kRTSize, kRTSize);
 

src/tests/end2end/RenderPassLoadOpTests.cpp

@@ -56,8 +56,8 @@ class DrawQuad {
 
 class RenderPassLoadOpTests : public DawnTest {
     protected:
-        void SetUp() override {
+        void TestSetUp() override {
-            DawnTest::SetUp();
+            DawnTest::TestSetUp();
 
             dawn::TextureDescriptor descriptor;
             descriptor.dimension = dawn::TextureDimension::e2D;

src/tests/end2end/RenderPassTests.cpp

@@ -22,8 +22,8 @@ constexpr dawn::TextureFormat kFormat = dawn::TextureFormat::RGBA8Unorm;
 
 class RenderPassTest : public DawnTest {
 protected:
-    void SetUp() override {
+    void TestSetUp() override {
-        DawnTest::SetUp();
+        DawnTest::TestSetUp();
 
         // Shaders to draw a bottom-left triangle in blue.
         mVSModule = utils::CreateShaderModule(device, utils::SingleShaderStage::Vertex, R"(

src/tests/end2end/SamplerTests.cpp

@@ -38,8 +38,8 @@ namespace {
 
 class SamplerTest : public DawnTest {
 protected:
-    void SetUp() override {
+    void TestSetUp() override {
-        DawnTest::SetUp();
+        DawnTest::TestSetUp();
         mRenderPass = utils::CreateBasicRenderPass(device, kRTSize, kRTSize);
 
         mBindGroupLayout = utils::MakeBindGroupLayout(

src/tests/end2end/TextureFormatTests.cpp

@@ -111,8 +111,8 @@ class ExpectFloat16 : public detail::Expectation {
 
 class TextureFormatTest : public DawnTest {
   protected:
-    void SetUp() {
+    void TestSetUp() {
-        DawnTest::SetUp();
+        DawnTest::TestSetUp();
     }
 
     // Structure containing all the information that tests need to know about the format.

src/tests/end2end/TextureViewTests.cpp

@@ -78,8 +78,8 @@ protected:
         return static_cast<int>(level * 10) + static_cast<int>(layer + 1);
     }
 
-    void SetUp() override {
+    void TestSetUp() override {
-        DawnTest::SetUp();
+        DawnTest::TestSetUp();
 
         mRenderPass = utils::CreateBasicRenderPass(device, kRTSize, kRTSize);
 

src/tests/end2end/TextureZeroInitTests.cpp

@@ -20,8 +20,8 @@
 
 class TextureZeroInitTest : public DawnTest {
   protected:
-    void SetUp() override {
+    void TestSetUp() override {
-        DawnTest::SetUp();
+        DawnTest::TestSetUp();
     }
     dawn::TextureDescriptor CreateTextureDescriptor(uint32_t mipLevelCount,
                                                     uint32_t arrayLayerCount,

src/tests/end2end/VertexFormatTests.cpp

@@ -46,8 +46,8 @@ std::vector<destType> BitCast(std::vector<srcType> data) {
 
 class VertexFormatTest : public DawnTest {
   protected:
-    void SetUp() override {
+    void TestSetUp() override {
-        DawnTest::SetUp();
+        DawnTest::TestSetUp();
 
         renderPass = utils::CreateBasicRenderPass(device, kRTSize, kRTSize);
     }

src/tests/end2end/VertexInputTests.cpp

@@ -35,8 +35,8 @@ constexpr static unsigned int kRTCellSize = 100;
 
 class VertexInputTest : public DawnTest {
   protected:
-    void SetUp() override {
+    void TestSetUp() override {
-        DawnTest::SetUp();
+        DawnTest::TestSetUp();
 
         renderPass = utils::CreateBasicRenderPass(device, kRTSize, kRTSize);
     }

src/tests/perf_tests/BufferUploadPerf.cpp

@@ -58,7 +58,7 @@ class BufferUploadPerf : public DawnPerfTestWithParams<BufferUploadParams> {
     }
     ~BufferUploadPerf() override = default;
 
-    void SetUp() override;
+    void TestSetUp() override;
 
   private:
     void Step() override;
@@ -67,8 +67,8 @@ class BufferUploadPerf : public DawnPerfTestWithParams<BufferUploadParams> {
     std::vector<uint8_t> data;
 };
 
-void BufferUploadPerf::SetUp() {
+void BufferUploadPerf::TestSetUp() {
-    DawnPerfTestWithParams<BufferUploadParams>::SetUp();
+    DawnPerfTestWithParams<BufferUploadParams>::TestSetUp();
 
     dawn::BufferDescriptor desc = {};
     desc.size = kBufferSize;

src/tests/white_box/VulkanImageWrappingTests.cpp

@@ -31,8 +31,7 @@ namespace {
 
     class VulkanImageWrappingTestBase : public DawnTest {
       public:
-        void SetUp() override {
+        void TestSetUp() override {
-            DawnTest::SetUp();
             if (UsesWire() || IsIntel()) {
                 return;
             }
@@ -198,8 +197,8 @@ namespace {
 
 class VulkanImageWrappingValidationTests : public VulkanImageWrappingTestBase {
   public:
-    void SetUp() override {
+    void TestSetUp() override {
-        VulkanImageWrappingTestBase::SetUp();
+        VulkanImageWrappingTestBase::TestSetUp();
         if (UsesWire() || IsIntel()) {
             return;
         }
@@ -349,8 +348,8 @@ TEST_P(VulkanImageWrappingValidationTests, DestroyedTextureSignalSemaphoreExport
 // These tests are skipped if the harness is using the wire.
 class VulkanImageWrappingUsageTests : public VulkanImageWrappingTestBase {
   public:
-    void SetUp() override {
+    void TestSetUp() override {
-        VulkanImageWrappingTestBase::SetUp();
+        VulkanImageWrappingTestBase::TestSetUp();
         if (UsesWire() || IsIntel()) {
             return;
         }