Merge "Fix error double accounting in fuzzyCompare()"

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

diff --git a/scripts/mustpass.py b/scripts/mustpass.py
index 3524a35..5d5b804 100644 (file)
--- a/scripts/mustpass.py
+++ b/scripts/mustpass.py
@@ -27,6 +27,7 @@ from build_caselists import Module, getModuleByName, getBuildConfig, genCaseList
 from fnmatch import fnmatch
 from copy import copy
 
+import argparse
 import xml.etree.cElementTree as ElementTree
 import xml.dom.minidom as minidom
 
@@ -42,13 +43,14 @@ class Project:
                self.copyright  = copyright
 
 class Configuration:
-       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
+       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):
@@ -303,6 +305,9 @@ def genAndroidTestXml (mustpass):
        RUNNER_CLASS = "com.drawelements.deqp.runner.DeqpTestRunner"
        configElement = ElementTree.Element("configuration")
 
+       # add in metadata option for component name
+       ElementTree.SubElement(configElement, "option", name="config-descriptor:metadata", key="component", value="deqp")
+
        for package in mustpass.packages:
                for config in package.configurations:
                        testElement = ElementTree.SubElement(configElement, "test")
@@ -322,6 +327,9 @@ def genAndroidTestXml (mustpass):
                        if config.expectedRuntime != None:
                                addOptionElement(testElement, "runtime-hint", config.expectedRuntime)
 
+                       if config.required:
+                               addOptionElement(testElement, "deqp-config-required", "true")
+
        insertXMLHeaders(mustpass, configElement)
 
        return configElement
@@ -368,3 +376,27 @@ def genMustpassLists (mustpassLists, generator, buildCfg):
 
        for mustpass in mustpassLists:
                genMustpass(mustpass, moduleCaseLists)
+
+def parseCmdLineArgs ():
+       parser = argparse.ArgumentParser(description = "Build Android CTS mustpass",
+                                                                        formatter_class=argparse.ArgumentDefaultsHelpFormatter)
+       parser.add_argument("-b",
+                                               "--build-dir",
+                                               dest="buildDir",
+                                               default=DEFAULT_BUILD_DIR,
+                                               help="Temporary build directory")
+       parser.add_argument("-t",
+                                               "--build-type",
+                                               dest="buildType",
+                                               default="Debug",
+                                               help="Build type")
+       parser.add_argument("-c",
+                                               "--deqp-target",
+                                               dest="targetName",
+                                               default=DEFAULT_TARGET,
+                                               help="dEQP build target")
+       return parser.parse_args()
+
+def parseBuildConfigFromCmdLineArgs ():
+       args = parseCmdLineArgs()
+       return getBuildConfig(args.buildDir, args.targetName, args.buildType)