Do not fail display tests when there is no display
Instead, we should mark these tests as not supported. It is valid per the
Vulkan spec to have the extension report 0 displays connected.
Affects: dEQP-VK.wsi.display.*
Component: Vulkan
VK-GL-CTS issue: 1105
Change-Id: Idfe09ec588be7b4c6c782e306e7bf1506d78808f
diff --git a/external/vulkancts/modules/vulkan/wsi/vktWsiDisplayTests.cpp b/external/vulkancts/modules/vulkan/wsi/vktWsiDisplayTests.cpp
index 9740506..fe55e9d 100644
--- a/external/vulkancts/modules/vulkan/wsi/vktWsiDisplayTests.cpp
+++ b/external/vulkancts/modules/vulkan/wsi/vktWsiDisplayTests.cpp
@@ -774,7 +774,7 @@
TCU_FAIL_STR(string("Expected VK_SUCCESS. Have ") + getResultAsString(result));
if (displayCountReported == 0)
- TCU_THROW(ResourceError, std::string("Cannot perform test: no displays found").c_str());
+ TCU_THROW(NotSupportedError, std::string("Cannot perform test: no displays found").c_str());
displayCountToTest = displayCountReported;
if (displayCountReported > MAX_TESTED_DISPLAY_COUNT)
@@ -902,7 +902,7 @@
TCU_FAIL("Failed to retrieve displays");
if (displaysVector.empty())
- TCU_FAIL("No displays reported");
+ TCU_THROW(NotSupportedError, "No displays reported");
displaySet = DisplaySet(displaysVector.begin(), displaysVector.end());
@@ -1025,7 +1025,7 @@
TCU_FAIL("Failed to retrieve displays");
if (displaysVector.empty())
- TCU_FAIL("No displays reported");
+ TCU_THROW(NotSupportedError, "No displays reported");
displaySet = DisplaySet(displaysVector.begin(), displaysVector.end());
@@ -1149,7 +1149,7 @@
TCU_FAIL("Failed to retrieve displays list");
if (displaysVector.empty())
- TCU_FAIL("No displays reported");
+ TCU_THROW(NotSupportedError, "No displays reported");
for (DisplayVector::iterator it = displaysVector.begin();
it != displaysVector.end();
@@ -1241,7 +1241,7 @@
TCU_FAIL("Failed to retrieve displays");
if (displaysVector.empty())
- TCU_FAIL("No displays reported");
+ TCU_THROW(NotSupportedError, "No displays reported");
for (DisplayVector::iterator it = displaysVector.begin();
it != displaysVector.end();
@@ -1533,7 +1533,7 @@
TCU_FAIL("Failed to retrieve displays");
if (displaysVector.empty())
- TCU_FAIL("No displays reported");
+ TCU_THROW(NotSupportedError, "No displays reported");
// Iterate through displays-modes
for (DisplayVector::iterator it = displaysVector.begin();
