[Piglit] [PATCH 1/3] all.tests: move all tests from "general" into spec
Ian Romanick
idr at freedesktop.org
Tue Oct 23 10:37:40 PDT 2012
On 10/23/2012 06:25 AM, Marek Olšák wrote:
> ---
> tests/all.tests | 265 +++++++++++++++++++++++++++++++------------------------
> 1 files changed, 149 insertions(+), 116 deletions(-)
>
> diff --git a/tests/all.tests b/tests/all.tests
> index 341d021..a260073 100644
> --- a/tests/all.tests
> +++ b/tests/all.tests
> @@ -180,119 +180,6 @@ def add_fbo_rg(group, format):
> name = "fbo-rg-" + format
> group[name] = PlainExecTest(['fbo-rg', '-auto', format])
>
> -general = Group()
> -add_plain_test(general, 'array-stride')
> -add_plain_test(general, 'bgra-sec-color-pointer')
> -add_plain_test(general, 'bgra-vert-attrib-pointer')
> -add_plain_test(general, 'blendminmax')
> -add_plain_test(general, 'blendsquare')
> -add_plain_test(general, 'clear-varray-2.0')
> -add_plain_test(general, 'copy-pixels')
> -add_plain_test(general, 'copypixels-draw-sync')
> -add_plain_test(general, 'copypixels-sync')
> -add_plain_test(general, 'depthrange-clear')
> -add_plain_test(general, 'depth_clamp')
> -add_plain_test(general, 'depth-clamp-range')
> -add_plain_test(general, 'depthfunc')
> -add_plain_test(general, 'dlist-clear')
> -add_plain_test(general, 'dlist-color-material')
> -add_plain_test(general, 'dlist-fdo3129-01')
> -add_plain_test(general, 'dlist-fdo3129-02')
> -add_plain_test(general, 'dlist-fdo31590')
> -add_plain_test(general, 'draw-arrays-colormaterial')
> -add_plain_test(general, 'draw-batch')
> -add_plain_test(general, 'draw-copypixels-sync')
> -add_plain_test(general, 'draw-elements')
> -general['draw-elements-user'] = PlainExecTest(['draw-elements', '-auto', 'user'])
> -add_plain_test(general, 'draw-elements-vs-inputs')
> -add_plain_test(general, 'draw-instanced')
> -add_plain_test(general, 'draw-instanced-divisor')
> -add_concurrent_test(general, 'draw-pixel-with-texture')
> -add_plain_test(general, 'draw-pixels')
> -add_plain_test(general, 'draw-vertices')
> -general['draw-vertices-user'] = PlainExecTest(['draw-vertices', '-auto', 'user'])
> -add_plain_test(general, 'draw-vertices-half-float')
> -general['draw-vertices-half-float-user'] = PlainExecTest(['draw-vertices-half-float', '-auto', 'user'])
> -add_concurrent_test(general, 'drawpix-z')
> -add_plain_test(general, 'early-z')
> -add_plain_test(general, 'fog-modes')
> -add_plain_test(general, 'fragment-center')
> -add_plain_test(general, 'framebuffer-srgb')
> -add_plain_test(general, 'geterror-invalid-enum')
> -add_plain_test(general, 'geterror-inside-begin')
> -add_plain_test(general, 'gl30basic')
> -add_plain_test(general, 'hiz')
> -add_plain_test(general, 'infinite-spot-light')
> -add_plain_test(general, 'isbufferobj')
> -add_plain_test(general, 'line-aa-width')
> -add_plain_test(general, 'linestipple')
> -add_plain_test(general, 'longprim')
> -add_plain_test(general, 'object_purgeable-api-pbo')
> -add_plain_test(general, 'object_purgeable-api-texture')
> -add_plain_test(general, 'object_purgeable-api-vbo')
> -add_plain_test(general, 'occlusion_query')
> -add_plain_test(general, 'occlusion-query-discard')
> -add_plain_test(general, 'pbo-drawpixels')
> -add_plain_test(general, 'pbo-read-argb8888')
> -add_plain_test(general, 'pbo-readpixels-small')
> -add_plain_test(general, 'pbo-teximage')
> -add_plain_test(general, 'pbo-teximage-tiling')
> -add_plain_test(general, 'pbo-teximage-tiling-2')
> -add_plain_test(general, 'point-line-no-cull')
> -add_plain_test(general, 'polygon-mode')
> -add_plain_test(general, 'pos-array')
> -add_single_param_test_set(
> - general,
> - 'primitive-restart',
> - "DISABLE_VBO",
> - "VBO_VERTEX_ONLY", "VBO_INDEX_ONLY",
> - "VBO_SEPARATE_VERTEX_AND_INDEX", "VBO_COMBINED_VERTEX_AND_INDEX"
> - )
> -add_plain_test(general, 'provoking-vertex')
> -add_plain_test(general, 'oes-read-format')
> -add_concurrent_test(general, 'quad-invariance')
> -add_plain_test(general, 'read-front')
> -add_concurrent_test(general, 'readpix-z')
> -add_plain_test(general, 'roundmode-getintegerv')
> -add_plain_test(general, 'roundmode-pixelstore')
> -add_plain_test(general, 'scissor-bitmap')
> -add_plain_test(general, 'scissor-clear')
> -add_plain_test(general, 'scissor-copypixels')
> -add_plain_test(general, 'scissor-depth-clear')
> -add_plain_test(general, 'scissor-many')
> -add_plain_test(general, 'scissor-offscreen')
> -add_plain_test(general, 'scissor-stencil-clear')
> -general['GL_SELECT - no test function'] = PlainExecTest(['select', 'general'])
> -general['GL_SELECT - depth-test enabled'] = PlainExecTest(['select', 'depth'])
> -general['GL_SELECT - stencil-test enabled'] = PlainExecTest(['select', 'stencil'])
> -general['GL_SELECT - alpha-test enabled'] = PlainExecTest(['select', 'alpha'])
> -general['GL_SELECT - scissor-test enabled'] = PlainExecTest(['select', 'scissor'])
> -add_plain_test(general, 'stencil-drawpixels')
> -add_plain_test(general, 'stencil-twoside')
> -add_plain_test(general, 'stencil-wrap')
> -add_plain_test(general, 'sync_api')
> -add_plain_test(general, 'texgen')
> -add_plain_test(general, 'texunits')
> -add_plain_test(general, 'timer_query')
> -add_plain_test(general, 'triangle-rasterization')
> -general['triangle-rasterization-fbo'] = PlainExecTest(['triangle-rasterization', '-auto', '-fbo'])
> -add_plain_test(general, 'triangle-rasterization-overdraw')
> -add_plain_test(general, 'two-sided-lighting')
> -add_plain_test(general, 'two-sided-lighting-separate-specular')
> -add_plain_test(general, 'user-clip')
> -add_plain_test(general, 'vs-point_size-zero')
> -add_plain_test(general, 'vao-01')
> -add_plain_test(general, 'vao-02')
> -add_concurrent_test(general, 'vao-element-array-buffer')
> -add_plain_test(general, 'varray-disabled')
> -add_plain_test(general, 'vbo-bufferdata')
> -add_plain_test(general, 'vbo-map-remap')
> -add_plain_test(general, 'vbo-subdata-sync')
> -add_plain_test(general, 'vbo-subdata-zero')
> -add_plain_test(general, 'windowoverlap')
> -add_plain_test(general, 'clear-accum')
> -add_fbo_depthstencil_tests(general, 'default_fb')
> -
> security = Group()
> add_plain_test(security, 'initialized-texmemory')
> add_plain_test(security, 'initialized-fbo')
> @@ -677,6 +564,58 @@ add_plain_test(gl11, 'fdo23670-drawpix_stencil')
> add_plain_test(gl11, 'r300-readcache')
> add_plain_test(gl11, 'tri-tex-crash')
> add_plain_test(gl11, 'vbo-buffer-unmap')
> +add_plain_test(gl11, 'array-stride')
> +add_plain_test(gl11, 'clear-accum')
> +add_plain_test(gl11, 'copypixels-draw-sync')
> +add_plain_test(gl11, 'copypixels-sync')
> +add_plain_test(gl11, 'depthfunc')
> +add_plain_test(gl11, 'depthrange-clear')
> +add_plain_test(gl11, 'dlist-clear')
> +add_plain_test(gl11, 'dlist-color-material')
> +add_plain_test(gl11, 'dlist-fdo3129-01')
> +add_plain_test(gl11, 'dlist-fdo3129-02')
> +add_plain_test(gl11, 'dlist-fdo31590')
> +add_plain_test(gl11, 'draw-arrays-colormaterial')
> +add_plain_test(gl11, 'draw-copypixels-sync')
> +add_concurrent_test(gl11, 'draw-pixel-with-texture')
> +add_plain_test(gl11, 'draw-pixels')
> +add_concurrent_test(gl11, 'drawpix-z')
> +add_plain_test(gl11, 'fog-modes')
> +add_plain_test(gl11, 'fragment-center')
> +add_fbo_depthstencil_tests(gl11, 'default_fb')
> +add_plain_test(gl11, 'geterror-invalid-enum')
> +add_plain_test(gl11, 'geterror-inside-begin')
> +add_plain_test(gl11, 'hiz')
> +add_plain_test(gl11, 'infinite-spot-light')
> +add_plain_test(gl11, 'line-aa-width')
> +add_plain_test(gl11, 'linestipple')
> +add_plain_test(gl11, 'longprim')
> +add_plain_test(gl11, 'point-line-no-cull')
> +add_plain_test(gl11, 'polygon-mode')
> +add_concurrent_test(gl11, 'quad-invariance')
> +add_plain_test(gl11, 'read-front')
> +add_concurrent_test(gl11, 'readpix-z')
> +add_plain_test(gl11, 'roundmode-getintegerv')
> +add_plain_test(gl11, 'roundmode-pixelstore')
> +add_plain_test(gl11, 'scissor-bitmap')
> +add_plain_test(gl11, 'scissor-clear')
> +add_plain_test(gl11, 'scissor-copypixels')
> +add_plain_test(gl11, 'scissor-depth-clear')
> +add_plain_test(gl11, 'scissor-many')
> +add_plain_test(gl11, 'scissor-offscreen')
> +add_plain_test(gl11, 'scissor-stencil-clear')
> +gl11['GL_SELECT - no test function'] = PlainExecTest(['select', 'gl11'])
> +gl11['GL_SELECT - depth-test enabled'] = PlainExecTest(['select', 'depth'])
> +gl11['GL_SELECT - stencil-test enabled'] = PlainExecTest(['select', 'stencil'])
> +gl11['GL_SELECT - alpha-test enabled'] = PlainExecTest(['select', 'alpha'])
> +gl11['GL_SELECT - scissor-test enabled'] = PlainExecTest(['select', 'scissor'])
> +add_plain_test(gl11, 'stencil-drawpixels')
> +add_plain_test(gl11, 'texgen')
> +add_plain_test(gl11, 'two-sided-lighting')
> +add_plain_test(gl11, 'two-sided-lighting-separate-specular')
Separate specular is OpenGL 1.2. The test doesn't check the version
because the Linux ABI requires 1.2.
> +add_plain_test(gl11, 'user-clip')
> +add_plain_test(gl11, 'varray-disabled')
> +add_plain_test(gl11, 'windowoverlap')
>
> gl10 = Group()
> spec['!OpenGL 1.0'] = gl10
> @@ -688,11 +627,32 @@ spec['!OpenGL 1.2'] = gl12
> add_texwrap_target_tests(gl12, '3D')
> gl12['copyteximage 3D'] = PlainExecTest(['copyteximage', '-auto', '3D'])
> add_plain_test(gl12, 'crash-texparameter-before-teximage')
> +add_plain_test(gl12, 'draw-elements-vs-inputs')
> +
> +gl13 = Group()
> +spec['!OpenGL 1.3'] = gl13
> +add_plain_test(gl13, 'texunits')
>
> gl14 = Group()
> spec['!OpenGL 1.4'] = gl14
> add_plain_test(gl14, 'fdo25614-genmipmap')
> add_plain_test(gl14, 'tex1d-2dborder')
> +add_plain_test(gl14, 'blendminmax')
> +add_plain_test(gl14, 'blendsquare')
> +add_plain_test(gl14, 'copy-pixels')
> +add_plain_test(gl14, 'draw-batch')
> +add_plain_test(gl14, 'stencil-wrap')
> +add_plain_test(gl14, 'triangle-rasterization')
> +gl14['triangle-rasterization-fbo'] = PlainExecTest(['triangle-rasterization', '-auto', '-fbo'])
> +add_plain_test(gl14, 'triangle-rasterization-overdraw')
> +
> +gl15 = Group()
> +spec['!OpenGL 1.5'] = gl15
> +add_plain_test(gl15, 'draw-elements')
> +gl15['draw-elements-user'] = PlainExecTest(['draw-elements', '-auto', 'user'])
> +add_plain_test(gl15, 'draw-vertices')
> +gl15['draw-vertices-user'] = PlainExecTest(['draw-vertices', '-auto', 'user'])
> +add_plain_test(gl15, 'isbufferobj')
>
> gl20 = Group()
> spec['!OpenGL 2.0'] = gl20
> @@ -731,6 +691,11 @@ add_concurrent_test(gl20, 'vertex-program-two-side front2 back2')
> add_concurrent_test(gl20, 'vertex-program-two-side front2')
> add_concurrent_test(gl20, 'vertex-program-two-side back2')
> add_concurrent_test(gl20, 'vertex-program-two-side')
> +add_plain_test(gl20, 'clear-varray-2.0')
> +add_plain_test(gl20, 'early-z')
> +add_plain_test(gl20, 'occlusion-query-discard')
> +add_plain_test(gl20, 'stencil-twoside')
> +add_plain_test(gl20, 'vs-point_size-zero')
>
> gl21 = Group()
> spec['!OpenGL 2.1'] = gl21
> @@ -755,6 +720,7 @@ add_concurrent_test(gl30, 'gl-3.0-required-sized-texture-formats')
> add_concurrent_test(gl30, 'gl-3.0-required-renderbuffer-attachment-formats')
> add_concurrent_test(gl30, 'gl-3.0-required-texture-attachment-formats')
> add_concurrent_test(gl30, 'gl-3.0-texture-integer')
> +add_plain_test(gl30, 'gl30basic')
>
> gl31 = Group()
> spec['!OpenGL 3.1'] = gl31
> @@ -911,8 +877,11 @@ import_glsl_parser_tests(spec['ARB_shader_stencil_export'],
> [''])
>
> # Group ARB_sync
> -spec['ARB_sync/repeat-wait'] = concurrent_test('arb_sync-repeat-wait')
> -spec['ARB_sync/timeout-zero'] = concurrent_test('arb_sync-timeout-zero')
> +arb_sync = Group()
> +spec['ARB_sync'] = arb_sync
> +arb_sync['repeat-wait'] = concurrent_test('arb_sync-repeat-wait')
> +arb_sync['timeout-zero'] = concurrent_test('arb_sync-timeout-zero')
> +add_plain_test(arb_sync, 'sync_api')
>
> # Group ARB_ES2_compatibility
> arb_es2_compatibility = Group()
> @@ -930,6 +899,11 @@ arb_es2_compatibility['FBO blit from missing attachment (ES2 completeness rules)
> add_fbo_formats_tests('spec/ARB_ES2_compatibility', 'GL_ARB_ES2_compatibility')
> add_texwrap_format_tests(arb_es2_compatibility, 'GL_ARB_ES2_compatibility')
>
> +arb_depth_clamp = Group()
> +spec['ARB_depth_clamp'] = arb_depth_clamp
> +add_plain_test(arb_depth_clamp, 'depth_clamp')
> +add_plain_test(arb_depth_clamp, 'depth-clamp-range')
> +
> # Group ARB_draw_elements_base_vertex
> arb_draw_elements_base_vertex = Group()
> spec['ARB_draw_elements_base_vertex'] = arb_draw_elements_base_vertex
> @@ -956,6 +930,8 @@ arb_draw_instanced['dlist'] = concurrent_test('arb_draw_instanced-dlist')
> arb_draw_instanced['elements'] = concurrent_test('arb_draw_instanced-elements')
> arb_draw_instanced['negative-arrays-first-negative'] = concurrent_test('arb_draw_instanced-negative-arrays-first-negative')
> arb_draw_instanced['negative-elements-type'] = concurrent_test('arb_draw_instanced-negative-elements-type')
> +add_plain_test(arb_draw_instanced, 'draw-instanced')
> +add_plain_test(arb_draw_instanced, 'draw-instanced-divisor')
>
> # Group ARB_fragment_program
> arb_fragment_program = Group()
> @@ -1052,7 +1028,11 @@ for backing_type in ('texture', 'renderbuffer'):
> blit_type, framebuffer_srgb_setting])
> arb_framebuffer_srgb[test_name] = concurrent_test(
> 'arb_framebuffer_srgb-' + test_name)
> +add_plain_test(arb_framebuffer_srgb, 'framebuffer-srgb')
>
> +arb_occlusion_query = Group()
> +spec['ARB_occlusion_query'] = arb_occlusion_query
> +add_plain_test(arb_occlusion_query, 'occlusion_query')
>
> # Group ARB_sampler_objects
> arb_sampler_objects = Group()
> @@ -1070,6 +1050,12 @@ add_plain_test(arb_debug_output, 'arb_debug_output-api_error')
> arb_pixel_buffer_object = Group()
> spec['ARB_pixel_buffer_object'] = arb_pixel_buffer_object
> add_plain_test(arb_pixel_buffer_object, 'fbo-pbo-readpixels-small')
> +add_plain_test(arb_pixel_buffer_object, 'pbo-drawpixels')
> +add_plain_test(arb_pixel_buffer_object, 'pbo-read-argb8888')
> +add_plain_test(arb_pixel_buffer_object, 'pbo-readpixels-small')
> +add_plain_test(arb_pixel_buffer_object, 'pbo-teximage')
> +add_plain_test(arb_pixel_buffer_object, 'pbo-teximage-tiling')
> +add_plain_test(arb_pixel_buffer_object, 'pbo-teximage-tiling-2')
>
> # Group ARB_robustness
> arb_robustness = Group()
> @@ -1238,6 +1224,20 @@ spec['ARB_texture_compression_bptc'] = arb_texture_compression_bptc
> arb_texture_compression_bptc['invalid formats'] = PlainExecTest(['arb_texture_compression-invalid-formats', 'bptc'])
> arb_texture_compression_bptc['invalid formats'].runConcurrent = True
>
> +ext_vertex_array_bgra = Group()
> +spec['EXT_vertex_array_bgra'] = ext_vertex_array_bgra
> +add_plain_test(ext_vertex_array_bgra, 'bgra-sec-color-pointer')
> +add_plain_test(ext_vertex_array_bgra, 'bgra-vert-attrib-pointer')
> +
> +apple_vertex_array_object = Group()
> +spec['APPLE_vertex_array_object'] = apple_vertex_array_object
> +add_plain_test(apple_vertex_array_object, 'vao-01')
> +add_plain_test(apple_vertex_array_object, 'vao-02')
> +
> +arb_vertex_array_object = Group()
> +spec['ARB_vertex_array_object'] = arb_vertex_array_object
> +add_concurrent_test(arb_vertex_array_object, 'vao-element-array-buffer')
> +
> arb_vertex_buffer_object = Group()
> spec['ARB_vertex_buffer_object'] = arb_vertex_buffer_object
> arb_vertex_buffer_object['elements-negative-offset'] = PlainExecTest(['arb_vertex_buffer_object-elements-negative-offset', '-auto'])
> @@ -1245,6 +1245,11 @@ arb_vertex_buffer_object['mixed-immediate-and-vbo'] = PlainExecTest(['arb_vertex
> add_plain_test(arb_vertex_buffer_object, 'fdo14575')
> add_plain_test(arb_vertex_buffer_object, 'fdo22540')
> add_plain_test(arb_vertex_buffer_object, 'fdo31934')
> +add_plain_test(arb_vertex_buffer_object, 'pos-array')
> +add_plain_test(arb_vertex_buffer_object, 'vbo-bufferdata')
> +add_plain_test(arb_vertex_buffer_object, 'vbo-map-remap')
> +add_plain_test(arb_vertex_buffer_object, 'vbo-subdata-sync')
> +add_plain_test(arb_vertex_buffer_object, 'vbo-subdata-zero')
>
> arb_vertex_program = Group()
> spec['ARB_vertex_program'] = arb_vertex_program
> @@ -1749,6 +1754,7 @@ add_plain_test(ext_texture_srgb, 'fbo-srgb')
> ext_timer_query = Group()
> spec['EXT_timer_query'] = ext_timer_query
> ext_timer_query['time-elapsed'] = concurrent_test('ext_timer_query-time-elapsed')
> +add_plain_test(ext_timer_query, 'timer_query')
>
> arb_timer_query = Group()
> spec['ARB_timer_query'] = arb_timer_query
> @@ -2010,6 +2016,11 @@ arb_copy_buffer['negative-mapped'] = concurrent_test('arb_copy_buffer-negative-m
> arb_copy_buffer['overlap'] = concurrent_test('arb_copy_buffer-overlap')
> arb_copy_buffer['targets'] = concurrent_test('arb_copy_buffer-targets')
>
> +arb_half_float_vertex = Group()
> +spec['ARB_half_float_vertex'] = arb_half_float_vertex
> +add_plain_test(arb_half_float_vertex, 'draw-vertices-half-float')
> +arb_half_float_vertex['draw-vertices-half-float-user'] = PlainExecTest(['draw-vertices-half-float', '-auto', 'user'])
> +
> arb_vertex_type_2_10_10_10_rev = Group()
> spec['ARB_vertex_type_2_10_10_10_rev'] = arb_vertex_type_2_10_10_10_rev
> add_plain_test(arb_vertex_type_2_10_10_10_rev, 'draw-vertices-2101010')
> @@ -2036,6 +2047,29 @@ add_plain_test(arb_blend_func_extended, 'arb_blend_func_extended-getfragdatainde
> add_plain_test(arb_blend_func_extended, 'arb_blend_func_extended-fbo-extended-blend')
> add_plain_test(arb_blend_func_extended, 'arb_blend_func_extended-fbo-extended-blend-explicit')
>
> +apple_object_purgeable = Group()
> +spec['APPLE_object_purgeable'] = apple_object_purgeable
> +add_plain_test(apple_object_purgeable, 'object_purgeable-api-pbo')
> +add_plain_test(apple_object_purgeable, 'object_purgeable-api-texture')
> +add_plain_test(apple_object_purgeable, 'object_purgeable-api-vbo')
> +
> +oes_read_format = Group()
> +spec['OES_read_format'] = oes_read_format
> +add_plain_test(oes_read_format, 'oes-read-format')
> +
> +nv_primitive_restart = Group()
> +spec['NV_primitive_restart'] = nv_primitive_restart
> +add_single_param_test_set(
> + nv_primitive_restart,
> + 'primitive-restart',
> + "DISABLE_VBO",
> + "VBO_VERTEX_ONLY", "VBO_INDEX_ONLY",
> + "VBO_SEPARATE_VERTEX_AND_INDEX", "VBO_COMBINED_VERTEX_AND_INDEX")
> +
> +ext_provoking_vertex = Group()
> +spec['EXT_provoking_vertex'] = ext_provoking_vertex
> +add_plain_test(ext_provoking_vertex, 'provoking-vertex')
> +
> # group glslparsertest ------------------------------------------------------
> glslparsertest = Group()
> # Add all shader source files in the directories below.
> @@ -2520,7 +2554,6 @@ add_shader_test_dir(spec, os.path.join(generatedTestDir, 'spec'),
> recursive=True)
> import_glsl_parser_tests(profile.tests, generatedTestDir, ['spec'])
>
> -profile.tests['general'] = general
> profile.tests['hiz'] = hiz
> profile.tests['glean'] = glean
> profile.tests['glslparsertest'] = glslparsertest
>
More information about the Piglit
mailing list