On 24 February 2012 11:43, Chad Versace <<a href="mailto:chad.versace@linux.intel.com">chad.versace@linux.intel.com</a>> wrote: <div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> <div class="im">On 02/22/2012 01:29 PM, Paul Berry wrote: > This patch converts the following tests to use the main() function in > piglit-framework.c rather than define their own main() function. > > - asmparsertest > - fdo14575 > - fdo20701 > - fdo22540 > - fdo31934 > - glslparsertest > - texunits > --- > tests/asmparsertest/asmparsertest.c | 44 +++++++---------- > tests/bugs/fdo14575.c | 29 ++++------- > tests/bugs/fdo20701.c | 53 ++++----------------- > tests/bugs/fdo22540.c | 31 +++--------- > tests/bugs/fdo31934.c | 25 ++++------ > tests/general/texunits.c | 84 +++++++-------------------------- > tests/glslparsertest/glslparsertest.c | 23 ++++----- > 7 files changed, 87 insertions(+), 202 deletions(-) > </div><div class="im">> diff --git a/tests/bugs/fdo20701.c b/tests/bugs/fdo20701.c > index 279de10..6bab980 100644 > --- a/tests/bugs/fdo20701.c > +++ b/tests/bugs/fdo20701.c > @@ -36,12 +36,14 @@ > </div><div class="im">> @@ -81,8 +61,6 @@ init(void) > { > GLenum status; > > - glewInit(); > - > piglit_require_extension("GL_EXT_framebuffer_object"); > > glGenFramebuffersEXT(1, &fb); > @@ -110,20 +88,7 @@ init(void) > } > > > -int main(int argc, char**argv) > +void > +piglit_init(int argc, char**argv) > { > - glutInit(&argc, argv); > - if (argc == 2 && !strcmp(argv[1], "-auto")) > - Automatic = 1; > - glutInitDisplayMode(GLUT_RGB); > - glutInitWindowSize(Width, Height); > - glutCreateWindow("FD.O bug #20701 test"); > - glutReshapeFunc(Reshape); > - glutKeyboardFunc(Key); > - glutDisplayFunc(Display); > - if (!Automatic) > - printf("If the test doesn't crash, then it passes.\n"); > - init(); > - glutMainLoop(); > - return 0; > } </div>In fdo20701.c, init() no longer gets called. It needs to be renamed to piglit_init(). </blockquote><div> Whoops. Good catch. I'm not sure how I missed that. </div><blockquote class="gmail_quote" style="margin:0pt 0pt 0pt 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"> Other than that, this is Reviewed-by: Chad Versace <<a href="mailto:chad.versace@linux.intel.com">chad.versace@linux.intel.com</a>> </blockquote></div>