[Piglit] [PATCH 13/15] piglit_test.py: replace pattern match skipping with argument skip

Dylan Baker baker.dylan.c at gmail.com
Fri Oct 3 17:57:54 PDT 2014


Prior to this patch any test that had glx- in the name of the test would
be skipped. This patch replaces that with a more extensible mechanism, a
keyword argument for each test that allows a required_platform to be
set. If the test marks that it requires a platform, and that is not the
selected platform then the test will skip.

Signed-off-by: Dylan Baker <dylanx.c.baker at intel.com>
---
 tests/all.py | 183 ++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 92 insertions(+), 91 deletions(-)

diff --git a/tests/all.py b/tests/all.py
index 158d66c..2f4689e 100644
--- a/tests/all.py
+++ b/tests/all.py
@@ -93,10 +93,11 @@ def add_depthstencil_render_miplevels_tests(group, test_types):
                     texture_size, test_type)
             add_concurrent_test(group, test_name)
 
-def add_msaa_visual_plain_tests(group, args):
+def add_msaa_visual_plain_tests(group, args, **kwargs):
     add_plain_test(group, args)
+    group[args] = PiglitGLTest(args, **kwargs)
     for num_samples in MSAA_SAMPLE_COUNTS:
-        group[args + ' samples=' + str(num_samples)] = PiglitGLTest(args + ' -samples=' + str(num_samples))
+        group[args + ' samples=' + str(num_samples)] = PiglitGLTest(args + ' -samples=' + str(num_samples), **kwargs)
 
 glean = {}
 glean['basic'] = GleanTest('basic')
@@ -515,116 +516,116 @@ def add_vpfpgeneric(group, name):
         run_concurrent=True)
 
 glx = {}
-add_msaa_visual_plain_tests(glx, 'glx-copy-sub-buffer')
-add_plain_test(glx, 'glx-destroycontext-1')
-add_plain_test(glx, 'glx-destroycontext-2')
-add_plain_test(glx, 'glx-dont-care-mask')
-add_plain_test(glx, 'glx-close-display')
-add_concurrent_test(glx, 'glx-fbconfig-sanity')
-add_concurrent_test(glx, 'glx-fbconfig-compliance')
-add_plain_test(glx, 'glx-fbo-binding')
-add_plain_test(glx, 'glx-multi-context-ib-1')
-add_plain_test(glx, 'glx-multithread')
-add_plain_test(glx, 'glx-multithread-texture')
-add_plain_test(glx, 'glx-multithread-makecurrent-1')
-add_plain_test(glx, 'glx-multithread-makecurrent-2')
-add_plain_test(glx, 'glx-multithread-makecurrent-3')
-add_plain_test(glx, 'glx-multithread-makecurrent-4')
-add_concurrent_test(glx, 'glx-multithread-shader-compile')
-add_plain_test(glx, 'glx-shader-sharing')
-add_plain_test(glx, 'glx-swap-exchange')
-glx['glx-swap-event_event'] = PiglitGLTest('glx-swap-event --event')
-glx['glx-swap-event_async'] = PiglitGLTest('glx-swap-event --async')
-glx['glx-swap-event_interval'] = PiglitGLTest('glx-swap-event --interval')
-add_plain_test(glx, 'glx-swap-pixmap')
-add_plain_test(glx, 'glx-swap-pixmap-bad')
-add_plain_test(glx, 'glx-swap-singlebuffer')
-add_plain_test(glx, 'glx-make-current')
-add_plain_test(glx, 'glx-make-glxdrawable-current')
-add_plain_test(glx, 'glx-buffer-age')
-glx['glx-buffer-age vblank_mode=0'] = PiglitGLTest('glx-buffer-age')
+add_msaa_visual_plain_tests(glx, 'glx-copy-sub-buffer', require_platforms=['glx'])
+glx['glx-destroycontext-1'] = PiglitGLTest('glx-destroycontext-1', require_platforms=['glx'])
+glx['glx-destroycontext-2'] = PiglitGLTest('glx-destroycontext-2', require_platforms=['glx'])
+glx['glx-dont-care-mask'] = PiglitGLTest('glx-dont-care-mask', require_platforms=['glx'])
+glx['glx-close-display'] = PiglitGLTest('glx-close-display', require_platforms=['glx'])
+glx['glx-fbconfig-sanity'] = PiglitGLTest('glx-fbconfig-sanity', run_concurrent=True, require_platforms=['glx'])
+glx['glx-fbconfig-compliance'] = PiglitGLTest('glx-fbconfig-compliance', run_concurrent=True, require_platforms=['glx'])
+glx['glx-fbo-binding'] = PiglitGLTest('glx-fbo-binding', require_platforms=['glx'])
+glx['glx-multi-context-ib-1'] = PiglitGLTest('glx-multi-context-ib-1', require_platforms=['glx'])
+glx['glx-multithread'] = PiglitGLTest('glx-multithread', require_platforms=['glx'])
+glx['glx-multithread-texture'] = PiglitGLTest('glx-multithread-texture', require_platforms=['glx'])
+glx['glx-multithread-makecurrent-1'] = PiglitGLTest('glx-multithread-makecurrent-1', require_platforms=['glx'])
+glx['glx-multithread-makecurrent-2'] = PiglitGLTest('glx-multithread-makecurrent-2', require_platforms=['glx'])
+glx['glx-multithread-makecurrent-3'] = PiglitGLTest('glx-multithread-makecurrent-3', require_platforms=['glx'])
+glx['glx-multithread-makecurrent-4'] = PiglitGLTest('glx-multithread-makecurrent-4', require_platforms=['glx'])
+glx['glx-multithread-shader-compile'] = PiglitGLTest('glx-multithread-shader-compile', run_concurrent=True, require_platforms=['glx'])
+glx['glx-shader-sharing'] = PiglitGLTest('glx-shader-sharing', require_platforms=['glx'])
+glx['glx-swap-exchange'] = PiglitGLTest('glx-swap-exchange', require_platforms=['glx'])
+glx['glx-swap-event_event'] = PiglitGLTest('glx-swap-event --event', require_platforms=['glx'])
+glx['glx-swap-event_async'] = PiglitGLTest('glx-swap-event --async', require_platforms=['glx'])
+glx['glx-swap-event_interval'] = PiglitGLTest('glx-swap-event --interval', require_platforms=['glx'])
+glx['glx-swap-pixmap'] = PiglitGLTest('glx-swap-pixmap', require_platforms=['glx'])
+glx['glx-swap-pixmap-bad'] = PiglitGLTest('glx-swap-pixmap-bad', require_platforms=['glx'])
+glx['glx-swap-singlebuffer'] = PiglitGLTest('glx-swap-singlebuffer', require_platforms=['glx'])
+glx['glx-make-current'] = PiglitGLTest('glx-make-current', require_platforms=['glx'])
+glx['glx-make-glxdrawable-current'] = PiglitGLTest('glx-make-glxdrawable-current', require_platforms=['glx'])
+glx['glx-buffer-age'] = PiglitGLTest('glx-buffer-age', require_platforms=['glx'])
+glx['glx-buffer-age vblank_mode=0'] = PiglitGLTest('glx-buffer-age', require_platforms=['glx'])
 glx['glx-buffer-age vblank_mode=0'].env['vblank_mode'] = '0'
-add_concurrent_test(glx, 'glx-pixmap-life')
-add_concurrent_test(glx, 'glx-pixmap13-life')
-add_concurrent_test(glx, 'glx-pixmap-multi')
-add_plain_test(glx, 'glx-tfp')
-add_plain_test(glx, 'glx-visuals-depth')
-add_concurrent_test(glx, 'glx-visuals-depth -pixmap')
-add_plain_test(glx, 'glx-visuals-stencil')
-add_concurrent_test(glx, 'glx-visuals-stencil -pixmap')
-add_concurrent_test(glx, 'glx-window-life')
-add_concurrent_test(glx, 'glx-pixmap-crosscheck')
-glx['glx-query-drawable-GLXWINDOW-GLX_WIDTH'] = PiglitGLTest('glx-query-drawable --attr=GLX_WIDTH --type=GLXWINDOW')
-glx['glx-query-drawable-GLXWINDOW-GLX_HEIGHT'] = PiglitGLTest('glx-query-drawable --attr=GLX_HEIGHT --type=GLXWINDOW')
-glx['glx-query-drawable-GLXPIXMAP-GLX_WIDTH'] = PiglitGLTest('glx-query-drawable --attr=GLX_WIDTH --type=GLXPIXMAP')
-glx['glx-query-drawable-GLXPIXMAP-GLX_HEIGHT'] = PiglitGLTest('glx-query-drawable --attr=GLX_HEIGHT --type=GLXPIXMAP')
-glx['glx-query-drawable-GLXPBUFFER-GLX_WIDTH'] = PiglitGLTest('glx-query-drawable --attr=GLX_WIDTH --type=GLXPBUFFER')
-glx['glx-query-drawable-GLXPBUFFER-GLX_HEIGHT'] = PiglitGLTest('glx-query-drawable --attr=GLX_HEIGHT --type=GLXPBUFFER')
-glx['glx-query-drawable-GLX_WIDTH'] = PiglitGLTest('glx-query-drawable --attr=GLX_WIDTH --type=WINDOW')
-glx['glx-query-drawable-GLX_HEIGHT'] = PiglitGLTest('glx-query-drawable --attr=GLX_HEIGHT --type=WINDOW')
-glx['glx-query-drawable-GLX_FBCONFIG_ID-WINDOW'] = PiglitGLTest('glx-query-drawable --attr=GLX_FBCONFIG_ID --type=WINDOW')
-glx['glx-query-drawable-GLX_FBCONFIG_ID-GLXWINDOW'] = PiglitGLTest('glx-query-drawable --attr=GLX_FBCONFIG_ID --type=GLXWINDOW')
-glx['glx-query-drawable-GLX_FBCONFIG_ID-GLXPIXMAP'] = PiglitGLTest('glx-query-drawable --attr=GLX_FBCONFIG_ID --type=GLXPIXMAP')
-glx['glx-query-drawable-GLX_FBCONFIG_ID-GLXPBUFFER'] = PiglitGLTest('glx-query-drawable --attr=GLX_FBCONFIG_ID --type=GLXPBUFFER')
-glx['glx-query-drawable-GLX_PRESERVED_CONTENTS'] = PiglitGLTest('glx-query-drawable --attr=GLX_FBCONFIG_ID --type=GLXPBUFFER')
-glx['glx-query-drawable-GLXBadDrawable'] = PiglitGLTest('glx-query-drawable --bad-drawable')
-glx['extension string sanity'] = PiglitGLTest('glx-string-sanity', run_concurrent=True)
+glx['glx-pixmap-life'] = PiglitGLTest('glx-pixmap-life', run_concurrent=True, require_platforms=['glx'])
+glx['glx-pixmap13-life'] = PiglitGLTest('glx-pixmap13-life', run_concurrent=True, require_platforms=['glx'])
+glx['glx-pixmap-multi'] = PiglitGLTest('glx-pixmap-multi', run_concurrent=True, require_platforms=['glx'])
+glx['glx-tfp'] = PiglitGLTest('glx-tfp', require_platforms=['glx'])
+glx['glx-visuals-depth'] = PiglitGLTest('glx-visuals-depth', require_platforms=['glx'])
+glx['glx-visuals-depth -pixmap'] = PiglitGLTest('glx-visuals-depth', run_concurrent=True, require_platforms=['glx'])
+glx['glx-visuals-stencil'] = PiglitGLTest('glx-visuals-stencil', require_platforms=['glx'])
+glx['glx-visuals-stencil -pixmap'] = PiglitGLTest('glx-visuals-stencil', run_concurrent=True, require_platforms=['glx'])
+glx['glx-window-life'] = PiglitGLTest('glx-window-life', run_concurrent=True, require_platforms=['glx'])
+glx['glx-pixmap-crosscheck'] = PiglitGLTest('glx-pixmap-crosscheck', run_concurrent=True, require_platforms=['glx'])
+glx['glx-query-drawable-GLXWINDOW-GLX_WIDTH'] = PiglitGLTest('glx-query-drawable --attr=GLX_WIDTH --type=GLXWINDOW', require_platforms=['glx'])
+glx['glx-query-drawable-GLXWINDOW-GLX_HEIGHT'] = PiglitGLTest('glx-query-drawable --attr=GLX_HEIGHT --type=GLXWINDOW', require_platforms=['glx'])
+glx['glx-query-drawable-GLXPIXMAP-GLX_WIDTH'] = PiglitGLTest('glx-query-drawable --attr=GLX_WIDTH --type=GLXPIXMAP', require_platforms=['glx'])
+glx['glx-query-drawable-GLXPIXMAP-GLX_HEIGHT'] = PiglitGLTest('glx-query-drawable --attr=GLX_HEIGHT --type=GLXPIXMAP', require_platforms=['glx'])
+glx['glx-query-drawable-GLXPBUFFER-GLX_WIDTH'] = PiglitGLTest('glx-query-drawable --attr=GLX_WIDTH --type=GLXPBUFFER', require_platforms=['glx'])
+glx['glx-query-drawable-GLXPBUFFER-GLX_HEIGHT'] = PiglitGLTest('glx-query-drawable --attr=GLX_HEIGHT --type=GLXPBUFFER', require_platforms=['glx'])
+glx['glx-query-drawable-GLX_WIDTH'] = PiglitGLTest('glx-query-drawable --attr=GLX_WIDTH --type=WINDOW', require_platforms=['glx'])
+glx['glx-query-drawable-GLX_HEIGHT'] = PiglitGLTest('glx-query-drawable --attr=GLX_HEIGHT --type=WINDOW', require_platforms=['glx'])
+glx['glx-query-drawable-GLX_FBCONFIG_ID-WINDOW'] = PiglitGLTest('glx-query-drawable --attr=GLX_FBCONFIG_ID --type=WINDOW', require_platforms=['glx'])
+glx['glx-query-drawable-GLX_FBCONFIG_ID-GLXWINDOW'] = PiglitGLTest('glx-query-drawable --attr=GLX_FBCONFIG_ID --type=GLXWINDOW', require_platforms=['glx'])
+glx['glx-query-drawable-GLX_FBCONFIG_ID-GLXPIXMAP'] = PiglitGLTest('glx-query-drawable --attr=GLX_FBCONFIG_ID --type=GLXPIXMAP', require_platforms=['glx'])
+glx['glx-query-drawable-GLX_FBCONFIG_ID-GLXPBUFFER'] = PiglitGLTest('glx-query-drawable --attr=GLX_FBCONFIG_ID --type=GLXPBUFFER', require_platforms=['glx'])
+glx['glx-query-drawable-GLX_PRESERVED_CONTENTS'] = PiglitGLTest('glx-query-drawable --attr=GLX_FBCONFIG_ID --type=GLXPBUFFER', require_platforms=['glx'])
+glx['glx-query-drawable-GLXBadDrawable'] = PiglitGLTest('glx-query-drawable --bad-drawable', require_platforms=['glx'])
+glx['extension string sanity'] = PiglitGLTest('glx-string-sanity', run_concurrent=True, require_platforms=['glx'])
 
 import_context = {};
 glx['GLX_EXT_import_context'] = import_context
-import_context['free context'] = PiglitGLTest(['glx-free-context'])
-import_context['get context ID'] = PiglitGLTest(['glx-get-context-id'])
-import_context['get current display'] = PiglitGLTest(['glx-get-current-display-ext'])
-import_context['imported context has same context ID'] = PiglitGLTest(['glx-import-context-has-same-context-id'])
-import_context['import context, multi process'] = PiglitGLTest(['glx-import-context-multi-process'])
-import_context['import context, single process'] = PiglitGLTest(['glx-import-context-single-process'])
-import_context['make current, multi process'] = PiglitGLTest(['glx-make-current-multi-process'])
-import_context['make current, single process'] = PiglitGLTest(['glx-make-current-single-process'])
-import_context['query context info'] = PiglitGLTest(['glx-query-context-info-ext'])
+import_context['free context'] = PiglitGLTest(['glx-free-context'], require_platforms=['glx'])
+import_context['get context ID'] = PiglitGLTest(['glx-get-context-id'], require_platforms=['glx'])
+import_context['get current display'] = PiglitGLTest(['glx-get-current-display-ext'], require_platforms=['glx'])
+import_context['imported context has same context ID'] = PiglitGLTest(['glx-import-context-has-same-context-id'], require_platforms=['glx'])
+import_context['import context, multi process'] = PiglitGLTest(['glx-import-context-multi-process'], require_platforms=['glx'])
+import_context['import context, single process'] = PiglitGLTest(['glx-import-context-single-process'], require_platforms=['glx'])
+import_context['make current, multi process'] = PiglitGLTest(['glx-make-current-multi-process'], require_platforms=['glx'])
+import_context['make current, single process'] = PiglitGLTest(['glx-make-current-single-process'], require_platforms=['glx'])
+import_context['query context info'] = PiglitGLTest(['glx-query-context-info-ext'], require_platforms=['glx'])
 
 create_context = {};
 glx['GLX_ARB_create_context'] = create_context
-create_context['current with no framebuffer'] = PiglitGLTest('glx-create-context-current-no-framebuffer', run_concurrent=True)
-create_context['default major version'] = PiglitGLTest('glx-create-context-default-major-version', run_concurrent=True)
-create_context['default minor version'] = PiglitGLTest('glx-create-context-default-minor-version', run_concurrent=True)
-create_context['invalid attribute'] = PiglitGLTest('glx-create-context-invalid-attribute', run_concurrent=True)
-create_context['invalid flag'] = PiglitGLTest('glx-create-context-invalid-flag', run_concurrent=True)
-create_context['forward-compatible flag with pre-3.0'] = PiglitGLTest('glx-create-context-invalid-flag-forward-compatible', run_concurrent=True)
-create_context['invalid OpenGL version'] = PiglitGLTest('glx-create-context-invalid-gl-version', run_concurrent=True)
-create_context['invalid render type'] = PiglitGLTest('glx-create-context-invalid-render-type', run_concurrent=True)
-create_context['color-index render type with 3.0'] = PiglitGLTest('glx-create-context-invalid-render-type-color-index', run_concurrent=True)
-create_context['empty attribute list'] = PiglitGLTest('glx-create-context-valid-attribute-empty', run_concurrent=True)
-create_context['NULL attribute list'] = PiglitGLTest('glx-create-context-valid-attribute-null', run_concurrent=True)
-create_context['forward-compatible flag with 3.0'] = PiglitGLTest('glx-create-context-valid-flag-forward-compatible', run_concurrent=True)
+create_context['current with no framebuffer'] = PiglitGLTest('glx-create-context-current-no-framebuffer', run_concurrent=True, require_platforms=['glx'])
+create_context['default major version'] = PiglitGLTest('glx-create-context-default-major-version', run_concurrent=True, require_platforms=['glx'])
+create_context['default minor version'] = PiglitGLTest('glx-create-context-default-minor-version', run_concurrent=True, require_platforms=['glx'])
+create_context['invalid attribute'] = PiglitGLTest('glx-create-context-invalid-attribute', run_concurrent=True, require_platforms=['glx'])
+create_context['invalid flag'] = PiglitGLTest('glx-create-context-invalid-flag', run_concurrent=True, require_platforms=['glx'])
+create_context['forward-compatible flag with pre-3.0'] = PiglitGLTest('glx-create-context-invalid-flag-forward-compatible', run_concurrent=True, require_platforms=['glx'])
+create_context['invalid OpenGL version'] = PiglitGLTest('glx-create-context-invalid-gl-version', run_concurrent=True, require_platforms=['glx'])
+create_context['invalid render type'] = PiglitGLTest('glx-create-context-invalid-render-type', run_concurrent=True, require_platforms=['glx'])
+create_context['color-index render type with 3.0'] = PiglitGLTest('glx-create-context-invalid-render-type-color-index', run_concurrent=True, require_platforms=['glx'])
+create_context['empty attribute list'] = PiglitGLTest('glx-create-context-valid-attribute-empty', run_concurrent=True, require_platforms=['glx'])
+create_context['NULL attribute list'] = PiglitGLTest('glx-create-context-valid-attribute-null', run_concurrent=True, require_platforms=['glx'])
+create_context['forward-compatible flag with 3.0'] = PiglitGLTest('glx-create-context-valid-flag-forward-compatible', run_concurrent=True, require_platforms=['glx'])
 
 create_context_profile = {};
 glx['GLX_ARB_create_context_profile'] = create_context_profile
-create_context_profile['3.2 core profile required'] = PiglitGLTest('glx-create-context-core-profile', run_concurrent=True)
-create_context_profile['invalid profile'] = PiglitGLTest('glx-create-context-invalid-profile', run_concurrent=True)
-create_context_profile['pre-GL3.2 profile'] = PiglitGLTest('glx-create-context-pre-GL32-profile', run_concurrent=True)
+create_context_profile['3.2 core profile required'] = PiglitGLTest('glx-create-context-core-profile', run_concurrent=True, require_platforms=['glx'])
+create_context_profile['invalid profile'] = PiglitGLTest('glx-create-context-invalid-profile', run_concurrent=True, require_platforms=['glx'])
+create_context_profile['pre-GL3.2 profile'] = PiglitGLTest('glx-create-context-pre-GL32-profile', run_concurrent=True, require_platforms=['glx'])
 
 create_context_robustness = {};
 glx['GLX_ARB_create_context_robustness'] = create_context_robustness
-create_context_robustness['invalid reset notification strategy'] = PiglitGLTest('glx-create-context-invalid-reset-strategy', run_concurrent=True)
-create_context_robustness['require GL_ARB_robustness'] = PiglitGLTest('glx-create-context-require-robustness', run_concurrent=True)
+create_context_robustness['invalid reset notification strategy'] = PiglitGLTest('glx-create-context-invalid-reset-strategy', run_concurrent=True, require_platforms=['glx'])
+create_context_robustness['require GL_ARB_robustness'] = PiglitGLTest('glx-create-context-require-robustness', run_concurrent=True, require_platforms=['glx'])
 
 create_context_es2_profile = {};
 glx['GLX_EXT_create_context_es2_profile'] = create_context_es2_profile
-create_context_es2_profile['indirect rendering ES2 profile'] = PiglitGLTest('glx-create-context-indirect-es2-profile', run_concurrent=True)
-create_context_es2_profile['invalid OpenGL ES version'] = PiglitGLTest('glx-create-context-invalid-es-version', run_concurrent=True)
+create_context_es2_profile['indirect rendering ES2 profile'] = PiglitGLTest('glx-create-context-indirect-es2-profile', run_concurrent=True, require_platforms=['glx'])
+create_context_es2_profile['invalid OpenGL ES version'] = PiglitGLTest('glx-create-context-invalid-es-version', run_concurrent=True, require_platforms=['glx'])
 
 oml_sync_control = {};
 glx['GLX_OML_sync_control'] = oml_sync_control
-oml_sync_control['glXGetMscRateOML'] = PiglitGLTest('glx-oml-sync-control-getmscrate', run_concurrent=True)
-oml_sync_control['swapbuffersmsc-divisor-zero'] = PiglitGLTest('glx-oml-sync-control-swapbuffersmsc-divisor-zero', run_concurrent=True)
-oml_sync_control['swapbuffersmsc-return'] = PiglitGLTest('glx-oml-sync-control-swapbuffersmsc-return', run_concurrent=True)
-oml_sync_control['swapbuffersmsc-return swap_interval 0'] = PiglitGLTest('glx-oml-sync-control-swapbuffersmsc-return 0', run_concurrent=True)
-oml_sync_control['swapbuffersmsc-return swap_interval 1'] = PiglitGLTest('glx-oml-sync-control-swapbuffersmsc-return 1', run_concurrent=True)
-oml_sync_control['waitformsc'] = PiglitGLTest('glx-oml-sync-control-waitformsc', run_concurrent=True)
+oml_sync_control['glXGetMscRateOML'] = PiglitGLTest('glx-oml-sync-control-getmscrate', run_concurrent=True, require_platforms=['glx'])
+oml_sync_control['swapbuffersmsc-divisor-zero'] = PiglitGLTest('glx-oml-sync-control-swapbuffersmsc-divisor-zero', run_concurrent=True, require_platforms=['glx'])
+oml_sync_control['swapbuffersmsc-return'] = PiglitGLTest('glx-oml-sync-control-swapbuffersmsc-return', run_concurrent=True, require_platforms=['glx'])
+oml_sync_control['swapbuffersmsc-return swap_interval 0'] = PiglitGLTest('glx-oml-sync-control-swapbuffersmsc-return 0', run_concurrent=True, require_platforms=['glx'])
+oml_sync_control['swapbuffersmsc-return swap_interval 1'] = PiglitGLTest('glx-oml-sync-control-swapbuffersmsc-return 1', run_concurrent=True, require_platforms=['glx'])
+oml_sync_control['waitformsc'] = PiglitGLTest('glx-oml-sync-control-waitformsc', run_concurrent=True, require_platforms=['glx'])
 
 mesa_query_renderer = {}
 glx['GLX_MESA_query_renderer'] = mesa_query_renderer
-mesa_query_renderer['coverage'] = PiglitGLTest('glx-query-renderer-coverage', run_concurrent=True)
+mesa_query_renderer['coverage'] = PiglitGLTest('glx-query-renderer-coverage', run_concurrent=True, require_platforms=['glx'])
 
 def texwrap_test(args):
     return PiglitGLTest('texwrap ' + ' '.join(args), run_concurrent=True)
@@ -4155,7 +4156,7 @@ egl14['eglTerminate then unbind context'] = PiglitGLTest('egl-terminate-then-unb
 
 egl_nok_swap_region = {}
 spec['EGL_NOK_swap_region'] = egl_nok_swap_region
-egl_nok_swap_region['basic']  = PiglitGLTest('egl-nok-swap-region')
+egl_nok_swap_region['basic'] = PiglitGLTest('egl-nok-swap-region')
 
 egl_nok_texture_from_pixmap = {}
 spec['EGL_NOK_texture_from_pixmap'] = egl_nok_texture_from_pixmap
-- 
2.1.2



More information about the Piglit mailing list