[PATCH] vulkan-1/tests: Fix some test failures.

Zhiyi Zhang zzhang at codeweavers.com
Sun Jan 19 21:44:53 CST 2020


Signed-off-by: Zhiyi Zhang <zzhang at codeweavers.com>
---
Fix test failures like https://test.winehq.org/data/02f3a133b64ed1f979309e1399738eaa2e204651/win10_cw-gtx560-1709-64/vulkan-1:vulkan.html

 dlls/vulkan-1/tests/vulkan.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/dlls/vulkan-1/tests/vulkan.c b/dlls/vulkan-1/tests/vulkan.c
index 9a93e2af6f..63fd48b33d 100644
--- a/dlls/vulkan-1/tests/vulkan.c
+++ b/dlls/vulkan-1/tests/vulkan.c
@@ -177,10 +177,9 @@ static void test_enumerate_physical_device2(void)
     ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr);
 
     vr = vkEnumeratePhysicalDevices(vk_instance, &count, NULL);
-    ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr);
-    if (!count)
+    if (vr || !count)
     {
-        skip("No physical devices.\n");
+        skip("No physical devices. VkResult %d.\n", vr);
         vkDestroyInstance(vk_instance, NULL);
         return;
     }
@@ -397,10 +396,9 @@ static void for_each_device(void (*test_func)(VkPhysicalDevice))
     ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr);
 
     vr = vkEnumeratePhysicalDevices(vk_instance, &count, NULL);
-    ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr);
-    if (!count)
+    if (vr || !count)
     {
-        skip("No physical devices.\n");
+        skip("No physical devices. VkResult %d.\n", vr);
         vkDestroyInstance(vk_instance, NULL);
         return;
     }
-- 
2.20.1



More information about the wine-devel mailing list