Zhiyi Zhang : vulkan-1/tests: Fix some test failures.

Alexandre Julliard julliard at winehq.org
Wed Jan 22 14:52:59 CST 2020


Module: wine
Branch: master
Commit: 95d267369ade5e1509a9090498409915cab22a97
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=95d267369ade5e1509a9090498409915cab22a97

Author: Zhiyi Zhang <zzhang at codeweavers.com>
Date:   Mon Jan 20 11:44:53 2020 +0800

vulkan-1/tests: Fix some test failures.

Signed-off-by: Zhiyi Zhang <zzhang at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 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;
     }




More information about the wine-cvs mailing list