From: Damien Leone <dleone@nvidia.com>
Date: Mon, 30 Oct 2017 23:15:25 +0000 (-0700)
Subject: Do not fail display tests when there is no display
X-Git-Tag: upstream/1.3.5~2565^2~6^2~11
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=633a352484a4630ea1580d53dd22928cf3ca1ed0;p=platform%2Fupstream%2FVK-GL-CTS.git

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: Iaae928a862dcc3827094d898a5455ecfe3920936
---

diff --git a/external/vulkancts/modules/vulkan/wsi/vktWsiDisplayTests.cpp b/external/vulkancts/modules/vulkan/wsi/vktWsiDisplayTests.cpp
index 2dc48b7..2d3f253 100644
--- a/external/vulkancts/modules/vulkan/wsi/vktWsiDisplayTests.cpp
+++ b/external/vulkancts/modules/vulkan/wsi/vktWsiDisplayTests.cpp
@@ -457,7 +457,7 @@ tcu::TestStatus DisplayCoverageTestInstance::testGetPhysicalDeviceDisplayPropert
 		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)
@@ -585,7 +585,7 @@ tcu::TestStatus DisplayCoverageTestInstance::testGetPhysicalDeviceDisplayPlanePr
 		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());
 
@@ -708,7 +708,7 @@ tcu::TestStatus DisplayCoverageTestInstance::testGetDisplayPlaneSupportedDisplay
 		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());
 
@@ -832,7 +832,7 @@ tcu::TestStatus DisplayCoverageTestInstance::testGetDisplayModePropertiesKHR(voi
 		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();
@@ -924,7 +924,7 @@ tcu::TestStatus	DisplayCoverageTestInstance::testCreateDisplayModeKHR(void)
 		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();
@@ -1216,7 +1216,7 @@ tcu::TestStatus	DisplayCoverageTestInstance::testCreateDisplayPlaneSurfaceKHR(vo
 		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();