Fix typos in pipeline.cache test case names

Change-Id: I7715bbd7bd21db4e6b1509d927fc087926253136

diff --git a/android/cts/master/com.drawelements.deqp.vk.xml b/android/cts/master/com.drawelements.deqp.vk.xml
index ec9a191..83d944b 100644 (file)
--- a/android/cts/master/com.drawelements.deqp.vk.xml
+++ b/android/cts/master/com.drawelements.deqp.vk.xml
@@ -221489,13 +221489,13 @@
                                        <Test name="range_size_128">
                                                <TestInstance/>
                                        </Test>
-                                       <Test name="count_2_shader_vert_frag">
+                                       <Test name="count_2_shaders_vert_frag">
                                                <TestInstance/>
                                        </Test>
-                                       <Test name="count_3shader_vert_geom_frag">
+                                       <Test name="count_3_shaders_vert_geom_frag">
                                                <TestInstance/>
                                        </Test>
-                                       <Test name="count_5_shader_vert_tess_geom_frag">
+                                       <Test name="count_5_shaders_vert_tess_geom_frag">
                                                <TestInstance/>
                                        </Test>
                                        <Test name="count_1_shader_vert_frag">

diff --git a/android/cts/master/vk-master.txt b/android/cts/master/vk-master.txt
index 9500811..aa82e27 100644 (file)
--- a/android/cts/master/vk-master.txt
+++ b/android/cts/master/vk-master.txt
@@ -69081,9 +69081,9 @@ dEQP-VK.pipeline.image_view.view_type.cube_array.format.astc_12x12_srgb_block.su
 dEQP-VK.pipeline.push_constant.graphics_pipeline.range_size_4
 dEQP-VK.pipeline.push_constant.graphics_pipeline.range_size_16
 dEQP-VK.pipeline.push_constant.graphics_pipeline.range_size_128
-dEQP-VK.pipeline.push_constant.graphics_pipeline.count_2_shader_vert_frag
-dEQP-VK.pipeline.push_constant.graphics_pipeline.count_3shader_vert_geom_frag
-dEQP-VK.pipeline.push_constant.graphics_pipeline.count_5_shader_vert_tess_geom_frag
+dEQP-VK.pipeline.push_constant.graphics_pipeline.count_2_shaders_vert_frag
+dEQP-VK.pipeline.push_constant.graphics_pipeline.count_3_shaders_vert_geom_frag
+dEQP-VK.pipeline.push_constant.graphics_pipeline.count_5_shaders_vert_tess_geom_frag
 dEQP-VK.pipeline.push_constant.graphics_pipeline.count_1_shader_vert_frag
 dEQP-VK.pipeline.push_constant.graphics_pipeline.data_update_partial_1
 dEQP-VK.pipeline.push_constant.graphics_pipeline.data_update_partial_2

diff --git a/android/cts/nyc/com.drawelements.deqp.vk.xml b/android/cts/nyc/com.drawelements.deqp.vk.xml
index 6871742..f9708ec 100644 (file)
--- a/android/cts/nyc/com.drawelements.deqp.vk.xml
+++ b/android/cts/nyc/com.drawelements.deqp.vk.xml
@@ -176982,13 +176982,13 @@
                                        <Test name="range_size_128">
                                                <TestInstance/>
                                        </Test>
-                                       <Test name="count_2_shader_vert_frag">
+                                       <Test name="count_2_shaders_vert_frag">
                                                <TestInstance/>
                                        </Test>
-                                       <Test name="count_3shader_vert_geom_frag">
+                                       <Test name="count_3_shaders_vert_geom_frag">
                                                <TestInstance/>
                                        </Test>
-                                       <Test name="count_5_shader_vert_tess_geom_frag">
+                                       <Test name="count_5_shaders_vert_tess_geom_frag">
                                                <TestInstance/>
                                        </Test>
                                        <Test name="count_1_shader_vert_frag">

diff --git a/android/cts/nyc/src/vk-master.txt b/android/cts/nyc/src/vk-master.txt
index 5539c16..29c9ad1 100644 (file)
--- a/android/cts/nyc/src/vk-master.txt
+++ b/android/cts/nyc/src/vk-master.txt
@@ -54256,9 +54256,9 @@ dEQP-VK.pipeline.image_view.view_type.cube_array.format.astc_12x12_srgb_block.su
 dEQP-VK.pipeline.push_constant.graphics_pipeline.range_size_4
 dEQP-VK.pipeline.push_constant.graphics_pipeline.range_size_16
 dEQP-VK.pipeline.push_constant.graphics_pipeline.range_size_128
-dEQP-VK.pipeline.push_constant.graphics_pipeline.count_2_shader_vert_frag
-dEQP-VK.pipeline.push_constant.graphics_pipeline.count_3shader_vert_geom_frag
-dEQP-VK.pipeline.push_constant.graphics_pipeline.count_5_shader_vert_tess_geom_frag
+dEQP-VK.pipeline.push_constant.graphics_pipeline.count_2_shaders_vert_frag
+dEQP-VK.pipeline.push_constant.graphics_pipeline.count_3_shaders_vert_geom_frag
+dEQP-VK.pipeline.push_constant.graphics_pipeline.count_5_shaders_vert_tess_geom_frag
 dEQP-VK.pipeline.push_constant.graphics_pipeline.count_1_shader_vert_frag
 dEQP-VK.pipeline.push_constant.graphics_pipeline.data_update_partial_1
 dEQP-VK.pipeline.push_constant.graphics_pipeline.data_update_partial_2

diff --git a/android/cts/nyc/vk-master.txt b/android/cts/nyc/vk-master.txt
index 5539c16..29c9ad1 100644 (file)
--- a/android/cts/nyc/vk-master.txt
+++ b/android/cts/nyc/vk-master.txt
@@ -54256,9 +54256,9 @@ dEQP-VK.pipeline.image_view.view_type.cube_array.format.astc_12x12_srgb_block.su
 dEQP-VK.pipeline.push_constant.graphics_pipeline.range_size_4
 dEQP-VK.pipeline.push_constant.graphics_pipeline.range_size_16
 dEQP-VK.pipeline.push_constant.graphics_pipeline.range_size_128
-dEQP-VK.pipeline.push_constant.graphics_pipeline.count_2_shader_vert_frag
-dEQP-VK.pipeline.push_constant.graphics_pipeline.count_3shader_vert_geom_frag
-dEQP-VK.pipeline.push_constant.graphics_pipeline.count_5_shader_vert_tess_geom_frag
+dEQP-VK.pipeline.push_constant.graphics_pipeline.count_2_shaders_vert_frag
+dEQP-VK.pipeline.push_constant.graphics_pipeline.count_3_shaders_vert_geom_frag
+dEQP-VK.pipeline.push_constant.graphics_pipeline.count_5_shaders_vert_tess_geom_frag
 dEQP-VK.pipeline.push_constant.graphics_pipeline.count_1_shader_vert_frag
 dEQP-VK.pipeline.push_constant.graphics_pipeline.data_update_partial_1
 dEQP-VK.pipeline.push_constant.graphics_pipeline.data_update_partial_2

diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelinePushConstantTests.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelinePushConstantTests.cpp
index 9e96d11..aeef07f 100644 (file)
--- a/external/vulkancts/modules/vulkan/pipeline/vktPipelinePushConstantTests.cpp
+++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelinePushConstantTests.cpp
@@ -1491,7 +1491,7 @@ tcu::TestCaseGroup* createPushConstantTests (tcu::TestContext& testCtx)
                },
                // test range count, including all valid shader stage in graphics pipeline, and also multiple shader stages share one single range
                {
-                       "count_2_shader_vert_frag",
+                       "count_2_shaders_vert_frag",
                        "test range count is 2, use vertex and fragment shaders",
                        2u,
                        {
@@ -1501,7 +1501,7 @@ tcu::TestCaseGroup* createPushConstantTests (tcu::TestContext& testCtx)
                        false
                },
                {
-                       "count_3shader_vert_geom_frag",
+                       "count_3_shaders_vert_geom_frag",
                        "test range count is 3, use vertex, geometry and fragment shaders",
                        3u,
                        {
@@ -1512,7 +1512,7 @@ tcu::TestCaseGroup* createPushConstantTests (tcu::TestContext& testCtx)
                        false
                },
                {
-                       "count_5_shader_vert_tess_geom_frag",
+                       "count_5_shaders_vert_tess_geom_frag",
                        "test range count is 5, use vertex, tessellation, geometry and fragment shaders",
                        5u,
                        {

diff --git a/external/vulkancts/mustpass/1.0.0/src/master.txt b/external/vulkancts/mustpass/1.0.0/src/master.txt
index 51d1cda..9a03c03 100644 (file)
--- a/external/vulkancts/mustpass/1.0.0/src/master.txt
+++ b/external/vulkancts/mustpass/1.0.0/src/master.txt
@@ -54262,9 +54262,9 @@ dEQP-VK.pipeline.image_view.view_type.cube_array.format.astc_12x12_srgb_block.su
 dEQP-VK.pipeline.push_constant.graphics_pipeline.range_size_4
 dEQP-VK.pipeline.push_constant.graphics_pipeline.range_size_16
 dEQP-VK.pipeline.push_constant.graphics_pipeline.range_size_128
-dEQP-VK.pipeline.push_constant.graphics_pipeline.count_2_shader_vert_frag
-dEQP-VK.pipeline.push_constant.graphics_pipeline.count_3shader_vert_geom_frag
-dEQP-VK.pipeline.push_constant.graphics_pipeline.count_5_shader_vert_tess_geom_frag
+dEQP-VK.pipeline.push_constant.graphics_pipeline.count_2_shaders_vert_frag
+dEQP-VK.pipeline.push_constant.graphics_pipeline.count_3_shaders_vert_geom_frag
+dEQP-VK.pipeline.push_constant.graphics_pipeline.count_5_shaders_vert_tess_geom_frag
 dEQP-VK.pipeline.push_constant.graphics_pipeline.count_1_shader_vert_frag
 dEQP-VK.pipeline.push_constant.graphics_pipeline.data_update_partial_1
 dEQP-VK.pipeline.push_constant.graphics_pipeline.data_update_partial_2

diff --git a/external/vulkancts/mustpass/1.0.0/vk-default.txt b/external/vulkancts/mustpass/1.0.0/vk-default.txt
index 51d1cda..9a03c03 100644 (file)
--- a/external/vulkancts/mustpass/1.0.0/vk-default.txt
+++ b/external/vulkancts/mustpass/1.0.0/vk-default.txt
@@ -54262,9 +54262,9 @@ dEQP-VK.pipeline.image_view.view_type.cube_array.format.astc_12x12_srgb_block.su
 dEQP-VK.pipeline.push_constant.graphics_pipeline.range_size_4
 dEQP-VK.pipeline.push_constant.graphics_pipeline.range_size_16
 dEQP-VK.pipeline.push_constant.graphics_pipeline.range_size_128
-dEQP-VK.pipeline.push_constant.graphics_pipeline.count_2_shader_vert_frag
-dEQP-VK.pipeline.push_constant.graphics_pipeline.count_3shader_vert_geom_frag
-dEQP-VK.pipeline.push_constant.graphics_pipeline.count_5_shader_vert_tess_geom_frag
+dEQP-VK.pipeline.push_constant.graphics_pipeline.count_2_shaders_vert_frag
+dEQP-VK.pipeline.push_constant.graphics_pipeline.count_3_shaders_vert_geom_frag
+dEQP-VK.pipeline.push_constant.graphics_pipeline.count_5_shaders_vert_tess_geom_frag
 dEQP-VK.pipeline.push_constant.graphics_pipeline.count_1_shader_vert_frag
 dEQP-VK.pipeline.push_constant.graphics_pipeline.data_update_partial_1
 dEQP-VK.pipeline.push_constant.graphics_pipeline.data_update_partial_2

diff --git a/external/vulkancts/mustpass/1.0.1/vk-default.txt b/external/vulkancts/mustpass/1.0.1/vk-default.txt
index 8ef50d3..34b9ea9 100644 (file)
--- a/external/vulkancts/mustpass/1.0.1/vk-default.txt
+++ b/external/vulkancts/mustpass/1.0.1/vk-default.txt
@@ -62949,9 +62949,9 @@ dEQP-VK.pipeline.image_view.view_type.cube_array.format.astc_12x12_srgb_block.su
 dEQP-VK.pipeline.push_constant.graphics_pipeline.range_size_4
 dEQP-VK.pipeline.push_constant.graphics_pipeline.range_size_16
 dEQP-VK.pipeline.push_constant.graphics_pipeline.range_size_128
-dEQP-VK.pipeline.push_constant.graphics_pipeline.count_2_shader_vert_frag
-dEQP-VK.pipeline.push_constant.graphics_pipeline.count_3shader_vert_geom_frag
-dEQP-VK.pipeline.push_constant.graphics_pipeline.count_5_shader_vert_tess_geom_frag
+dEQP-VK.pipeline.push_constant.graphics_pipeline.count_2_shaders_vert_frag
+dEQP-VK.pipeline.push_constant.graphics_pipeline.count_3_shaders_vert_geom_frag
+dEQP-VK.pipeline.push_constant.graphics_pipeline.count_5_shaders_vert_tess_geom_frag
 dEQP-VK.pipeline.push_constant.graphics_pipeline.count_1_shader_vert_frag
 dEQP-VK.pipeline.push_constant.graphics_pipeline.data_update_partial_1
 dEQP-VK.pipeline.push_constant.graphics_pipeline.data_update_partial_2