Commit 7cf9e743 authored by Dylan Baker's avatar Dylan Baker

framework: update deqp mustpass list for text based mustpass

The current code has bit-rotted quite a bit, in late 2016 the format was
changed from XML based to txt based, but the code was never updated.

v2: - remove etree import which is now unused.
parent 2e9aed16
# Copyright 2014-2016 Intel Corporation
# Copyright 2014-2016,2018 Intel Corporation
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
......@@ -24,10 +24,6 @@ from __future__ import (
import abc
import os
import subprocess
try:
from lxml import etree as et
except ImportError:
from xml.etree import cElementTree as et
import six
from six.moves import range
......@@ -90,23 +86,13 @@ def make_profile(test_list, test_class):
return profile
def gen_mustpass_tests(mp_list):
def gen_mustpass_tests(mustpass):
"""Return a testlist from the mustpass list."""
root = et.parse(mp_list).getroot()
group = []
def gen(base):
for elem in base:
if elem.tag == 'Test':
yield '{}.{}'.format('.'.join(group), elem.get('name'))
else:
group.append(elem.get('name'))
for test in gen(elem):
yield test
del group[-1]
for test in gen(root):
yield test
with open(mustpass, 'r') as f:
for l in f:
l = l.strip()
if l:
yield l
def gen_caselist_txt(bin_, caselist, extra_args):
......
......@@ -60,7 +60,7 @@ testB
; Path to the test case list of CTS for deqp-gles2. You can also set this with
; the environment variable PIGLIT_DEQP2_MUSTPASS. Piglit will run the subset of
; dEQP-GLES2 tests if this option is set.
;mustpasslist=/home/knuth/src/deqp/android/cts/com.drawelements.deqp.gles2.xml
;mustpasslist=/home/knuth/src/deqp/android/cts/master/gles2-master.txt
[deqp-gles3]
;
......@@ -77,7 +77,7 @@ testB
; Path to the test case list of CTS for deqp-gles3. You can also set this with
; the environment variable PIGLIT_DEQP3_MUSTPASS. Piglit will run the subset of
; dEQP-GLES3 tests if this option is set.
;mustpasslist=/home/knuth/src/deqp/android/cts/com.drawelements.deqp.gles3.xml
;mustpasslist=/home/knuth/src/deqp/android/cts/master/gles3-master.txt
[deqp-gles31]
; Path to the deqp-gles31 executable
......@@ -92,7 +92,7 @@ testB
; Path to the test case list of CTS for deqp-gles31. You can also set this with
; the environment variable PIGLIT_DEQP31_MUSTPASS. Piglit will run the subset of
; dEQP-GLES31 tests if this option is set.
;mustpasslist=/home/knuth/src/deqp/android/cts/com.drawelements.deqp.gles31.xml
;mustpasslist=/home/knuth/src/deqp/android/cts/master/gles31-master.txt
[deqp-vk]
; Path to the deqp-vk executable
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment