commit b26fd046a9995723c6d3bfd4f737d63404224aea
author Jeremy Hayes <jeremy@lunarg.com> Fri Mar 10 09:13:22 2017 -0700
committer Jeremy Hayes <jeremy-lunarg@users.noreply.github.com> Thu Mar 16 10:18:56 2017 -0600
tree b150aa8d5df860038a36fa3a12c28ef1ce8b2327
parent 35127875af91ecac919120e5231ac097c0f042e7

tests: Fix unexpected errors

Fix MismatchCountQueueCreateRequestedFeature unexpected errors. These
errors should be expected.

Change-Id: I6145ef88c1372a3cf015c58bc7c35e69fba9129c

tests/layer_validation_tests.cpp

diff --git a/tests/layer_validation_tests.cpp b/tests/layer_validation_tests.cpp
index 88bc089..1daffa4 100644
--- a/tests/layer_validation_tests.cpp
+++ b/tests/layer_validation_tests.cpp
@@ -11384,12 +11384,6 @@
         "Use invalid Queue Family Index in vkCreateDevice");
     ASSERT_NO_FATAL_FAILURE(InitState());
 
-    const char *invalid_queueFamilyIndex_message =
-        "Invalid queue create request in vkCreateDevice(). Invalid "
-        "queueFamilyIndex ";
-
-    const char *unavailable_feature_message = "While calling vkCreateDevice(), requesting feature #";
-
     // The following test fails with recent NVidia drivers.
     // By the time core_validation is reached, the NVidia
     // driver has sanitized the invalid condition and core_validation
@@ -11400,9 +11394,7 @@
     //    vkEnumeratePhysicalDevices(instance(), &count, &physical_device);
     //    m_errorMonitor->VerifyFound();
 
-    m_errorMonitor->SetDesiredFailureMsg(VK_DEBUG_REPORT_ERROR_BIT_EXT, invalid_queueFamilyIndex_message);
     float queue_priority = 0.0;
-
     VkDeviceQueueCreateInfo queue_create_info = {};
     queue_create_info.sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO;
     queue_create_info.queueCount = 1;
@@ -11416,7 +11408,10 @@
     device_create_info.queueCreateInfoCount = 1;
     device_create_info.pQueueCreateInfos = &queue_create_info;
     device_create_info.pEnabledFeatures = &features;
-    m_errorMonitor->SetUnexpectedError("Failed to create device chain.");
+
+    m_errorMonitor->SetDesiredFailureMsg(VK_DEBUG_REPORT_ERROR_BIT_EXT,
+                                         "Invalid queue create request in vkCreateDevice(). Invalid queueFamilyIndex ");
+    m_errorMonitor->SetDesiredFailureMsg(VK_DEBUG_REPORT_ERROR_BIT_EXT, "Failed to create device chain.");
     vkCreateDevice(gpu(), &device_create_info, nullptr, &testDevice);
     m_errorMonitor->VerifyFound();
 
@@ -11427,12 +11422,13 @@
     for (unsigned i = 0; i < feature_count; i++) {
         if (VK_FALSE == feature_array[i]) {
             feature_array[i] = VK_TRUE;
-            m_errorMonitor->SetDesiredFailureMsg(VK_DEBUG_REPORT_ERROR_BIT_EXT, unavailable_feature_message);
             device_create_info.pEnabledFeatures = &features;
-            m_errorMonitor->SetUnexpectedError(
-                "You requested features that are unavailable on this device. You should first query feature availability by "
-                "calling vkGetPhysicalDeviceFeatures().");
-            m_errorMonitor->SetUnexpectedError("Failed to create device chain.");
+            m_errorMonitor->SetDesiredFailureMsg(VK_DEBUG_REPORT_ERROR_BIT_EXT,
+                                                 "While calling vkCreateDevice(), requesting feature #");
+            m_errorMonitor->SetDesiredFailureMsg(VK_DEBUG_REPORT_ERROR_BIT_EXT, "Failed to create device chain.");
+            m_errorMonitor->SetDesiredFailureMsg(VK_DEBUG_REPORT_ERROR_BIT_EXT,
+                                                 "You requested features that are unavailable on this device. You should first "
+                                                 "query feature availability by calling vkGetPhysicalDeviceFeatures().");
             vkCreateDevice(gpu(), &device_create_info, nullptr, &testDevice);
             m_errorMonitor->VerifyFound();
             break;