commit 23a07b553c932b026590f1e66ffc9fef1c1075ef
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Feb 02 20:23:34 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 02 20:23:34 2018 +0000
tree cf66bb12ac98ab6a69b35c115cb297ccd97cb322
parent 6be8a35366b7135ff14c1b8e43a5fc177d4338fe
parent afa15dcc00a8d29678708f6b209ff5d229112b2f

Merge "mustpass: Exclude one more test in dEQP-VK.binding_model"

android/cts/master/src/vk-excluded-tests.txt

diff --git a/android/cts/master/src/vk-excluded-tests.txt b/android/cts/master/src/vk-excluded-tests.txt
index 471054e..51bf38e 100644
--- a/android/cts/master/src/vk-excluded-tests.txt
+++ b/android/cts/master/src/vk-excluded-tests.txt
@@ -394,7 +394,6 @@
 dEQP-VK.binding_model.shader_access.primary_cmd_buf.with_template.storage_buffer_dynamic.no_access.multiple_arbitrary_descriptors.offset_view_nonzero_dynamic_nonzero
 dEQP-VK.binding_model.shader_access.primary_cmd_buf.with_template.storage_buffer_dynamic.no_access.multiple_arbitrary_descriptors.offset_view_nonzero_dynamic_zero
 dEQP-VK.binding_model.shader_access.primary_cmd_buf.with_template.storage_buffer_dynamic.no_access.multiple_arbitrary_descriptors.offset_view_zero_dynamic_zero
-dEQP-VK.binding_model.shader_access.primary_cmd_buf.with_template.storage_buffer_dynamic.no_access.multiple_arbitrary_descriptors.offset_view_zero_dynamic_nonzero
 dEQP-VK.binding_model.shader_access.primary_cmd_buf.with_template.storage_buffer.fragment.multiple_arbitrary_descriptors.offset_view_nonzero
 dEQP-VK.binding_model.shader_access.primary_cmd_buf.with_template.storage_buffer.fragment.multiple_arbitrary_descriptors.offset_view_zero
 dEQP-VK.binding_model.shader_access.primary_cmd_buf.with_template.storage_buffer.no_access.multiple_arbitrary_descriptors.offset_view_nonzero
@@ -715,3 +714,9 @@
 
 # Temporarily excluded for b/72324588
 dEQP-VK.image.mutable.2d*
+
+# Temporarily excluded for b/72828206
+dEQP-VK.binding_model.shader_access.primary_cmd_buf.with_template.storage_buffer_dynamic.no_access.multiple_arbitrary_descriptors.offset_view_zero_dynamic_nonzero
+
+# Temporarily excluded for b/72834612
+dEQP-VK.binding_model.shader_access.primary_cmd_buf.uniform_buffer.fragment.multiple_arbitrary_descriptors.offset_view_nonzero

android/cts/master/vk-master.txt

diff --git a/android/cts/master/vk-master.txt b/android/cts/master/vk-master.txt
index dfa800f..f0fe179 100755
--- a/android/cts/master/vk-master.txt
+++ b/android/cts/master/vk-master.txt
@@ -148589,7 +148589,6 @@
 dEQP-VK.binding_model.shader_access.primary_cmd_buf.uniform_buffer.fragment.multiple_contiguous_descriptors.offset_view_zero
 dEQP-VK.binding_model.shader_access.primary_cmd_buf.uniform_buffer.fragment.multiple_contiguous_descriptors.offset_view_nonzero
 dEQP-VK.binding_model.shader_access.primary_cmd_buf.uniform_buffer.fragment.multiple_arbitrary_descriptors.offset_view_zero
-dEQP-VK.binding_model.shader_access.primary_cmd_buf.uniform_buffer.fragment.multiple_arbitrary_descriptors.offset_view_nonzero
 dEQP-VK.binding_model.shader_access.primary_cmd_buf.uniform_buffer.fragment.descriptor_array.offset_view_zero
 dEQP-VK.binding_model.shader_access.primary_cmd_buf.uniform_buffer.fragment.descriptor_array.offset_view_nonzero
 dEQP-VK.binding_model.shader_access.primary_cmd_buf.uniform_buffer.compute.single_descriptor.offset_view_zero