[Piglit] [PATCH] nv_conditional_render: switch to common include layout for tests

[Tobias Klausmann]

run the tests without -auto as well

Signed-off-by: Tobias Klausmann <tobias.johannes.klausmann at mni.thm.de>
---
 tests/all.py | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/tests/all.py b/tests/all.py
index fba8c23..661a94d 100644
--- a/tests/all.py
+++ b/tests/all.py
@@ -3365,18 +3365,18 @@ add_plain_test(nv_texture_barrier, 'blending-in-shader')
 
 nv_conditional_render = {}
 spec['NV_conditional_render'] = nv_conditional_render
-nv_conditional_render['begin-while-active'] = PiglitGLTest('nv_conditional_render-begin-while-active', run_concurrent=True)
-nv_conditional_render['begin-zero'] = PiglitGLTest('nv_conditional_render-begin-zero', run_concurrent=True)
-nv_conditional_render['bitmap'] = PiglitGLTest(['nv_conditional_render-bitmap', '-auto'])
-nv_conditional_render['blitframebuffer'] = PiglitGLTest(['nv_conditional_render-blitframebuffer', '-auto'])
-nv_conditional_render['clear'] = PiglitGLTest(['nv_conditional_render-clear', '-auto'])
-nv_conditional_render['copypixels'] = PiglitGLTest(['nv_conditional_render-copypixels', '-auto'])
-nv_conditional_render['copyteximage'] = PiglitGLTest(['nv_conditional_render-copyteximage', '-auto'])
-nv_conditional_render['copytexsubimage'] = PiglitGLTest(['nv_conditional_render-copytexsubimage', '-auto'])
-nv_conditional_render['dlist'] = PiglitGLTest(['nv_conditional_render-dlist', '-auto'])
-nv_conditional_render['drawpixels'] = PiglitGLTest(['nv_conditional_render-drawpixels', '-auto'])
-nv_conditional_render['generatemipmap'] = PiglitGLTest(['nv_conditional_render-generatemipmap', '-auto'])
-nv_conditional_render['vertex_array'] = PiglitGLTest(['nv_conditional_render-vertex_array', '-auto'])
+add_concurrent_test(nv_conditional_render, 'nv_conditional_render-begin-while-active')
+add_concurrent_test(nv_conditional_render, 'nv_conditional_render-begin-zero')
+nv_conditional_render['bitmap'] = PiglitGLTest('nv_conditional_render-bitmap')
+nv_conditional_render['blitframebuffer'] = PiglitGLTest('nv_conditional_render-blitframebuffer')
+nv_conditional_render['clear'] = PiglitGLTest('nv_conditional_render-clear')
+nv_conditional_render['copypixels'] = PiglitGLTest('nv_conditional_render-copypixels')
+nv_conditional_render['copyteximage'] = PiglitGLTest('nv_conditional_render-copyteximage')
+nv_conditional_render['copytexsubimage'] = PiglitGLTest('nv_conditional_render-copytexsubimage')
+nv_conditional_render['dlist'] = PiglitGLTest('nv_conditional_render-dlist')
+nv_conditional_render['drawpixels'] = PiglitGLTest('nv_conditional_render-drawpixels')
+nv_conditional_render['generatemipmap'] = PiglitGLTest('nv_conditional_render-generatemipmap')
+nv_conditional_render['vertex_array'] = PiglitGLTest('nv_conditional_render-vertex_array')
 
 oes_matrix_get = {}
 spec['OES_matrix_get'] = oes_matrix_get
-- 
2.1.3