commit e691129a46d855296a1475b75fabf28fba6b0f12
author Mark Lobodzinski <mark@lunarg.com> Wed Feb 15 14:38:51 2017 -0700
committer Mark Lobodzinski <mark@lunarg.com> Thu Feb 16 13:40:19 2017 -0700
tree 013b775e05b38b44d35cb6937b1bbc8315b67afb
parent c3055073f8bd17fa96a1ad915652a6d77c46f8e6

tests: Remove image layer dependencies

Change-Id: Ieb8570b037925ba00ebf1dd20a3f260e46057f69

tests/layer_validation_tests.cpp

diff --git a/tests/layer_validation_tests.cpp b/tests/layer_validation_tests.cpp
index 923f329..9ee87bb 100644
--- a/tests/layer_validation_tests.cpp
+++ b/tests/layer_validation_tests.cpp
@@ -373,7 +373,6 @@
         instance_layer_names.push_back("VK_LAYER_LUNARG_parameter_validation");
         instance_layer_names.push_back("VK_LAYER_LUNARG_object_tracker");
         instance_layer_names.push_back("VK_LAYER_LUNARG_core_validation");
-        instance_layer_names.push_back("VK_LAYER_LUNARG_image");
         instance_layer_names.push_back("VK_LAYER_LUNARG_swapchain");
         instance_layer_names.push_back("VK_LAYER_GOOGLE_unique_objects");
 
@@ -16008,7 +16007,7 @@
 }
 
 TEST_F(VkLayerTest, MiscImageLayerTests) {
-    TEST_DESCRIPTION("Image layer tests that don't belong elsewhare");
+    TEST_DESCRIPTION("Image-related tests that don't belong elsewhare");
 
     ASSERT_NO_FATAL_FAILURE(InitState());
 

tests/run_wrap_objects_tests.sh

diff --git a/tests/run_wrap_objects_tests.sh b/tests/run_wrap_objects_tests.sh
index d1b43ad..a1eb317 100755
--- a/tests/run_wrap_objects_tests.sh
+++ b/tests/run_wrap_objects_tests.sh
@@ -86,7 +86,7 @@
 # Check for insertion of wrap-objects layer in middle.
 output=$(VK_LAYER_PATH=$VK_LAYER_PATH:`pwd`/layers \
    LD_LIBRARY_PATH=$LD_LIBRARY_PATH:`pwd`/layers \
-   VK_INSTANCE_LAYERS=VK_LAYER_LUNARG_image:VK_LAYER_LUNARG_wrap_objects:VK_LAYER_LUNARG_parameter_validation \
+   VK_INSTANCE_LAYERS=VK_LAYER_LUNARG_core_validation:VK_LAYER_LUNARG_wrap_objects:VK_LAYER_LUNARG_parameter_validation \
    VK_LOADER_DEBUG=all \
    GTEST_FILTER=WrapObjects.Insert \
    ./vk_loader_validation_tests 2>&1)