From 9f6ea09230fbb9565901ea65f8fa6f8231b70742 Mon Sep 17 00:00:00 2001
From: Pyry Haulos <phaulos@google.com>
Date: Fri, 11 Mar 2016 08:27:52 -0800
Subject: [PATCH] Add WSI tests to mustpass

Change-Id: I8c7553060c249bedfd701ccfe75cd458692e9859
---
 android/cts/master/com.drawelements.deqp.vk.xml  | 18 ++++++++++++++++++
 android/cts/master/src/vulkan-not-applicable.txt |  6 ++++++
 android/cts/master/vk-master.txt                 |  4 ++++
 scripts/build_android_mustpass.py                |  1 +
 4 files changed, 29 insertions(+)
 create mode 100644 android/cts/master/src/vulkan-not-applicable.txt

diff --git a/android/cts/master/com.drawelements.deqp.vk.xml b/android/cts/master/com.drawelements.deqp.vk.xml
index 2215092..03c35c1 100644
--- a/android/cts/master/com.drawelements.deqp.vk.xml
+++ b/android/cts/master/com.drawelements.deqp.vk.xml
@@ -258747,5 +258747,23 @@
 				</TestCase>
 			</TestSuite>
 		</TestSuite>
+		<TestSuite name="wsi">
+			<TestSuite name="android">
+				<TestCase name="surface">
+					<Test name="create">
+						<TestInstance/>
+					</Test>
+					<Test name="query_support">
+						<TestInstance/>
+					</Test>
+					<Test name="query_capabilities">
+						<TestInstance/>
+					</Test>
+					<Test name="initial_size">
+						<TestInstance/>
+					</Test>
+				</TestCase>
+			</TestSuite>
+		</TestSuite>
 	</TestSuite>
 </TestPackage>
diff --git a/android/cts/master/src/vulkan-not-applicable.txt b/android/cts/master/src/vulkan-not-applicable.txt
new file mode 100644
index 0000000..54abde2
--- /dev/null
+++ b/android/cts/master/src/vulkan-not-applicable.txt
@@ -0,0 +1,6 @@
+# WSI tests for other platforms
+dEQP-VK.wsi.xlib.*
+dEQP-VK.wsi.xcb.*
+dEQP-VK.wsi.mir.*
+dEQP-VK.wsi.wayland.*
+dEQP-VK.wsi.win32.*
diff --git a/android/cts/master/vk-master.txt b/android/cts/master/vk-master.txt
index 788b422..a25ee51 100644
--- a/android/cts/master/vk-master.txt
+++ b/android/cts/master/vk-master.txt
@@ -80288,3 +80288,7 @@ dEQP-VK.image.image_size.buffer.readonly_writeonly_32
 dEQP-VK.image.image_size.buffer.readonly_writeonly_12
 dEQP-VK.image.image_size.buffer.readonly_writeonly_1
 dEQP-VK.image.image_size.buffer.readonly_writeonly_7
+dEQP-VK.wsi.android.surface.create
+dEQP-VK.wsi.android.surface.query_support
+dEQP-VK.wsi.android.surface.query_capabilities
+dEQP-VK.wsi.android.surface.initial_size
diff --git a/scripts/build_android_mustpass.py b/scripts/build_android_mustpass.py
index 9908b9d..1165137 100644
--- a/scripts/build_android_mustpass.py
+++ b/scripts/build_android_mustpass.py
@@ -332,6 +332,7 @@ MASTER_GLES31_PKG				= Package(module = GLES31_MODULE, configurations = [
 
 MASTER_VULKAN_FILTERS			= [
 		include("vulkan-master.txt"),
+		exclude("vulkan-not-applicable.txt"),
 		exclude("vulkan-test-issues.txt"),
 		exclude("vulkan-hw-issues.txt")
 	]
-- 
2.7.4