RESTRICT AUTOMERGE: Remove accidentally introduced tests from mustpass

Upstream change to fix these tests only altered the Khronos mustpass
files; I missed the corresponding Android CTS change. Exclude the tests
now.

Change-Id: If3a49291330b0021559e2a9efc54b74b1f3c2af1
Components: AOSP mustpass
Bug: b/118828237

diff --git a/android/cts/master/src/vk-excluded-tests.txt b/android/cts/master/src/vk-excluded-tests.txt
index 557c114..181fef3 100644 (file)
--- a/android/cts/master/src/vk-excluded-tests.txt
+++ b/android/cts/master/src/vk-excluded-tests.txt
@@ -355,3 +355,10 @@ dEQP-VK.wsi.android.incremental_present.scale_down.*
 # previously-passing implementations.
 dEQP-VK.draw.indirect_draw.sequential.indirect_draw_first_instance.*
 dEQP-VK.draw.indirect_draw.indexed.indirect_draw_first_instance.*
+
+# VK-GL-CTS 1273
+# Added new tests. Exclude them for existing releases
+dEQP-VK.tessellation.primitive_discard.triangles_fractional_odd_spacing_ccw_valid_levels
+dEQP-VK.tessellation.primitive_discard.triangles_fractional_odd_spacing_cw_valid_levels
+dEQP-VK.tessellation.primitive_discard.quads_fractional_odd_spacing_ccw_valid_levels
+dEQP-VK.tessellation.primitive_discard.quads_fractional_odd_spacing_cw_valid_levels

diff --git a/android/cts/master/vk-master.txt b/android/cts/master/vk-master.txt
index 6d96a11..09578f4 100644 (file)
--- a/android/cts/master/vk-master.txt
+++ b/android/cts/master/vk-master.txt
@@ -201855,11 +201855,9 @@ dEQP-VK.tessellation.primitive_discard.triangles_equal_spacing_ccw
 dEQP-VK.tessellation.primitive_discard.triangles_equal_spacing_ccw_point_mode
 dEQP-VK.tessellation.primitive_discard.triangles_equal_spacing_cw
 dEQP-VK.tessellation.primitive_discard.triangles_equal_spacing_cw_point_mode
-dEQP-VK.tessellation.primitive_discard.triangles_fractional_odd_spacing_ccw_valid_levels
 dEQP-VK.tessellation.primitive_discard.triangles_fractional_odd_spacing_ccw
 dEQP-VK.tessellation.primitive_discard.triangles_fractional_odd_spacing_ccw_point_mode_valid_levels
 dEQP-VK.tessellation.primitive_discard.triangles_fractional_odd_spacing_ccw_point_mode
-dEQP-VK.tessellation.primitive_discard.triangles_fractional_odd_spacing_cw_valid_levels
 dEQP-VK.tessellation.primitive_discard.triangles_fractional_odd_spacing_cw
 dEQP-VK.tessellation.primitive_discard.triangles_fractional_odd_spacing_cw_point_mode_valid_levels
 dEQP-VK.tessellation.primitive_discard.triangles_fractional_odd_spacing_cw_point_mode
@@ -201871,11 +201869,9 @@ dEQP-VK.tessellation.primitive_discard.quads_equal_spacing_ccw
 dEQP-VK.tessellation.primitive_discard.quads_equal_spacing_ccw_point_mode
 dEQP-VK.tessellation.primitive_discard.quads_equal_spacing_cw
 dEQP-VK.tessellation.primitive_discard.quads_equal_spacing_cw_point_mode
-dEQP-VK.tessellation.primitive_discard.quads_fractional_odd_spacing_ccw_valid_levels
 dEQP-VK.tessellation.primitive_discard.quads_fractional_odd_spacing_ccw
 dEQP-VK.tessellation.primitive_discard.quads_fractional_odd_spacing_ccw_point_mode_valid_levels
 dEQP-VK.tessellation.primitive_discard.quads_fractional_odd_spacing_ccw_point_mode
-dEQP-VK.tessellation.primitive_discard.quads_fractional_odd_spacing_cw_valid_levels
 dEQP-VK.tessellation.primitive_discard.quads_fractional_odd_spacing_cw
 dEQP-VK.tessellation.primitive_discard.quads_fractional_odd_spacing_cw_point_mode_valid_levels
 dEQP-VK.tessellation.primitive_discard.quads_fractional_odd_spacing_cw_point_mode