diff options
author | Dylan Baker <dylan@pnwbakers.com> | 2018-06-20 13:32:38 -0700 |
---|---|---|
committer | Dylan Baker <dylan@pnwbakers.com> | 2018-09-20 06:37:10 -0700 |
commit | f1ae68985a1707d791fc6f8306bc55fe9d940d84 (patch) | |
tree | 1fdd1b2b3e6b82fb207da3463742645cf92a8701 | |
parent | 1f9234b5329cd5adafc725fc18d82d5ed9a440f5 (diff) |
serializer: serialize new fast-skip attributes
v2: - Serialize no-process-isolation shader runner tests
-rw-r--r-- | tests/serializer.py | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/tests/serializer.py b/tests/serializer.py index 32beb428c..4c3daa07b 100644 --- a/tests/serializer.py +++ b/tests/serializer.py @@ -54,21 +54,22 @@ def parser(): def _serialize_skips(test, elem): - if getattr(test, 'gl_required', None): - et.SubElement(elem, 'option', name='gl_required', - value=repr(test.gl_required)) - if getattr(test, 'gl_version', None): - et.SubElement(elem, 'option', name='gl_version', - value=repr(test.gl_version)) - if getattr(test, 'gles_version', None): - et.SubElement(elem, 'option', name='gles_version', - value=repr(test.gles_version)) - if getattr(test, 'glsl_version', None): - et.SubElement(elem, 'option', name='glsl_version', - value=repr(test.glsl_version)) - if getattr(test, 'glsl_es_version', None): - et.SubElement(elem, 'option', name='glsl_es_version', - value=repr(test.glsl_es_version)) + elems = [ + ('require_shader', 'shader_version'), + ('require_api', 'api'), + ('require_version', 'api_version'), + ('require_extensions', 'extensions'), + ] + for e, f in elems: + value = getattr(test, e, None) + + # For most tests (except MultiShader, we use the test value 'e', but + # for MultiShader what's exposed is a FastSkip object, and the methods + # are 'f' + if not value: + value = getattr(test, f, None) + if value: + et.SubElement(elem, 'option', name=f, value=repr(value)) def serializer(name, profile, outfile): |