diff options
author | Chad Versace <chad.versace@linux.intel.com> | 2012-06-11 21:14:42 -0700 |
---|---|---|
committer | Chad Versace <chad.versace@linux.intel.com> | 2012-06-20 16:49:34 -0700 |
commit | 29bbf12760b537a2a3b30d18ed22f88c6c89f7f7 (patch) | |
tree | 5643fc32eb96b09f98b2955335a4b07e7bc51183 /tests/spec/gl-2.0 | |
parent | 7b90e1b18fd694014d453139ecdbbb31c7625999 (diff) |
tests: Let each test define main()
Each test that did not define main() now does so using
PIGLIT_GL_TEST_MAIN().
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
Diffstat (limited to 'tests/spec/gl-2.0')
-rw-r--r-- | tests/spec/gl-2.0/api/clip-flag-behavior.c | 6 | ||||
-rw-r--r-- | tests/spec/gl-2.0/api/getattriblocation-conventional.c | 6 | ||||
-rw-r--r-- | tests/spec/gl-2.0/vertex-program-two-side.c | 6 |
3 files changed, 12 insertions, 6 deletions
diff --git a/tests/spec/gl-2.0/api/clip-flag-behavior.c b/tests/spec/gl-2.0/api/clip-flag-behavior.c index f429c2259..64639cd79 100644 --- a/tests/spec/gl-2.0/api/clip-flag-behavior.c +++ b/tests/spec/gl-2.0/api/clip-flag-behavior.c @@ -38,8 +38,10 @@ #include "piglit-util.h" -int piglit_width = 100, piglit_height = 100; -int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE; +PIGLIT_GL_TEST_MAIN( + 100 /*window_width*/, + 100 /*window_height*/, + GLUT_RGB | GLUT_DOUBLE) enum piglit_result piglit_display(void) diff --git a/tests/spec/gl-2.0/api/getattriblocation-conventional.c b/tests/spec/gl-2.0/api/getattriblocation-conventional.c index b4fd4b211..14ab5516c 100644 --- a/tests/spec/gl-2.0/api/getattriblocation-conventional.c +++ b/tests/spec/gl-2.0/api/getattriblocation-conventional.c @@ -30,8 +30,10 @@ #include "piglit-util.h" -int piglit_width = 100, piglit_height = 100; -int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE; +PIGLIT_GL_TEST_MAIN( + 100 /*window_width*/, + 100 /*window_height*/, + GLUT_RGB | GLUT_DOUBLE) static const char *vs_code = "attribute vec4 not_used;\n" diff --git a/tests/spec/gl-2.0/vertex-program-two-side.c b/tests/spec/gl-2.0/vertex-program-two-side.c index 83ede0a50..77a4a43c7 100644 --- a/tests/spec/gl-2.0/vertex-program-two-side.c +++ b/tests/spec/gl-2.0/vertex-program-two-side.c @@ -45,8 +45,10 @@ #define _GNU_SOURCE #include "piglit-util.h" -int piglit_width = 100, piglit_height = 100; -int piglit_window_mode = GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE; +PIGLIT_GL_TEST_MAIN( + 100 /*window_width*/, + 100 /*window_height*/, + GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE) static GLint prog; |