Merge goog/master@c8da37c into stage-aosp-master.

[platform/upstream/VK-GL-CTS.git] / scripts / mustpass.py

diff --git a/scripts/mustpass.py b/scripts/mustpass.py
index 4722c75..0a5f7dd 100644 (file)
--- a/scripts/mustpass.py
+++ b/scripts/mustpass.py
@@ -42,12 +42,13 @@ 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, runtime = None):
+               self.name                        = name
+               self.glconfig            = glconfig
+               self.rotation            = rotation
+               self.surfacetype         = surfacetype
+               self.filters             = filters
+               self.expectedRuntime = runtime
 
 class Package:
        def __init__ (self, module, configurations):
@@ -364,13 +365,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 +384,9 @@ def genAndroidTestXml (mustpass):
                        if config.rotation != None:
                                addOptionElement(testElement, "deqp-screen-rotation", config.rotation)
 
+                       if config.expectedRuntime != None:
+                               addOptionElement(testElement, "runtime-hint", config.expectedRuntime)
+
        insertXMLHeaders(mustpass, configElement)
 
        return configElement