[Piglit] [PATCH 1/3] Convert some tests to use PIGLIT_GL_TEST_CONFIG_* macros.

Paul Berry stereotype441 at gmail.com
Fri Jul 26 13:11:48 PDT 2013


These tests aren't doing anything fancy in main(), so they can use
PIGLIT_GL_TEST_CONFIG_BEGIN and PIGLIT_GL_TEST_CONFIG_END.
---
 .../arb_texture_buffer_object/fetch-outside-bounds.c   | 18 ++----------------
 tests/spec/arb_texture_buffer_object/render-no-bo.c    | 18 ++----------------
 2 files changed, 4 insertions(+), 32 deletions(-)

diff --git a/tests/spec/arb_texture_buffer_object/fetch-outside-bounds.c b/tests/spec/arb_texture_buffer_object/fetch-outside-bounds.c
index 046d42b..c9af608 100644
--- a/tests/spec/arb_texture_buffer_object/fetch-outside-bounds.c
+++ b/tests/spec/arb_texture_buffer_object/fetch-outside-bounds.c
@@ -114,25 +114,11 @@ piglit_init(int argc, char **argv)
 		piglit_require_extension("GL_ARB_texture_buffer_object");
 }
 
-int
-main(int argc, char *argv[])
-{
-	struct piglit_gl_test_config config;
-
-	piglit_gl_test_config_init(&config);
-
-	config.init = piglit_init;
-	config.display = piglit_display;
-
+PIGLIT_GL_TEST_CONFIG_BEGIN
 	config.supports_gl_compat_version = 10;
 	config.supports_gl_core_version = 31;
 
 	config.window_width = 10;
 	config.window_height = 10;
 	config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;
-
-	piglit_gl_test_run(argc, argv, &config);
-
-	assert(false);
-	return 0;
-}
+PIGLIT_GL_TEST_CONFIG_END
diff --git a/tests/spec/arb_texture_buffer_object/render-no-bo.c b/tests/spec/arb_texture_buffer_object/render-no-bo.c
index d2357ce..0db0266 100644
--- a/tests/spec/arb_texture_buffer_object/render-no-bo.c
+++ b/tests/spec/arb_texture_buffer_object/render-no-bo.c
@@ -114,25 +114,11 @@ piglit_init(int argc, char **argv)
 		piglit_require_extension("GL_ARB_texture_buffer_object");
 }
 
-int
-main(int argc, char *argv[])
-{
-	struct piglit_gl_test_config config;
-
-	piglit_gl_test_config_init(&config);
-
-	config.init = piglit_init;
-	config.display = piglit_display;
-
+PIGLIT_GL_TEST_CONFIG_BEGIN
 	config.supports_gl_compat_version = 10;
 	config.supports_gl_core_version = 31;
 
 	config.window_width = 10;
 	config.window_height = 10;
 	config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;
-
-	piglit_gl_test_run(argc, argv, &config);
-
-	assert(false);
-	return 0;
-}
+PIGLIT_GL_TEST_CONFIG_END
-- 
1.8.3.4



More information about the Piglit mailing list