projects / platform / upstream / Vulkan-Loader.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 415b3e5)
Make layer tests specify number of extensions
authorCharles Giessen <charles@lunarg.com>
Mon, 24 Jan 2022 21:42:04 +0000 (14:42 -0700)
committerCharles Giessen <46324611+charles-lunarg@users.noreply.github.com>
Tue, 25 Jan 2022 19:32:56 +0000 (12:32 -0700)
It is good practice to make use of equality checks vs comparison checks where
possible. Here, the number of extensions is knowable, as its debug_report +
debug_utils + however many come from implicit layers, which some tests do.

tests/loader_layer_tests.cpp patch | blob | history

diff --git a/tests/loader_layer_tests.cpp b/tests/loader_layer_tests.cpp
index 43f7036b5631bea5a26d7d8074ba3d99a3931d70..13c9e885245a2c4a41258d7759d8ab7bf529d7c9 100644 (file)
--- a/tests/loader_layer_tests.cpp
+++ b/tests/loader_layer_tests.cpp
@@ -999,7 +999,7 @@ TEST_F(LayerExtensions, ImplicitDirDispModeInstanceExtension) {
     uint32_t extension_count = 0;
     std::vector<VkExtensionProperties> extension_props;
     ASSERT_EQ(VK_SUCCESS, env->vulkan_functions.vkEnumerateInstanceExtensionProperties(nullptr, &extension_count, nullptr));
-    ASSERT_GE(extension_count, 1);
+    ASSERT_EQ(extension_count, 3);  // the instance extension, debug_utils, and debug_report
     extension_props.resize(extension_count);
     ASSERT_EQ(VK_SUCCESS,
               env->vulkan_functions.vkEnumerateInstanceExtensionProperties(nullptr, &extension_count, extension_props.data()));
@@ -1058,7 +1058,7 @@ TEST_F(LayerExtensions, ImplicitDispSurfCountInstanceExtension) {
     uint32_t extension_count = 0;
     std::vector<VkExtensionProperties> extension_props;
     ASSERT_EQ(VK_SUCCESS, env->vulkan_functions.vkEnumerateInstanceExtensionProperties(nullptr, &extension_count, nullptr));
-    ASSERT_GE(extension_count, 1);
+    ASSERT_EQ(extension_count, 3);  // the instance extension, debug_utils, and debug_report
     extension_props.resize(extension_count);
     ASSERT_EQ(VK_SUCCESS,
               env->vulkan_functions.vkEnumerateInstanceExtensionProperties(nullptr, &extension_count, extension_props.data()));
@@ -1118,7 +1118,7 @@ TEST_F(LayerExtensions, ImplicitBothInstanceExtensions) {
     uint32_t extension_count = 0;
     std::vector<VkExtensionProperties> extension_props;
     ASSERT_EQ(VK_SUCCESS, env->vulkan_functions.vkEnumerateInstanceExtensionProperties(nullptr, &extension_count, nullptr));
-    ASSERT_GE(extension_count, 2);
+    ASSERT_EQ(extension_count, 4);  // the two instance extension plus debug_utils and debug_report
     extension_props.resize(extension_count);
     ASSERT_EQ(VK_SUCCESS,
               env->vulkan_functions.vkEnumerateInstanceExtensionProperties(nullptr, &extension_count, extension_props.data()));
@@ -1246,7 +1246,7 @@ TEST_F(LayerExtensions, ExplicitDirDispModeInstanceExtension) {
     extension_props.clear();
     ASSERT_EQ(VK_SUCCESS,
               env->vulkan_functions.vkEnumerateInstanceExtensionProperties(explicit_layer_name, &extension_count, nullptr));
-    ASSERT_GE(extension_count, 1);
+    ASSERT_EQ(extension_count, 1);
     extension_props.resize(extension_count);
     ASSERT_EQ(VK_SUCCESS, env->vulkan_functions.vkEnumerateInstanceExtensionProperties(explicit_layer_name, &extension_count,
                                                                                        extension_props.data()));
@@ -1319,7 +1319,7 @@ TEST_F(LayerExtensions, ExplicitDispSurfCountInstanceExtension) {
     extension_props.clear();
     ASSERT_EQ(VK_SUCCESS,
               env->vulkan_functions.vkEnumerateInstanceExtensionProperties(explicit_layer_name, &extension_count, nullptr));
-    ASSERT_GE(extension_count, 1);
+    ASSERT_EQ(extension_count, 1);
     extension_props.resize(extension_count);
     ASSERT_EQ(VK_SUCCESS, env->vulkan_functions.vkEnumerateInstanceExtensionProperties(explicit_layer_name, &extension_count,
                                                                                        extension_props.data()));
@@ -1393,7 +1393,7 @@ TEST_F(LayerExtensions, ExplicitBothInstanceExtensions) {
     extension_props.clear();
     ASSERT_EQ(VK_SUCCESS,
               env->vulkan_functions.vkEnumerateInstanceExtensionProperties(explicit_layer_name, &extension_count, nullptr));
-    ASSERT_GE(extension_count, 2);
+    ASSERT_EQ(extension_count, 2);
     extension_props.resize(extension_count);
     ASSERT_EQ(VK_SUCCESS, env->vulkan_functions.vkEnumerateInstanceExtensionProperties(explicit_layer_name, &extension_count,
                                                                                        extension_props.data()));
@@ -1522,7 +1522,7 @@ TEST_F(LayerExtensions, ImplicitMaintenanceDeviceExtension) {
     uint32_t extension_count = 0;
     std::vector<VkExtensionProperties> extension_props;
     ASSERT_EQ(VK_SUCCESS, env->vulkan_functions.vkEnumerateDeviceExtensionProperties(phys_dev, nullptr, &extension_count, nullptr));
-    ASSERT_GE(extension_count, 1);
+    ASSERT_EQ(extension_count, 1);
     extension_props.resize(extension_count);
     ASSERT_EQ(VK_SUCCESS, env->vulkan_functions.vkEnumerateDeviceExtensionProperties(phys_dev, nullptr, &extension_count,
                                                                                      extension_props.data()));
@@ -1581,7 +1581,7 @@ TEST_F(LayerExtensions, ImplicitPresentImageDeviceExtension) {
     uint32_t extension_count = 0;
     std::vector<VkExtensionProperties> extension_props;
     ASSERT_EQ(VK_SUCCESS, env->vulkan_functions.vkEnumerateDeviceExtensionProperties(phys_dev, nullptr, &extension_count, nullptr));
-    ASSERT_GE(extension_count, 1);
+    ASSERT_EQ(extension_count, 1);
     extension_props.resize(extension_count);
     ASSERT_EQ(VK_SUCCESS, env->vulkan_functions.vkEnumerateDeviceExtensionProperties(phys_dev, nullptr, &extension_count,
                                                                                      extension_props.data()));
@@ -1641,7 +1641,7 @@ TEST_F(LayerExtensions, ImplicitBothDeviceExtensions) {
     uint32_t extension_count = 0;
     std::vector<VkExtensionProperties> extension_props;
     ASSERT_EQ(VK_SUCCESS, env->vulkan_functions.vkEnumerateDeviceExtensionProperties(phys_dev, nullptr, &extension_count, nullptr));
-    ASSERT_GE(extension_count, 2);
+    ASSERT_EQ(extension_count, 2);
     extension_props.resize(extension_count);
     ASSERT_EQ(VK_SUCCESS, env->vulkan_functions.vkEnumerateDeviceExtensionProperties(phys_dev, nullptr, &extension_count,
                                                                                      extension_props.data()));
@@ -1782,7 +1782,7 @@ TEST_F(LayerExtensions, ExplicitMaintenanceDeviceExtension) {
     extension_props.clear();
     ASSERT_EQ(VK_SUCCESS,
               env->vulkan_functions.vkEnumerateDeviceExtensionProperties(phys_dev, explicit_layer_name, &extension_count, nullptr));
-    ASSERT_GE(extension_count, 1);
+    ASSERT_EQ(extension_count, 1);
     extension_props.resize(extension_count);
     ASSERT_EQ(VK_SUCCESS, env->vulkan_functions.vkEnumerateDeviceExtensionProperties(phys_dev, explicit_layer_name,
                                                                                      &extension_count, extension_props.data()));
@@ -1852,7 +1852,7 @@ TEST_F(LayerExtensions, ExplicitPresentImageDeviceExtension) {
     extension_props.clear();
     ASSERT_EQ(VK_SUCCESS,
               env->vulkan_functions.vkEnumerateDeviceExtensionProperties(phys_dev, explicit_layer_name, &extension_count, nullptr));
-    ASSERT_GE(extension_count, 1);
+    ASSERT_EQ(extension_count, 1);
     extension_props.resize(extension_count);
     ASSERT_EQ(VK_SUCCESS, env->vulkan_functions.vkEnumerateDeviceExtensionProperties(phys_dev, explicit_layer_name,
                                                                                      &extension_count, extension_props.data()));
@@ -1924,7 +1924,7 @@ TEST_F(LayerExtensions, ExplicitBothDeviceExtensions) {
     extension_props.clear();
     ASSERT_EQ(VK_SUCCESS,
               env->vulkan_functions.vkEnumerateDeviceExtensionProperties(phys_dev, explicit_layer_name, &extension_count, nullptr));
-    ASSERT_GE(extension_count, 1);
+    ASSERT_EQ(extension_count, 2);  // debug_utils, and debug_report
     extension_props.resize(extension_count);
     ASSERT_EQ(VK_SUCCESS, env->vulkan_functions.vkEnumerateDeviceExtensionProperties(phys_dev, explicit_layer_name,
                                                                                      &extension_count, extension_props.data()));
Domain: Graphics System / GL;