This fixes the swapbuffersmsc-return (with default swap_interval) test, by not passing it arguments that it doesn't understand.
These tests all require a GLXWindow, so they can't be used in -fbo mode (and they didn't understand that option anyway). And though they need the behavior of -auto, none of them parse that option. These tests have to deal with it in other ways, as illustrated by commit 1d618f2abbc9f9665505b7082690eebc3bc01a72. Finally, I think it's a bad idea to run these tests concurrently with anything else, as interference from other clients could change the result of attempting to sync to vertical retrace, which is a screen-global resource. Signed-off-by: Jamey Sharp <[email protected]> Signed-off-by: Theo Hill <[email protected]> --- tests/all.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/all.py b/tests/all.py index 49c801a..ccfa626 100644 --- a/tests/all.py +++ b/tests/all.py @@ -779,12 +779,12 @@ create_context_es2_profile['invalid OpenGL ES version'] = concurrent_test('glx-c oml_sync_control = {}; glx['GLX_OML_sync_control'] = oml_sync_control -oml_sync_control['glXGetMscRateOML'] = concurrent_test('glx-oml-sync-control-getmscrate') -oml_sync_control['swapbuffersmsc-divisor-zero'] = concurrent_test('glx-oml-sync-control-swapbuffersmsc-divisor-zero') -oml_sync_control['swapbuffersmsc-return'] = concurrent_test('glx-oml-sync-control-swapbuffersmsc-return') -oml_sync_control['swapbuffersmsc-return swap_interval 0'] = concurrent_test('glx-oml-sync-control-swapbuffersmsc-return 0') -oml_sync_control['swapbuffersmsc-return swap_interval 1'] = concurrent_test('glx-oml-sync-control-swapbuffersmsc-return 1') -oml_sync_control['waitformsc'] = concurrent_test('glx-oml-sync-control-waitformsc') +oml_sync_control['glXGetMscRateOML'] = PiglitTest(['glx-oml-sync-control-getmscrate']) +oml_sync_control['swapbuffersmsc-divisor-zero'] = PiglitTest(['glx-oml-sync-control-swapbuffersmsc-divisor-zero']) +oml_sync_control['swapbuffersmsc-return'] = PiglitTest(['glx-oml-sync-control-swapbuffersmsc-return']) +oml_sync_control['swapbuffersmsc-return swap_interval 0'] = PiglitTest(['glx-oml-sync-control-swapbuffersmsc-return', '0']) +oml_sync_control['swapbuffersmsc-return swap_interval 1'] = PiglitTest(['glx-oml-sync-control-swapbuffersmsc-return', '1']) +oml_sync_control['waitformsc'] = PiglitTest(['glx-oml-sync-control-waitformsc']) mesa_query_renderer = {} glx['GLX_MESA_query_renderer'] = mesa_query_renderer -- 1.8.5.3 _______________________________________________ Piglit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/piglit
