[Piglit] [PATCH 1/3] all.tests: move all tests from the fbo group into spec

Marek Olšák maraeo at gmail.com
Tue Oct 16 22:44:47 PDT 2012


---
 tests/all.tests |  168 +++++++++++++++++++++++++++++--------------------------
 1 files changed, 88 insertions(+), 80 deletions(-)

diff --git a/tests/all.tests b/tests/all.tests
index 6b5466a..7bc0eb0 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -180,84 +180,6 @@ def add_fbo_rg(group, format):
 	name = "fbo-rg-" + format
 	group[name] = PlainExecTest(['fbo-rg', '-auto', format])
 
-fbo = Group()
-add_plain_test(fbo, 'fbo-1d')
-add_plain_test(fbo, 'fbo-3d')
-add_plain_test(fbo, 'fbo-alpha')
-add_plain_test(fbo, 'fbo-alphatest-formats')
-add_plain_test(fbo, 'fbo-alphatest-nocolor')
-add_plain_test(fbo, 'fbo-alphatest-nocolor-ff')
-add_plain_test(fbo, 'fbo-array')
-add_plain_test(fbo, 'fbo-luminance-alpha')
-add_plain_test(fbo, 'fbo-blending-formats')
-add_plain_test(fbo, 'fbo-bind-renderbuffer')
-add_plain_test(fbo, 'fbo-blit')
-add_plain_test(fbo, 'fbo-blit-d24s8')
-add_plain_test(fbo, 'fbo-blit-stretch')
-add_plain_test(fbo, 'fbo-cubemap')
-add_plain_test(fbo, 'fbo-clearmipmap')
-add_plain_test(fbo, 'fbo-clear-formats')
-add_plain_test(fbo, 'fbo-copypix')
-add_plain_test(fbo, 'fbo-copyteximage')
-add_plain_test(fbo, 'fbo-copyteximage-simple')
-add_plain_test(fbo, 'fbo-depth-array')
-add_plain_test(fbo, 'fbo-depthtex')
-add_plain_test(fbo, 'fbo-depth-sample-compare')
-add_plain_test(fbo, 'fbo-deriv')
-add_plain_test(fbo, 'fbo-drawbuffers')
-add_plain_test(fbo, 'fbo-drawbuffers-arbfp')
-add_plain_test(fbo, 'fbo-drawbuffers-blend-add')
-add_plain_test(fbo, 'fbo-drawbuffers-fragcolor')
-add_plain_test(fbo, 'fbo-drawbuffers-maxtargets')
-add_plain_test(fbo, 'fbo-drawbuffers2-blend')
-add_plain_test(fbo, 'fbo-drawbuffers2-colormask')
-add_plain_test(fbo, 'fbo-draw-buffers-blend')
-add_plain_test(fbo, 'fbo-finish-deleted')
-add_plain_test(fbo, 'fbo-flushing')
-add_plain_test(fbo, 'fbo-flushing-2')
-add_plain_test(fbo, 'fbo-fragcoord')
-add_plain_test(fbo, 'fbo-fragcoord2')
-add_plain_test(fbo, 'fbo-generatemipmap')
-add_plain_test(fbo, 'fbo-generatemipmap-filtering')
-add_plain_test(fbo, 'fbo-generatemipmap-formats')
-add_plain_test(fbo, 'fbo-generatemipmap-scissor')
-add_plain_test(fbo, 'fbo-generatemipmap-nonsquare')
-add_plain_test(fbo, 'fbo-generatemipmap-npot')
-add_plain_test(fbo, 'fbo-generatemipmap-viewport')
-add_plain_test(fbo, 'fbo-getframebufferattachmentparameter-01')
-add_plain_test(fbo, 'fbo-gl_pointcoord')
-add_plain_test(fbo, 'fbo-incomplete-texture-01')
-add_plain_test(fbo, 'fbo-incomplete-texture-02')
-add_plain_test(fbo, 'fbo-incomplete-texture-03')
-add_plain_test(fbo, 'fbo-incomplete-texture-04')
-add_plain_test(fbo, 'fbo-integer')
-add_plain_test(fbo, 'fbo-maxsize')
-add_concurrent_test(fbo, 'fbo-mipmap-copypix')
-add_plain_test(fbo, 'fbo-nodepth-test')
-add_plain_test(fbo, 'fbo-nostencil-test')
-add_plain_test(fbo, 'fbo-pbo-readpixels-small')
-add_plain_test(fbo, 'fbo-readdrawpix')
-add_plain_test(fbo, 'fbo-readpixels')
-add_plain_test(fbo, 'fbo-readpixels-depth-formats')
-add_plain_test(fbo, 'fbo-scissor-bitmap')
-fbo['fbo-scissor-blit fbo'] = PlainExecTest(['fbo-scissor-blit', 'fbo', '-auto'])
-fbo['fbo-scissor-blit window'] = PlainExecTest(['fbo-scissor-blit', 'window', '-auto'])
-add_plain_test(fbo, 'fbo-srgb')
-add_plain_test(fbo, 'fbo-srgb-blit')
-add_plain_test(fbo, 'fbo-storage-formats')
-add_plain_test(fbo, 'fbo-storage-completeness')
-add_plain_test(fbo, 'fbo-sys-blit')
-add_plain_test(fbo, 'fbo-sys-sub-blit')
-add_plain_test(fbo, 'fbo-viewport')
-add_fbo_rg(fbo, 'GL_RED')
-add_fbo_rg(fbo, 'GL_R8')
-add_fbo_rg(fbo, 'GL_R16')
-add_fbo_rg(fbo, 'GL_RG')
-add_fbo_rg(fbo, 'GL_RG8')
-add_fbo_rg(fbo, 'GL_RG16')
-fbo['FBO blit to missing attachment'] = PlainExecTest(['fbo-missing-attachment-blit', '-auto', 'to'])
-fbo['FBO blit from missing attachment'] = PlainExecTest(['fbo-missing-attachment-blit', '-auto', 'from'])
-
 general = Group()
 add_plain_test(general, 'array-stride')
 add_plain_test(general, 'bgra-sec-color-pointer')
@@ -1134,7 +1056,22 @@ for format in ('rgba', 'depth', 'stencil'):
     for test_mode in ('draw', 'read'):
         test_name = ' '.join(['framebuffer-blit-levels', test_mode, format])
         arb_framebuffer_object[test_name] = PlainExecTest(test_name + ' -auto')
-
+add_plain_test(arb_framebuffer_object, 'fbo-alpha')
+add_plain_test(arb_framebuffer_object, 'fbo-blit-stretch')
+add_plain_test(arb_framebuffer_object, 'fbo-deriv')
+add_plain_test(arb_framebuffer_object, 'fbo-luminance-alpha')
+add_plain_test(arb_framebuffer_object, 'fbo-getframebufferattachmentparameter-01')
+add_plain_test(arb_framebuffer_object, 'fbo-gl_pointcoord')
+add_plain_test(arb_framebuffer_object, 'fbo-incomplete-texture-01')
+add_plain_test(arb_framebuffer_object, 'fbo-incomplete-texture-02')
+add_plain_test(arb_framebuffer_object, 'fbo-incomplete-texture-03')
+add_plain_test(arb_framebuffer_object, 'fbo-incomplete-texture-04')
+add_concurrent_test(arb_framebuffer_object, 'fbo-mipmap-copypix')
+add_plain_test(arb_framebuffer_object, 'fbo-viewport')
+arb_framebuffer_object['FBO blit to missing attachment'] = PlainExecTest(['fbo-missing-attachment-blit', '-auto', 'to'])
+arb_framebuffer_object['FBO blit from missing attachment'] = PlainExecTest(['fbo-missing-attachment-blit', '-auto', 'from'])
+arb_framebuffer_object['fbo-scissor-blit fbo'] = PlainExecTest(['fbo-scissor-blit', 'fbo', '-auto'])
+arb_framebuffer_object['fbo-scissor-blit window'] = PlainExecTest(['fbo-scissor-blit', 'window', '-auto'])
 
 # Group ARB_framebuffer_sRGB
 arb_framebuffer_srgb = Group()
@@ -1166,6 +1103,10 @@ arb_debug_output = Group()
 spec['ARB_debug_output'] = arb_debug_output
 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')
+
 # Group ARB_robustness
 arb_robustness = Group()
 spec['ARB_robustness'] = arb_robustness
@@ -1350,6 +1291,15 @@ arb_vertex_program['clip-plane-transformation arb'] = concurrent_test('clip-plan
 arb_vertex_program['minmax'] = concurrent_test('arb_vertex_program-minmax')
 add_plain_test(arb_vertex_program, 'fdo24066')
 
+ext_framebuffer_blit = Group()
+spec['EXT_framebuffer_blit'] = ext_framebuffer_blit
+add_plain_test(ext_framebuffer_blit, 'fbo-blit')
+add_plain_test(ext_framebuffer_blit, 'fbo-copypix')
+add_plain_test(ext_framebuffer_blit, 'fbo-readdrawpix')
+add_plain_test(ext_framebuffer_blit, 'fbo-srgb-blit')
+add_plain_test(ext_framebuffer_blit, 'fbo-sys-blit')
+add_plain_test(ext_framebuffer_blit, 'fbo-sys-sub-blit')
+
 ext_framebuffer_multisample = Group()
 spec['EXT_framebuffer_multisample'] = ext_framebuffer_multisample
 ext_framebuffer_multisample['blit-mismatched-samples'] = concurrent_test('ext_framebuffer_multisample-blit-mismatched-samples')
@@ -1573,6 +1523,45 @@ add_fbo_stencil_tests(ext_framebuffer_object, 'GL_STENCIL_INDEX8')
 add_fbo_stencil_tests(ext_framebuffer_object, 'GL_STENCIL_INDEX16')
 add_concurrent_test(ext_framebuffer_object, 'fbo-generatemipmap-noimage')
 add_plain_test(ext_framebuffer_object, 'fdo20701')
+add_plain_test(ext_framebuffer_object, 'fbo-1d')
+add_plain_test(ext_framebuffer_object, 'fbo-3d')
+add_plain_test(ext_framebuffer_object, 'fbo-alphatest-formats')
+add_plain_test(ext_framebuffer_object, 'fbo-alphatest-nocolor')
+add_plain_test(ext_framebuffer_object, 'fbo-alphatest-nocolor-ff')
+add_plain_test(ext_framebuffer_object, 'fbo-blending-formats')
+add_plain_test(ext_framebuffer_object, 'fbo-bind-renderbuffer')
+add_plain_test(ext_framebuffer_object, 'fbo-clearmipmap')
+add_plain_test(ext_framebuffer_object, 'fbo-clear-formats')
+add_plain_test(ext_framebuffer_object, 'fbo-copyteximage')
+add_plain_test(ext_framebuffer_object, 'fbo-copyteximage-simple')
+add_plain_test(ext_framebuffer_object, 'fbo-cubemap')
+add_plain_test(ext_framebuffer_object, 'fbo-depthtex')
+add_plain_test(ext_framebuffer_object, 'fbo-depth-sample-compare')
+add_plain_test(ext_framebuffer_object, 'fbo-drawbuffers')
+add_plain_test(ext_framebuffer_object, 'fbo-drawbuffers-arbfp')
+add_plain_test(ext_framebuffer_object, 'fbo-drawbuffers-blend-add')
+add_plain_test(ext_framebuffer_object, 'fbo-drawbuffers-fragcolor')
+add_plain_test(ext_framebuffer_object, 'fbo-drawbuffers-maxtargets')
+add_plain_test(ext_framebuffer_object, 'fbo-finish-deleted')
+add_plain_test(ext_framebuffer_object, 'fbo-flushing')
+add_plain_test(ext_framebuffer_object, 'fbo-flushing-2')
+add_plain_test(ext_framebuffer_object, 'fbo-fragcoord')
+add_plain_test(ext_framebuffer_object, 'fbo-fragcoord2')
+add_plain_test(ext_framebuffer_object, 'fbo-generatemipmap')
+add_plain_test(ext_framebuffer_object, 'fbo-generatemipmap-filtering')
+add_plain_test(ext_framebuffer_object, 'fbo-generatemipmap-formats')
+add_plain_test(ext_framebuffer_object, 'fbo-generatemipmap-scissor')
+add_plain_test(ext_framebuffer_object, 'fbo-generatemipmap-nonsquare')
+add_plain_test(ext_framebuffer_object, 'fbo-generatemipmap-npot')
+add_plain_test(ext_framebuffer_object, 'fbo-generatemipmap-viewport')
+add_plain_test(ext_framebuffer_object, 'fbo-maxsize')
+add_plain_test(ext_framebuffer_object, 'fbo-nodepth-test')
+add_plain_test(ext_framebuffer_object, 'fbo-nostencil-test')
+add_plain_test(ext_framebuffer_object, 'fbo-readpixels')
+add_plain_test(ext_framebuffer_object, 'fbo-readpixels-depth-formats')
+add_plain_test(ext_framebuffer_object, 'fbo-scissor-bitmap')
+add_plain_test(ext_framebuffer_object, 'fbo-storage-completeness')
+add_plain_test(ext_framebuffer_object, 'fbo-storage-formats')
 
 
 ext_packed_depth_stencil = Group()
@@ -1583,6 +1572,7 @@ add_fbo_depthstencil_tests(ext_packed_depth_stencil, 'GL_DEPTH24_STENCIL8')
 add_fbo_formats_tests('spec/EXT_packed_depth_stencil', 'GL_EXT_packed_depth_stencil')
 add_texwrap_format_tests(ext_packed_depth_stencil, 'GL_EXT_packed_depth_stencil')
 ext_packed_depth_stencil['readpixels-24_8'] = PlainExecTest(['ext_packed_depth_stencil-readpixels-24_8', '-auto'])
+add_plain_test(ext_packed_depth_stencil, 'fbo-blit-d24s8')
 
 ext_texture_array = Group()
 spec['EXT_texture_array'] = ext_texture_array
@@ -1593,6 +1583,8 @@ add_shader_test_dir(ext_texture_array,
                     recursive=True)
 ext_texture_array['copyteximage 1D_ARRAY'] = PlainExecTest(['copyteximage', '-auto', '1D_ARRAY'])
 ext_texture_array['copyteximage 2D_ARRAY'] = PlainExecTest(['copyteximage', '-auto', '2D_ARRAY'])
+add_plain_test(ext_texture_array, 'fbo-array')
+add_plain_test(ext_texture_array, 'fbo-depth-array')
 
 arb_texture_cube_map = Group()
 spec['ARB_texture_cube_map'] = arb_texture_cube_map
@@ -1684,6 +1676,7 @@ ext_texture_integer['getteximage-clamping GL_ARB_texture_rg'] = concurrent_test(
 ext_texture_integer['texture_integer_glsl130'] = concurrent_test('ext_texture_integer-texture_integer_glsl130')
 add_msaa_formats_tests(ext_texture_integer, 'GL_EXT_texture_integer')
 add_texwrap_format_tests(ext_texture_integer, 'GL_EXT_texture_integer')
+add_plain_test(ext_texture_integer, 'fbo-integer')
 
 arb_texture_rg = Group()
 spec['ARB_texture_rg'] = arb_texture_rg
@@ -1700,6 +1693,12 @@ add_msaa_formats_tests(arb_texture_rg, 'GL_ARB_texture_rg-float')
 add_texwrap_format_tests(arb_texture_rg, 'GL_ARB_texture_rg')
 add_texwrap_format_tests(arb_texture_rg, 'GL_ARB_texture_rg-float', '-float')
 add_texwrap_format_tests(arb_texture_rg, 'GL_ARB_texture_rg-int', '-int')
+add_fbo_rg(arb_texture_rg, 'GL_RED')
+add_fbo_rg(arb_texture_rg, 'GL_R8')
+add_fbo_rg(arb_texture_rg, 'GL_R16')
+add_fbo_rg(arb_texture_rg, 'GL_RG')
+add_fbo_rg(arb_texture_rg, 'GL_RG8')
+add_fbo_rg(arb_texture_rg, 'GL_RG16')
 
 arb_texture_rgb10_a2ui = Group()
 spec['ARB_texture_rgb10_a2ui'] = arb_texture_rgb10_a2ui
@@ -1733,6 +1732,7 @@ ext_texture_srgb['invalid formats'].runConcurrent = True
 add_msaa_formats_tests(ext_texture_srgb, 'GL_EXT_texture_sRGB')
 add_texwrap_format_tests(ext_texture_srgb, 'GL_EXT_texture_sRGB')
 add_texwrap_format_tests(ext_texture_srgb, 'GL_EXT_texture_sRGB-s3tc', '-s3tc')
+add_plain_test(ext_texture_srgb, 'fbo-srgb')
 
 ext_timer_query = Group()
 spec['EXT_timer_query'] = ext_timer_query
@@ -2006,6 +2006,15 @@ arb_draw_buffers = Group()
 spec['ARB_draw_buffers'] = arb_draw_buffers
 add_plain_test(arb_draw_buffers, 'arb_draw_buffers-state_change')
 
+ext_draw_buffers2 = Group()
+spec['EXT_draw_buffers2'] = ext_draw_buffers2
+add_plain_test(ext_draw_buffers2, 'fbo-drawbuffers2-blend')
+add_plain_test(ext_draw_buffers2, 'fbo-drawbuffers2-colormask')
+
+arb_draw_buffers_blend = Group()
+spec['ARB_draw_buffers_blend'] = arb_draw_buffers_blend
+add_plain_test(arb_draw_buffers_blend, 'fbo-draw-buffers-blend')
+
 arb_blend_func_extended = Group()
 spec['ARB_blend_func_extended'] = arb_blend_func_extended
 add_plain_test(arb_blend_func_extended, 'arb_blend_func_extended-bindfragdataindexed-invalid-parameters')
@@ -2501,7 +2510,6 @@ import_glsl_parser_tests(profile.tests, generatedTestDir, ['spec'])
 
 profile.tests['general'] = general
 profile.tests['hiz'] = hiz
-profile.tests['fbo'] = fbo
 profile.tests['glean'] = glean
 profile.tests['glslparsertest'] = glslparsertest
 profile.tests['asmparsertest'] = asmparsertest
-- 
1.7.4.1



More information about the Piglit mailing list