commit 3ed87a0a60a2cb82a5e3394d00ce7c35be92559e
author Tony Barbour <tony@LunarG.com> Wed Mar 15 16:19:02 2017 -0600
committer Tony-LunarG <tony@lunarg.com> Thu Mar 16 12:27:37 2017 -0700
tree 1447fbf197d7f25e59643bfc315b0d7ea49cc813
parent 1fa0970594821d2cb830cf9975db12b52abed724

tests: Make Maintenance1Tests a positive test

Change-Id: Ibc0c9d103d56e92db84bc398237f3102d5b2ee72

tests/layer_validation_tests.cpp

diff --git a/tests/layer_validation_tests.cpp b/tests/layer_validation_tests.cpp
index 97edbf0..6e67a27 100644
--- a/tests/layer_validation_tests.cpp
+++ b/tests/layer_validation_tests.cpp
@@ -360,7 +360,6 @@
    protected:
     ErrorMonitor *m_errorMonitor;
     bool m_enableWSI;
-    bool m_enable_maintenance1_ext = false;
     std::vector<const char *> instance_layer_names;
     std::vector<const char *> instance_extension_names;
     std::vector<const char *> device_extension_names;
@@ -404,9 +403,6 @@
             instance_extension_names.push_back(VK_KHR_XLIB_SURFACE_EXTENSION_NAME);
 #endif  // VK_USE_PLATFORM_XLIB_KHR
         }
-        if (m_enable_maintenance1_ext) {
-            device_extension_names.push_back(VK_KHR_MAINTENANCE1_EXTENSION_NAME);
-        }
 
         this->app_info.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO;
         this->app_info.pNext = NULL;
@@ -594,12 +590,6 @@
     commandBuffer->BindDescriptorSet(descriptorSet);
 }
 
-class VkMaintenance1LayerTest : public VkLayerTest {
-   public:
-   protected:
-       VkMaintenance1LayerTest(){ m_enable_maintenance1_ext = true; }
-};
-
 class VkPositiveLayerTest : public VkLayerTest {
    public:
    protected:
@@ -22564,11 +22554,12 @@
     vkDestroyDescriptorSetLayout(m_device->device(), dsl, nullptr);
 }
 
-// This test class enables the Maintenance1 extension for related validation tests
-TEST_F(VkMaintenance1LayerTest, Maintenance1Tests) {
+TEST_F(VkPositiveLayerTest, Maintenance1Tests) {
     TEST_DESCRIPTION("Validate various special cases for the Maintenance1_KHR extension");
 
+    device_extension_names.push_back(VK_KHR_MAINTENANCE1_EXTENSION_NAME);
     ASSERT_NO_FATAL_FAILURE(Init());
+
     // Ensure that extension is available and enabled.
     uint32_t extension_count = 0;
     bool supports_maintenance1_extension = false;