[Piglit] [PATCH 3/3] enable -fbo for a few more tests

[Chris Forbes]

---
 tests/all.tests                      |   15 +++++++--------
 tests/general/polygon-mode.c         |    2 +-
 tests/spec/ati_envmap_bumpmap/bump.c |    2 +-
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/tests/all.tests b/tests/all.tests
index f67a4d0..8b95a17 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -1121,15 +1121,14 @@ add_shader_test_dir(arb_shader_texture_lod['execution'],
 	            os.path.join(testsDir, 'spec', 'arb_shader_texture_lod', 'execution'),
 		    recursive=True)
 add_plain_test(arb_shader_texture_lod['execution'], 'arb_shader_texture_lod-texgrad')
-arb_shader_texture_lod['execution']['tex-miplevel-selection-texture2DLod'] = PlainExecTest(['tex-miplevel-selection', '-auto', '-nobias', '-nolod', '-GL_ARB_shader_texture_lod'])
-arb_shader_texture_lod['execution']['tex-miplevel-selection-texture2DLod-lod'] = PlainExecTest(['tex-miplevel-selection', '-auto', '-nobias', '-GL_ARB_shader_texture_lod'])
-arb_shader_texture_lod['execution']['tex-miplevel-selection-texture2DLod-lod-bias'] = PlainExecTest(['tex-miplevel-selection', '-auto', '-GL_ARB_shader_texture_lod'])
+arb_shader_texture_lod['execution']['tex-miplevel-selection-texture2DLod'] = concurrent_test('tex-miplevel-selection -nobias -nolod -GL_ARB_shader_texture_lod')
+arb_shader_texture_lod['execution']['tex-miplevel-selection-texture2DLod-lod'] = concurrent_test('tex-miplevel-selection -nobias -GL_ARB_shader_texture_lod')
+arb_shader_texture_lod['execution']['tex-miplevel-selection-texture2DLod-lod-bias'] = concurrent_test('tex-miplevel-selection -GL_ARB_shader_texture_lod')
 
 # Group ARB_shader_objects
 arb_shader_objects = Group()
 spec['ARB_shader_objects'] = arb_shader_objects
-arb_shader_objects['getuniform'] = PlainExecTest(['arb_shader_objects-getuniform', '-auto'])
-arb_shader_objects['getuniform'].runConcurrent = True
+arb_shader_objects['getuniform'] = concurrent_test('arb_shader_objects-getuniform')
 arb_shader_objects['bindattriblocation-scratch-name'] = concurrent_test('arb_shader_objects-bindattriblocation-scratch-name')
 arb_shader_objects['getuniformlocation-array-of-struct-of-array'] = concurrent_test('arb_shader_objects-getuniformlocation-array-of-struct-of-array')
 arb_shader_objects['clear-with-deleted'] = concurrent_test('arb_shader_objects-clear-with-deleted')
@@ -1637,7 +1636,7 @@ ati_draw_buffers['arbfp-no-option'] = PlainExecTest(['ati_draw_buffers-arbfp-no-
 
 ati_envmap_bumpmap = Group()
 spec['ATI_envmap_bumpmap'] = ati_envmap_bumpmap
-add_plain_test(ati_envmap_bumpmap, 'ati_envmap_bumpmap-bump')
+add_concurrent_test(ati_envmap_bumpmap, 'ati_envmap_bumpmap-bump')
 
 arb_instanced_arrays = Group()
 spec['ARB_instanced_arrays'] = arb_instanced_arrays
@@ -1645,8 +1644,8 @@ add_plain_test(arb_instanced_arrays, 'instanced_arrays')
 
 arb_map_buffer_range = Group()
 spec['ARB_map_buffer_range'] = arb_map_buffer_range
-add_plain_test(arb_map_buffer_range, 'map_buffer_range_error_check')
-add_plain_test(arb_map_buffer_range, 'map_buffer_range_test')
+add_concurrent_test(arb_map_buffer_range, 'map_buffer_range_error_check')
+add_concurrent_test(arb_map_buffer_range, 'map_buffer_range_test')
 
 arb_multisample = Group()
 spec['ARB_multisample'] = arb_multisample
diff --git a/tests/general/polygon-mode.c b/tests/general/polygon-mode.c
index fdd95cc..9b71116 100644
--- a/tests/general/polygon-mode.c
+++ b/tests/general/polygon-mode.c
@@ -280,7 +280,7 @@ test_combo(GLenum frontMode, GLenum backMode)
       }
    }
 
-   glutSwapBuffers();
+   piglit_present_results();
 
    return pass;
 }
diff --git a/tests/spec/ati_envmap_bumpmap/bump.c b/tests/spec/ati_envmap_bumpmap/bump.c
index 2bdaa57..0ff2fc4 100644
--- a/tests/spec/ati_envmap_bumpmap/bump.c
+++ b/tests/spec/ati_envmap_bumpmap/bump.c
@@ -179,7 +179,7 @@ piglit_display(void)
 					      piglit_height / 2,
 					      green);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
-- 
1.7.10