X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=scripts%2Fmustpass.py;h=755faa062d1b39a997b7db3c173b9f357449731c;hb=5f341177765a4d772560a269ae9de2af1aa585f3;hp=328e66304bdb80f7a9c4fabbad956e1c520e90af;hpb=873c433bd07eef42ca7a44a5a8c942194a5d9b65;p=platform%2Fupstream%2FVK-GL-CTS.git

diff --git a/scripts/mustpass.py b/scripts/mustpass.py
index 328e663..755faa0 100644
--- a/scripts/mustpass.py
+++ b/scripts/mustpass.py
@@ -42,12 +42,14 @@ class Project:
 		self.copyright	= copyright
 
 class Configuration:
-	def __init__ (self, name, filters, glconfig = None, rotation = None, surfacetype = None):
-		self.name			= name
-		self.glconfig		= glconfig
-		self.rotation		= rotation
-		self.surfacetype	= surfacetype
-		self.filters		= filters
+	def __init__ (self, name, filters, glconfig = None, rotation = None, surfacetype = None, required = False, runtime = None):
+		self.name				= name
+		self.glconfig			= glconfig
+		self.rotation			= rotation
+		self.surfacetype		= surfacetype
+		self.required			= required
+		self.filters			= filters
+		self.expectedRuntime	= runtime
 
 class Package:
 	def __init__ (self, module, configurations):
@@ -364,13 +366,8 @@ def addOptionElement (parent, optionName, optionValue):
 	ElementTree.SubElement(parent, "option", name=optionName, value=optionValue)
 
 def genAndroidTestXml (mustpass):
-	INSTALLER_CLASS = "com.android.compatibility.common.tradefed.targetprep.ApkInstaller"
 	RUNNER_CLASS = "com.drawelements.deqp.runner.DeqpTestRunner"
 	configElement = ElementTree.Element("configuration")
-	preparerElement = ElementTree.SubElement(configElement, "target_preparer")
-	preparerElement.set("class", INSTALLER_CLASS)
-	addOptionElement(preparerElement, "cleanup-apks", "true")
-	addOptionElement(preparerElement, "test-file-name", APK_NAME)
 
 	for package in mustpass.packages:
 		for config in package.configurations:
@@ -388,6 +385,12 @@ def genAndroidTestXml (mustpass):
 			if config.rotation != None:
 				addOptionElement(testElement, "deqp-screen-rotation", config.rotation)
 
+			if config.expectedRuntime != None:
+				addOptionElement(testElement, "runtime-hint", config.expectedRuntime)
+
+			if config.required:
+				addOptionElement(testElement, "deqp-config-required", "true")
+
 	insertXMLHeaders(mustpass, configElement)
 
 	return configElement
@@ -434,7 +437,7 @@ def genMustpass (mustpass, moduleCaseLists):
 	writeFile(specFilename, prettifyXML(specXML))
 
 	# TODO: Which is the best selector mechanism?
-	if (mustpass.version == "mnc"):
+	if (mustpass.version == "master"):
 		androidTestXML		= genAndroidTestXml(mustpass)
 		androidTestFilename	= os.path.join(mustpass.project.path, "AndroidTest.xml")