self.filters = filters
class Package:
- def __init__ (self, module, configurations, runtimeHint = None, splitFilters = {}):
+ def __init__ (self, module, configurations, splitFilters = {}):
self.module = module
- self.configurations = configurations
- self.runtimeHint = runtimeHint
+ self.configurations = configurations
# Map of name:[include filters]. Each will generate <api>.<name> package
# Test cases that didn't match any split filter will be in <api> package,
# i.e., the default value keeps everything in one package.
def encode (self):
return (self.major << 16) | (self.minor)
-class FilterHint:
- def __init__(self, packageFilter, hint):
- self.packageFilter = packageFilter
- self.hint = hint
-
def getModuleGLESVersion (module):
versions = {
'dEQP-EGL': GLESVersion(2,0),
generator = ANY_GENERATOR
buildCfg = getBuildConfig(DEFAULT_BUILD_DIR, DEFAULT_TARGET, "Debug")
- build(buildCfg, generator, [module.binName])
+ #build(buildCfg, generator, [module.binName])
genCaseList(buildCfg, generator, module, "txt")
return readCaseList(getCaseListPath(buildCfg, module, "txt"))
reparsed = minidom.parseString(uglyString)
return reparsed.toprettyxml(indent='\t', encoding='utf-8')
-def genCTSPackageXML (package, root, name, runtimeHint):
+def genCTSPackageXML (package, root, name):
def isLeafGroup (testGroup):
numGroups = 0
numTests = 0
appPackageName = name,
testType = "deqpTest")
- if runtimeHint:
- pkgElem.set("runtimeHint", runtimeHint)
pkgElem.set("xmlns:deqp", "http://drawelements.com/deqp")
pkgElem.set("deqp:glesVersion", str(getModuleGLESVersion(package.module).encode()))
return mustpassElem
-def genCTSPackage (package, cases, matchingByConfig, packageName, xmlFilename, runtimeHint):
+def genCTSPackage (package, cases, matchingByConfig, packageName, xmlFilename):
root = buildTestHierachy(cases)
testCaseMap = buildTestCaseMap(root)
if case in testCaseMap:
testCaseMap[case].configurations.append(config)
- packageXml = genCTSPackageXML(package, root, packageName, runtimeHint)
+ packageXml = genCTSPackageXML(package, root, packageName)
print " Writing CTS caselist: " + xmlFilename
writeFile(xmlFilename, prettifyXML(packageXml))
allMatchingCases = [c for c in allCasesInPkg if c in allMatchingSet] # To preserve ordering
splitFilters = package.splitFilters
- splitNoHints = [f.packageFilter for f in splitFilters.values()]
for splitName in splitFilters.keys():
- splitIncludeFilters = splitFilters[splitName]
- runtimeHint = "0"
- if isinstance(splitIncludeFilters, FilterHint):
- runtimeHint = splitIncludeFilters.hint
- splitIncludeFilters = splitIncludeFilters.packageFilter
+ splitIncludeFilters = splitFilters[splitName]
splitCases = applyInclude(allMatchingCases, splitIncludeFilters)
packageName = getCTSPackageName(package, splitName)
xmlFilename = os.path.join(CTS_DATA_DIR, mustpass.version, packageName + ".xml")
- # if package.runtimeHint is None, do not set any runtime hints
- genCTSPackage(package, splitCases, matchingByConfig, packageName, xmlFilename, runtimeHint if package.runtimeHint else None)
+ genCTSPackage(package, splitCases, matchingByConfig, packageName, xmlFilename)
# The cases not matching any of the includes
- combinedSplitFilters = reduce(lambda x,y: x+y, splitNoHints, [])
+ combinedSplitFilters = reduce(lambda x,y: x+y, splitFilters.values(), [])
restOfCases = applyExclude(allMatchingCases, combinedSplitFilters)
packageName = getCTSPackageName(package, None)
xmlFilename = os.path.join(CTS_DATA_DIR, mustpass.version, packageName + ".xml")
- genCTSPackage(package, restOfCases, matchingByConfig, packageName, xmlFilename, package.runtimeHint)
+ genCTSPackage(package, restOfCases, matchingByConfig, packageName, xmlFilename)
specXML = genSpecXML(mustpass)
specFilename = os.path.join(CTS_DATA_DIR, mustpass.version, "mustpass.xml")
rotation = "unspecified",
surfacetype = "window",
filters = MASTER_EGL_COMMON_FILTERS),
- ], runtimeHint = "0")
+ ])
MASTER_GLES2_COMMON_FILTERS = [
include("gles2-master.txt"),
rotation = "unspecified",
surfacetype = "window",
filters = MASTER_GLES2_COMMON_FILTERS),
- ], runtimeHint = "28")
+ ])
MASTER_GLES3_COMMON_FILTERS = [
include("gles3-master.txt"),
surfacetype = "window",
filters = MASTER_GLES3_COMMON_FILTERS + [include("gles3-pixelformat.txt"),
exclude("gles3-pixelformat-issues.txt")]),
- ], runtimeHint = "180")
+ ])
MASTER_GLES31_COMMON_FILTERS = [
include("gles31-master.txt"),
surfacetype = "window",
filters = MASTER_GLES31_COMMON_FILTERS + [include("gles31-pixelformat.txt")]),
],
- runtimeHint = "45",
- splitFilters = {"copy_image_compressed": FilterHint(["dEQP-GLES31.functional.copy_image.compressed.*"], "40"),
- "copy_image_non_compressed": FilterHint(["dEQP-GLES31.functional.copy_image.non_compressed.*"], "290"),
- "copy_image_mixed": FilterHint(["dEQP-GLES31.functional.copy_image.mixed.*"], "140"),
+ splitFilters = {"copy_image_compressed": ["dEQP-GLES31.functional.copy_image.compressed.*"],
+ "copy_image_non_compressed": ["dEQP-GLES31.functional.copy_image.non_compressed.*"],
+ "copy_image_mixed": ["dEQP-GLES31.functional.copy_image.mixed.*"],
}
)
projects / platform / upstream / VK-GL-CTS.git / commitdiff