X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=scripts%2Fbuild_android_mustpass.py;h=0a53fb46c96e34ea89a039f9fc865b26a7d94106;hb=7e37841e4fbdc3835da8dc38736c0ec2e2a7fab7;hp=81d2474fea27056f1cf0c8813f65483d7bf3831d;hpb=5f2ae2d09c4da68dc41b299c072b120ecfba598f;p=platform%2Fupstream%2FVK-GL-CTS.git

diff --git a/scripts/build_android_mustpass.py b/scripts/build_android_mustpass.py
index 81d2474..0a53fb4 100644
--- a/scripts/build_android_mustpass.py
+++ b/scripts/build_android_mustpass.py
@@ -23,7 +23,7 @@
 from build.common import DEQP_DIR
 from build.config import ANY_GENERATOR
 from build_caselists import Module, getModuleByName, getBuildConfig, DEFAULT_BUILD_DIR, DEFAULT_TARGET
-from mustpass import Project, Package, Mustpass, Configuration, include, exclude, genMustpassLists
+from mustpass import Project, Package, Mustpass, Configuration, include, exclude, genMustpassLists, parseBuildConfigFromCmdLineArgs
 
 import os
 
@@ -207,7 +207,7 @@ NYC_EGL_PKG						= Package(module = EGL_MODULE, configurations = [
 					  rotation		= "unspecified",
 					  surfacetype	= "window",
 					  filters		= NYC_EGL_COMMON_FILTERS,
-				      runtime		= "24m"),
+				      runtime		= "11m"),
 	])
 
 NYC_GLES2_COMMON_FILTERS			= [
@@ -220,7 +220,7 @@ NYC_GLES2_PKG					= Package(module = GLES2_MODULE, configurations = [
 					  rotation		= "unspecified",
 					  surfacetype	= "window",
 					  filters		= NYC_GLES2_COMMON_FILTERS,
-					  runtime		= "40m"),
+					  runtime		= "30m"),
 	])
 
 NYC_GLES3_COMMON_FILTERS		= [
@@ -233,32 +233,32 @@ NYC_GLES3_PKG					= Package(module = GLES3_MODULE, configurations = [
 					  rotation		= "unspecified",
 					  surfacetype	= "window",
 					  filters		= NYC_GLES3_COMMON_FILTERS,
-					  runtime		= "1h15m"),
+					  runtime		= "1h50min"),
 		# Rotations
 		Configuration(name			= "rotate-portrait",
 					  glconfig		= "rgba8888d24s8ms0",
 					  rotation		= "0",
 					  surfacetype	= "window",
 					  filters		= NYC_GLES3_COMMON_FILTERS + [include("gles3-rotation.txt")],
-					  runtime		= "7m"),
+					  runtime		= "5m"),
 		Configuration(name			= "rotate-landscape",
 					  glconfig		= "rgba8888d24s8ms0",
 					  rotation		= "90",
 					  surfacetype	= "window",
 					  filters		= NYC_GLES3_COMMON_FILTERS + [include("gles3-rotation.txt")],
-					  runtime		= "7m"),
+					  runtime		= "5m"),
 		Configuration(name			= "rotate-reverse-portrait",
 					  glconfig		= "rgba8888d24s8ms0",
 					  rotation		= "180",
 					  surfacetype	= "window",
 					  filters		= NYC_GLES3_COMMON_FILTERS + [include("gles3-rotation.txt")],
-					  runtime		= "7m"),
+					  runtime		= "5m"),
 		Configuration(name			= "rotate-reverse-landscape",
 					  glconfig		= "rgba8888d24s8ms0",
 					  rotation		= "270",
 					  surfacetype	= "window",
 					  filters		= NYC_GLES3_COMMON_FILTERS + [include("gles3-rotation.txt")],
-					  runtime		= "7m"),
+					  runtime		= "5m"),
 
 		# MSAA
 		Configuration(name			= "multisample",
@@ -287,7 +287,7 @@ NYC_GLES31_PKG					= Package(module = GLES31_MODULE, configurations = [
 					  rotation		= "unspecified",
 					  surfacetype	= "window",
 					  filters		= NYC_GLES31_COMMON_FILTERS,
-					  runtime		= "7h30m"),
+					  runtime		= "4h40m"),
 
 		# Rotations
 		Configuration(name			= "rotate-portrait",
@@ -338,14 +338,15 @@ NYC_VULKAN_FILTERS				= [
 NYC_VULKAN_PKG					= Package(module = VULKAN_MODULE, configurations = [
 		Configuration(name			= "master",
 					  filters		= NYC_VULKAN_FILTERS,
-					  runtime		= "3h45m"),
+					  runtime		= "1h11m"),
 	])
 
 # Master
 
 MASTER_EGL_COMMON_FILTERS		= [include("egl-master.txt"),
 								   exclude("egl-test-issues.txt"),
-								   exclude("egl-internal-api-tests.txt")]
+								   exclude("egl-internal-api-tests.txt"),
+								   exclude("egl-manual-robustness.txt")]
 MASTER_EGL_PKG					= Package(module = EGL_MODULE, configurations = [
 		# Master
 		Configuration(name			= "master",
@@ -354,7 +355,7 @@ MASTER_EGL_PKG					= Package(module = EGL_MODULE, configurations = [
 					  surfacetype	= "window",
 					  required		= True,
 					  filters		= MASTER_EGL_COMMON_FILTERS,
-				      runtime		= "24m"),
+				      runtime		= "23m"),
 	])
 
 MASTER_GLES2_COMMON_FILTERS		= [
@@ -370,7 +371,7 @@ MASTER_GLES2_PKG				= Package(module = GLES2_MODULE, configurations = [
 					  surfacetype	= "window",
 					  required		= True,
 					  filters		= MASTER_GLES2_COMMON_FILTERS,
-					  runtime		= "40m"),
+					  runtime		= "46m"),
 	])
 
 MASTER_GLES3_COMMON_FILTERS		= [
@@ -388,32 +389,32 @@ MASTER_GLES3_PKG				= Package(module = GLES3_MODULE, configurations = [
 					  surfacetype	= "window",
 					  required		= True,
 					  filters		= MASTER_GLES3_COMMON_FILTERS,
-					  runtime		= "1h15m"),
+					  runtime		= "1h50m"),
 		# Rotations
 		Configuration(name			= "rotate-portrait",
 					  glconfig		= "rgba8888d24s8ms0",
 					  rotation		= "0",
 					  surfacetype	= "window",
 					  filters		= MASTER_GLES3_COMMON_FILTERS + [include("gles3-rotation.txt")],
-					  runtime		= "7m"),
+					  runtime		= "1m"),
 		Configuration(name			= "rotate-landscape",
 					  glconfig		= "rgba8888d24s8ms0",
 					  rotation		= "90",
 					  surfacetype	= "window",
 					  filters		= MASTER_GLES3_COMMON_FILTERS + [include("gles3-rotation.txt")],
-					  runtime		= "7m"),
+					  runtime		= "1m"),
 		Configuration(name			= "rotate-reverse-portrait",
 					  glconfig		= "rgba8888d24s8ms0",
 					  rotation		= "180",
 					  surfacetype	= "window",
 					  filters		= MASTER_GLES3_COMMON_FILTERS + [include("gles3-rotation.txt")],
-					  runtime		= "7m"),
+					  runtime		= "1m"),
 		Configuration(name			= "rotate-reverse-landscape",
 					  glconfig		= "rgba8888d24s8ms0",
 					  rotation		= "270",
 					  surfacetype	= "window",
 					  filters		= MASTER_GLES3_COMMON_FILTERS + [include("gles3-rotation.txt")],
-					  runtime		= "7m"),
+					  runtime		= "1m"),
 
 		# MSAA
 		Configuration(name			= "multisample",
@@ -422,7 +423,7 @@ MASTER_GLES3_PKG				= Package(module = GLES3_MODULE, configurations = [
 					  surfacetype	= "window",
 					  filters		= MASTER_GLES3_COMMON_FILTERS + [include("gles3-multisample.txt"),
 																	 exclude("gles3-multisample-issues.txt")],
-					  runtime		= "10m"),
+					  runtime		= "1m"),
 
 		# Pixel format
 		Configuration(name			= "565-no-depth-no-stencil",
@@ -431,7 +432,7 @@ MASTER_GLES3_PKG				= Package(module = GLES3_MODULE, configurations = [
 					  surfacetype	= "window",
 					  filters		= MASTER_GLES3_COMMON_FILTERS + [include("gles3-pixelformat.txt"),
 																	 exclude("gles3-pixelformat-issues.txt")],
-					  runtime		= "10m"),
+					  runtime		= "1m"),
 	])
 
 MASTER_GLES31_COMMON_FILTERS	= [
@@ -439,7 +440,7 @@ MASTER_GLES31_COMMON_FILTERS	= [
 		exclude("gles31-hw-issues.txt"),
 		exclude("gles31-driver-issues.txt"),
 		exclude("gles31-test-issues.txt"),
-		exclude("gles31-spec-issues.txt"),
+		exclude("gles31-spec-issues.txt")
 	]
 MASTER_GLES31_PKG				= Package(module = GLES31_MODULE, configurations = [
 		# Master
@@ -449,7 +450,7 @@ MASTER_GLES31_PKG				= Package(module = GLES31_MODULE, configurations = [
 					  surfacetype	= "window",
 					  required		= True,
 					  filters		= MASTER_GLES31_COMMON_FILTERS,
-					  runtime		= "7h30m"),
+					  runtime		= "1h40m"),
 
 		# Rotations
 		Configuration(name			= "rotate-portrait",
@@ -497,13 +498,14 @@ MASTER_GLES31_PKG				= Package(module = GLES31_MODULE, configurations = [
 MASTER_VULKAN_FILTERS			= [
 		include("vk-master.txt"),
 		exclude("vk-not-applicable.txt"),
+		exclude("vk-excluded-tests.txt"),
 		exclude("vk-test-issues.txt"),
-		exclude("vk-hw-issues.txt")
+		exclude("vk-waivers.txt")
 	]
 MASTER_VULKAN_PKG				= Package(module = VULKAN_MODULE, configurations = [
 		Configuration(name			= "master",
 					  filters		= MASTER_VULKAN_FILTERS,
-					  runtime		= "3h45m"),
+					  runtime		= "2h29m"),
 	])
 
 MUSTPASS_LISTS				= [
@@ -514,7 +516,5 @@ MUSTPASS_LISTS				= [
 		Mustpass(project = CTS_PROJECT, version = "master",		packages = [MASTER_EGL_PKG, MASTER_GLES2_PKG, MASTER_GLES3_PKG, MASTER_GLES31_PKG, MASTER_VULKAN_PKG])
 	]
 
-BUILD_CONFIG				= getBuildConfig(DEFAULT_BUILD_DIR, DEFAULT_TARGET, "Debug")
-
 if __name__ == "__main__":
-	genMustpassLists(MUSTPASS_LISTS, ANY_GENERATOR, BUILD_CONFIG)
+	genMustpassLists(MUSTPASS_LISTS, ANY_GENERATOR, parseBuildConfigFromCmdLineArgs())