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>

100 files changed, 404 insertions, 260 deletions

diff --git a/tests/general/array-stride.c b/tests/general/array-stride.c
index aa46caadf..10cf56717 100644
--- a/tests/general/array-stride.c
+++ b/tests/general/array-stride.c
@@ -30,9 +30,10 @@
 #include "piglit-util.h"
 #include "piglit-framework.h"
 
-int piglit_width = 100;
-int 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 *TestName = "array-stride";
 
diff --git a/tests/general/bgra-sec-color-pointer.c b/tests/general/bgra-sec-color-pointer.c
index e94f545d7..5ae79dd17 100644
--- a/tests/general/bgra-sec-color-pointer.c
+++ b/tests/general/bgra-sec-color-pointer.c
@@ -32,8 +32,10 @@
 
 #include "piglit-util.h"
 
-int piglit_width = 400, piglit_height = 300;
-int piglit_window_mode = GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE;
+PIGLIT_GL_TEST_MAIN(
+    400 /*window_width*/,
+    300 /*window_height*/,
+    GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE)
 
 static GLfloat verts[12] = {225.0, 175.0, 0.0,
 				225.0, 225.0, 0.0,
diff --git a/tests/general/bgra-vert-attrib-pointer.c b/tests/general/bgra-vert-attrib-pointer.c
index 7f0d53f2f..cd3e9957d 100644
--- a/tests/general/bgra-vert-attrib-pointer.c
+++ b/tests/general/bgra-vert-attrib-pointer.c
@@ -31,8 +31,10 @@
 
 #include "piglit-util.h"
 
-int piglit_width = 400, piglit_height = 300;
-int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
+PIGLIT_GL_TEST_MAIN(
+    400 /*window_width*/,
+    300 /*window_height*/,
+    GLUT_RGB | GLUT_DOUBLE)
 
 static GLint prog;
 static GLint fs;
diff --git a/tests/general/blendminmax.c b/tests/general/blendminmax.c
index 652135812..325e4e4ff 100644
--- a/tests/general/blendminmax.c
+++ b/tests/general/blendminmax.c
@@ -34,9 +34,11 @@
 
 #include "piglit-util.h"
 
-int piglit_width = 400;
-int piglit_height = 200;
-int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
+PIGLIT_GL_TEST_MAIN(
+    400 /*window_width*/,
+    200 /*window_height*/,
+    GLUT_RGB | GLUT_DOUBLE)
+
 static const GLfloat Near = 5.0, Far = 25.0;
 
 enum piglit_result
diff --git a/tests/general/blendsquare.c b/tests/general/blendsquare.c
index 8850a4137..f8931a167 100644
--- a/tests/general/blendsquare.c
+++ b/tests/general/blendsquare.c
@@ -34,9 +34,11 @@
 
 #include "piglit-util.h"
 
-int piglit_width = 400;
-int piglit_height = 200;
-int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
+PIGLIT_GL_TEST_MAIN(
+    400 /*window_width*/,
+    200 /*window_height*/,
+    GLUT_RGB | GLUT_DOUBLE)
+
 static const GLfloat Near = 5.0, Far = 25.0;
 
 enum piglit_result
diff --git a/tests/general/clear-accum.c b/tests/general/clear-accum.c
index b50579d5a..1647067f2 100644
--- a/tests/general/clear-accum.c
+++ b/tests/general/clear-accum.c
@@ -32,9 +32,10 @@
 
 #include "piglit-util.h"
 
-int piglit_width = 400;
-int piglit_height = 200;
-int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE | GLUT_ACCUM;
+PIGLIT_GL_TEST_MAIN(
+    400 /*window_width*/,
+    200 /*window_height*/,
+    GLUT_RGB | GLUT_DOUBLE | GLUT_ACCUM)
 
 enum piglit_result
 piglit_display(void)
diff --git a/tests/general/clear-varray-2.0.c b/tests/general/clear-varray-2.0.c
index ac853e4af..d3c1e0a98 100644
--- a/tests/general/clear-varray-2.0.c
+++ b/tests/general/clear-varray-2.0.c
@@ -34,8 +34,10 @@
 
 #include "piglit-util.h"
 
-int piglit_width = 200, piglit_height = 100;
-int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH;
+PIGLIT_GL_TEST_MAIN(
+    200 /*window_width*/,
+    100 /*window_height*/,
+    GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH)
 
 /* apply MVP and set the color to blue. */
 static const GLchar *const vp_code =
diff --git a/tests/general/copy-pixels.c b/tests/general/copy-pixels.c
index 892db1e74..72df073e9 100644
--- a/tests/general/copy-pixels.c
+++ b/tests/general/copy-pixels.c
@@ -35,10 +35,10 @@
 #define IMAGE_WIDTH 16
 #define IMAGE_HEIGHT 16
 
-int piglit_width = 32;
-int piglit_height = 32;
-int piglit_window_mode = GLUT_RGBA | GLUT_DOUBLE | GLUT_ALPHA |
-			 GLUT_STENCIL | GLUT_DEPTH;
+PIGLIT_GL_TEST_MAIN(
+    32 /*window_width*/,
+    32 /*window_height*/,
+    GLUT_RGBA | GLUT_DOUBLE | GLUT_ALPHA | GLUT_STENCIL | GLUT_DEPTH);
 
 enum piglit_result
 piglit_display(void)
diff --git a/tests/general/copypixels-draw-sync.c b/tests/general/copypixels-draw-sync.c
index 54ffc0e07..d811ef436 100644
--- a/tests/general/copypixels-draw-sync.c
+++ b/tests/general/copypixels-draw-sync.c
@@ -32,9 +32,10 @@
 #include "piglit-util.h"
 #include "piglit-framework.h"
 
-int piglit_width = 64;
-int piglit_height = 64;
-int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE | GLUT_ALPHA;
+PIGLIT_GL_TEST_MAIN(
+    64 /*window_width*/,
+    64 /*window_height*/,
+    GLUT_RGB | GLUT_DOUBLE | GLUT_ALPHA)
 
 enum piglit_result
 piglit_display(void)
diff --git a/tests/general/copypixels-sync.c b/tests/general/copypixels-sync.c
index 9a13628c5..6de7be05b 100644
--- a/tests/general/copypixels-sync.c
+++ b/tests/general/copypixels-sync.c
@@ -31,9 +31,10 @@
 #include "piglit-util.h"
 #include "piglit-framework.h"
 
-int piglit_width = 64;
-int piglit_height = 64;
-int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE | GLUT_ALPHA;
+PIGLIT_GL_TEST_MAIN(
+    64 /*window_width*/,
+    64 /*window_height*/,
+    GLUT_RGB | GLUT_DOUBLE | GLUT_ALPHA)
 
 enum piglit_result
 piglit_display(void)
diff --git a/tests/general/depth-clamp-range.c b/tests/general/depth-clamp-range.c
index c93e7edb3..9cc37b78f 100644
--- a/tests/general/depth-clamp-range.c
+++ b/tests/general/depth-clamp-range.c
@@ -32,8 +32,10 @@
 
 #include "piglit-util.h"
 
-int piglit_width = 150, piglit_height = 150;
-int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH;
+PIGLIT_GL_TEST_MAIN(
+    150 /*window_width*/,
+    150 /*window_height*/,
+    GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH)
 
 void
 piglit_init(int argc, char **argv)
diff --git a/tests/general/depth_clamp.c b/tests/general/depth_clamp.c
index 645fff473..9b602de13 100644
--- a/tests/general/depth_clamp.c
+++ b/tests/general/depth_clamp.c
@@ -36,8 +36,10 @@
 
 #include "piglit-util.h"
 
-int piglit_width = 100, piglit_height = 150;
-int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH;
+PIGLIT_GL_TEST_MAIN(
+    100 /*window_width*/,
+    150 /*window_height*/,
+    GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH)
 
 void
 piglit_init(int argc, char **argv)
diff --git a/tests/general/depthfunc.c b/tests/general/depthfunc.c
index 2591f7452..a433b212e 100644
--- a/tests/general/depthfunc.c
+++ b/tests/general/depthfunc.c
@@ -33,9 +33,10 @@
 #include "piglit-util.h"
 #include "piglit-framework.h"
 
-int piglit_width = 100;
-int piglit_height = 200;
-int piglit_window_mode = GLUT_RGB | GLUT_ALPHA | GLUT_DEPTH;
+PIGLIT_GL_TEST_MAIN(
+    100 /*window_width*/,
+    200 /*window_height*/,
+    GLUT_RGB | GLUT_ALPHA | GLUT_DEPTH)
 
 /**
  * Convenience function to draw an axis-aligned rectangle.
diff --git a/tests/general/depthrange-clear.c b/tests/general/depthrange-clear.c
index 0e895b758..e9b6f4ae0 100644
--- a/tests/general/depthrange-clear.c
+++ b/tests/general/depthrange-clear.c
@@ -33,8 +33,10 @@
 
 #include "piglit-util.h"
 
-int piglit_width = 100, piglit_height = 100;
-int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH;
+PIGLIT_GL_TEST_MAIN(
+    100 /*window_width*/,
+    100 /*window_height*/,
+    GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH)
 
 /**
  * Convenience function to draw an axis-aligned rectangle.
diff --git a/tests/general/dlist-clear.c b/tests/general/dlist-clear.c
index 7efc5653e..b65a00561 100644
--- a/tests/general/dlist-clear.c
+++ b/tests/general/dlist-clear.c
@@ -34,8 +34,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/general/dlist-color-material.c b/tests/general/dlist-color-material.c
index 92ff50a16..0e5bfaa6e 100644
--- a/tests/general/dlist-color-material.c
+++ b/tests/general/dlist-color-material.c
@@ -35,11 +35,10 @@
 #include <assert.h>
 #include "piglit-util.h"
 
-int piglit_width = 100;
-int piglit_height = 100;
-int piglit_window_mode = GLUT_DOUBLE;
-
-
+PIGLIT_GL_TEST_MAIN(
+    100 /*window_width*/,
+    100 /*window_height*/,
+    GLUT_DOUBLE)
 
 /**
  * Test glMaterial handling in a display list for one of GL_AMBIENT,
diff --git a/tests/general/dlist-fdo3129-01.c b/tests/general/dlist-fdo3129-01.c
index b71eabefa..3cbb382e1 100644
--- a/tests/general/dlist-fdo3129-01.c
+++ b/tests/general/dlist-fdo3129-01.c
@@ -31,9 +31,10 @@
 #include "piglit-util.h"
 #include "piglit-framework.h"
 
-int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
-int piglit_width = 256;
-int piglit_height = 256;
+PIGLIT_GL_TEST_MAIN(
+    256 /*window_width*/,
+    256 /*window_height*/,
+    GLUT_RGB | GLUT_DOUBLE)
 
 static GLuint list;
 
diff --git a/tests/general/dlist-fdo3129-02.c b/tests/general/dlist-fdo3129-02.c
index 23c2e5077..cdfaab4d8 100644
--- a/tests/general/dlist-fdo3129-02.c
+++ b/tests/general/dlist-fdo3129-02.c
@@ -31,9 +31,10 @@
 #include "piglit-util.h"
 #include "piglit-framework.h"
 
-int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
-int piglit_width = 256;
-int piglit_height = 256;
+PIGLIT_GL_TEST_MAIN(
+    256 /*window_width*/,
+    256 /*window_height*/,
+    GLUT_RGB | GLUT_DOUBLE)
 
 static GLuint list;
 
diff --git a/tests/general/dlist-fdo31590.c b/tests/general/dlist-fdo31590.c
index 820b301ff..cd2b53ef4 100644
--- a/tests/general/dlist-fdo31590.c
+++ b/tests/general/dlist-fdo31590.c
@@ -38,9 +38,10 @@
 
 static const char *TestName = "dlist-fdo31590";
 
-int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
-int piglit_width = 500, piglit_height = 500;
-
+PIGLIT_GL_TEST_MAIN(
+    500 /*window_width*/,
+    500 /*window_height*/,
+    GLUT_RGB | GLUT_DOUBLE)
 
 static const GLfloat ctrlpoints[4][3] = {
    { -4.0, -4.0, 0.0}, { -2.0, 4.0, 0.0}, 
diff --git a/tests/general/draw-arrays-colormaterial.c b/tests/general/draw-arrays-colormaterial.c
index a15f558e2..c2c9ce64c 100644
--- a/tests/general/draw-arrays-colormaterial.c
+++ b/tests/general/draw-arrays-colormaterial.c
@@ -32,9 +32,10 @@
 
 #include "piglit-util.h"
 
-int piglit_width = 100, piglit_height = 100;
-int piglit_window_mode = GLUT_RGBA | GLUT_ALPHA | GLUT_DOUBLE;
-
+PIGLIT_GL_TEST_MAIN(
+    100 /*window_width*/,
+    100 /*window_height*/,
+    GLUT_RGBA | GLUT_ALPHA | GLUT_DOUBLE)
 
 #define DX0 -0.6
 
diff --git a/tests/general/draw-batch.c b/tests/general/draw-batch.c
index a9cc120ee..2d9126ae4 100644
--- a/tests/general/draw-batch.c
+++ b/tests/general/draw-batch.c
@@ -24,8 +24,10 @@
 
 #include "piglit-util.h"
 
-int piglit_width = 100, piglit_height = 130;
-int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
+PIGLIT_GL_TEST_MAIN(
+    100 /*window_width*/,
+    130 /*window_height*/,
+    GLUT_RGB | GLUT_DOUBLE)
 
 void
 piglit_init(int argc, char **argv)
diff --git a/tests/general/draw-copypixels-sync.c b/tests/general/draw-copypixels-sync.c
index e0832fb8b..a9ed1f8d2 100644
--- a/tests/general/draw-copypixels-sync.c
+++ b/tests/general/draw-copypixels-sync.c
@@ -31,9 +31,10 @@
 #include "piglit-util.h"
 #include "piglit-framework.h"
 
-int piglit_width = 64;
-int piglit_height = 64;
-int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE | GLUT_ALPHA;
+PIGLIT_GL_TEST_MAIN(
+    64 /*window_width*/,
+    64 /*window_height*/,
+    GLUT_RGB | GLUT_DOUBLE | GLUT_ALPHA)
 
 enum piglit_result
 piglit_display(void)
diff --git a/tests/general/draw-elements-base-vertex-bounds.c b/tests/general/draw-elements-base-vertex-bounds.c
index bdcdba762..572352f06 100644
--- a/tests/general/draw-elements-base-vertex-bounds.c
+++ b/tests/general/draw-elements-base-vertex-bounds.c
@@ -35,8 +35,10 @@
 
 #include "piglit-util.h"
 
-int piglit_width = 300, piglit_height = 300;
-int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
+PIGLIT_GL_TEST_MAIN(
+    300 /*window_width*/,
+    300 /*window_height*/,
+    GLUT_RGB | GLUT_DOUBLE)
 
 static GLfloat vertices[][4] = {
 	{  1, -1, 0, 1 }, /* bottom right */
diff --git a/tests/general/draw-elements-base-vertex-neg.c b/tests/general/draw-elements-base-vertex-neg.c
index ce45d74d9..0a8cd27ba 100644
--- a/tests/general/draw-elements-base-vertex-neg.c
+++ b/tests/general/draw-elements-base-vertex-neg.c
@@ -26,8 +26,10 @@
 
 #include "piglit-util.h"
 
-int piglit_width = 320, piglit_height = 80;
-int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
+PIGLIT_GL_TEST_MAIN(
+    320 /*window_width*/,
+    80 /*window_height*/,
+    GLUT_RGB | GLUT_DOUBLE)
 
 GLboolean user_va = GL_FALSE;
 
diff --git a/tests/general/draw-elements-base-vertex.c b/tests/general/draw-elements-base-vertex.c
index f61d86e0e..04a8af4ce 100644
--- a/tests/general/draw-elements-base-vertex.c
+++ b/tests/general/draw-elements-base-vertex.c
@@ -32,8 +32,10 @@
 
 #include "piglit-util.h"
 
-int piglit_width = 300, piglit_height = 300;
-int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
+PIGLIT_GL_TEST_MAIN(
+    300 /*window_width*/,
+    300 /*window_height*/,
+    GLUT_RGB | GLUT_DOUBLE)
 
 #define NUM_QUADS  10
 
diff --git a/tests/general/draw-elements-vs-inputs.c b/tests/general/draw-elements-vs-inputs.c
index 53e91c1b9..eb0e1af8a 100644
--- a/tests/general/draw-elements-vs-inputs.c
+++ b/tests/general/draw-elements-vs-inputs.c
@@ -39,10 +39,10 @@
 
 #include "piglit-util.h"
 
-
-int piglit_width = 300, piglit_height = 300;
-int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
-
+PIGLIT_GL_TEST_MAIN(
+    300 /*window_width*/,
+    300 /*window_height*/,
+    GLUT_RGB | GLUT_DOUBLE)
 
 void
 piglit_init(int argc, char **argv)
diff --git a/tests/general/draw-elements.c b/tests/general/draw-elements.c
index ea3b926a3..b26b4fc00 100644
--- a/tests/general/draw-elements.c
+++ b/tests/general/draw-elements.c
@@ -31,8 +31,10 @@
 
 #include "piglit-util.h"
 
-int piglit_width = 320, piglit_height = 60;
-int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
+PIGLIT_GL_TEST_MAIN(
+    320 /*window_width*/,
+    60 /*window_height*/,
+    GLUT_RGB | GLUT_DOUBLE)
 
 GLboolean user = GL_FALSE;
 
diff --git a/tests/general/draw-instanced-divisor.c b/tests/general/draw-instanced-divisor.c
index 19dda7ccf..d7151c05e 100644
--- a/tests/general/draw-instanced-divisor.c
+++ b/tests/general/draw-instanced-divisor.c
@@ -29,9 +29,10 @@
 
 #include "piglit-util.h"
 
-
-int piglit_width = 500, piglit_height = 500;
-int piglit_window_mode = GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE;
+PIGLIT_GL_TEST_MAIN(
+    500 /*window_width*/,
+    500 /*window_height*/,
+    GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE)
 
 static const char *TestName = "draw-instanced";
 
diff --git a/tests/general/draw-instanced.c b/tests/general/draw-instanced.c
index 445108e76..00ea4d6de 100644
--- a/tests/general/draw-instanced.c
+++ b/tests/general/draw-instanced.c
@@ -29,9 +29,10 @@
 
 #include "piglit-util.h"
 
-
-int piglit_width = 500, piglit_height = 500;
-int piglit_window_mode = GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE;
+PIGLIT_GL_TEST_MAIN(
+    500 /*window_width*/,
+    500 /*window_height*/,
+    GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE)
 
 static const char *TestName = "draw-instanced";
 
diff --git a/tests/general/draw-pixel-with-texture.c b/tests/general/draw-pixel-with-texture.c
index 952afb129..92e667823 100644
--- a/tests/general/draw-pixel-with-texture.c
+++ b/tests/general/draw-pixel-with-texture.c
@@ -23,8 +23,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)
 
 #define SCREEN_SIZE_IN_PIXELS	(piglit_width * piglit_height * 4)
 
diff --git a/tests/general/draw-pixels.c b/tests/general/draw-pixels.c
index 6fe7feb3b..8a6e3390c 100644
--- a/tests/general/draw-pixels.c
+++ b/tests/general/draw-pixels.c
@@ -51,9 +51,10 @@
 /** Convert GLint in [-2147483648,2147483647] to GLfloat in [-1.0,1.0] */
 #define INT_TO_FLOAT(I)     ((GLfloat) ((2.0F * (I) + 1.0F) * (1.0F/4294967294.0)))
 
-int piglit_window_mode = GLUT_DOUBLE | GLUT_RGBA | GLUT_ALPHA |
-			 GLUT_DEPTH | GLUT_STENCIL;
-int piglit_width = 16, piglit_height = 16;
+PIGLIT_GL_TEST_MAIN(
+    16 /*window_width*/,
+    16 /*window_height*/,
+    GLUT_DOUBLE | GLUT_RGBA | GLUT_ALPHA | GLUT_DEPTH | GLUT_STENCIL)
 
 const GLuint idx0 = 0, idx1 = 1, idx2 = 2, idx3 = 3;
 static GLfloat expected[100][4];
diff --git a/tests/general/draw-sync.c b/tests/general/draw-sync.c
index 50804510f..881fc2c89 100644
--- a/tests/general/draw-sync.c
+++ b/tests/general/draw-sync.c
@@ -31,9 +31,10 @@
 #include "piglit-util.h"
 #include "piglit-framework.h"
 
-int piglit_width = 64;
-int piglit_height = 64;
-int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE | GLUT_ALPHA;
+PIGLIT_GL_TEST_MAIN(
+    64 /*window_width*/,
+    64 /*window_height*/,
+    GLUT_RGB | GLUT_DOUBLE | GLUT_ALPHA)
 
 enum piglit_result
 piglit_display(void)
diff --git a/tests/general/draw-vertices-half-float.c b/tests/general/draw-vertices-half-float.c
index 3255658f5..95f7b9b88 100644
--- a/tests/general/draw-vertices-half-float.c
+++ b/tests/general/draw-vertices-half-float.c
@@ -31,8 +31,10 @@
 
 #include "piglit-util.h"
 
-int piglit_width = 320, piglit_height = 60;
-int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
+PIGLIT_GL_TEST_MAIN(
+    320 /*window_width*/,
+    60 /*window_height*/,
+    GLUT_RGB | GLUT_DOUBLE)
 
 GLboolean user_va = GL_FALSE;
 
diff --git a/tests/general/draw-vertices.c b/tests/general/draw-vertices.c
index 81408c2c4..b23d5f8f7 100644
--- a/tests/general/draw-vertices.c
+++ b/tests/general/draw-vertices.c
@@ -31,8 +31,10 @@
 
 #include "piglit-util.h"
 
-int piglit_width = 320, piglit_height = 60;
-int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
+PIGLIT_GL_TEST_MAIN(
+    320 /*window_width*/,
+    60 /*window_height*/,
+    GLUT_RGB | GLUT_DOUBLE)
 
 GLboolean user_va = GL_FALSE;
 
diff --git a/tests/general/drawpix-z.c b/tests/general/drawpix-z.c
index 58f0a89b1..3cc4096d6 100644
--- a/tests/general/drawpix-z.c
+++ b/tests/general/drawpix-z.c
@@ -36,9 +36,9 @@
 
 #include "piglit-util.h"
 
-int piglit_width = 200, piglit_height = 200;
-int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH;
-
+PIGLIT_GL_TEST_MAIN(200 /*window_width*/,
+                    200 /*window_height*/,
+                    GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH);
 
 static void
 draw_z_gradient(GLfloat zLeft, GLfloat zRight)
diff --git a/tests/general/early-z.c b/tests/general/early-z.c
index a8eca342a..e56c2f021 100644
--- a/tests/general/early-z.c
+++ b/tests/general/early-z.c
@@ -29,10 +29,10 @@
 
 #include "piglit-util.h"
 
-
-int piglit_width = 128;
-int piglit_height = 128;
-int piglit_window_mode = GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE | GLUT_DEPTH;
+PIGLIT_GL_TEST_MAIN(
+    128 /*window_width*/,
+    128 /*window_height*/,
+    GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE | GLUT_DEPTH)
 
 GLint u_zval;
 
diff --git a/tests/general/fog-modes.c b/tests/general/fog-modes.c
index c06790fd7..35cdf4b5a 100644
--- a/tests/general/fog-modes.c
+++ b/tests/general/fog-modes.c
@@ -34,9 +34,10 @@
 #undef far
 #endif
 
-int piglit_width = 100;
-int 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)
 
 enum piglit_result
 piglit_display(void)
diff --git a/tests/general/fragment-center.c b/tests/general/fragment-center.c
index 631668d0a..16049dbfb 100644
--- a/tests/general/fragment-center.c
+++ b/tests/general/fragment-center.c
@@ -23,8 +23,10 @@
 
 #include "piglit-util.h"
 
-int piglit_width = 96, piglit_height = 96;
-int piglit_window_mode = GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE;
+PIGLIT_GL_TEST_MAIN(
+    96 /*window_width*/,
+    96 /*window_height*/,
+    GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE)
 
 enum piglit_result
 piglit_display(void)
diff --git a/tests/general/framebuffer-srgb.c b/tests/general/framebuffer-srgb.c
index c741ac68e..eca8b87e5 100644
--- a/tests/general/framebuffer-srgb.c
+++ b/tests/general/framebuffer-srgb.c
@@ -34,8 +34,10 @@
 
 #include "piglit-util.h"
 
-int piglit_width = 128, piglit_height = 128;
-int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
+PIGLIT_GL_TEST_MAIN(
+    128 /*window_width*/,
+    128 /*window_height*/,
+    GLUT_RGB | GLUT_DOUBLE)
 
 /* size of texture/renderbuffer (power of two) */
 #define FBO_SIZE 128
diff --git a/tests/general/getactiveattrib.c b/tests/general/getactiveattrib.c
index 8fb3e26a1..fc92d5ade 100644
--- a/tests/general/getactiveattrib.c
+++ b/tests/general/getactiveattrib.c
@@ -31,8 +31,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)
 
 struct attribute {
 	/** Name of the attribute. */
diff --git a/tests/general/geterror-inside-begin.c b/tests/general/geterror-inside-begin.c
index aefabb644..cd9bcd2b7 100644
--- a/tests/general/geterror-inside-begin.c
+++ b/tests/general/geterror-inside-begin.c
@@ -35,8 +35,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/general/geterror-invalid-enum.c b/tests/general/geterror-invalid-enum.c
index 3402601d7..9002d893d 100644
--- a/tests/general/geterror-invalid-enum.c
+++ b/tests/general/geterror-invalid-enum.c
@@ -22,8 +22,10 @@
  */
 #include "piglit-util.h"
 
-int piglit_width = 10, piglit_height = 10;
-int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
+PIGLIT_GL_TEST_MAIN(
+    10 /*window_width*/,
+    10 /*window_height*/,
+    GLUT_RGB | GLUT_DOUBLE)
 
 enum piglit_result
 piglit_display(void)
diff --git a/tests/general/gl30basic.c b/tests/general/gl30basic.c
index 3cb548510..6cc67d8fd 100644
--- a/tests/general/gl30basic.c
+++ b/tests/general/gl30basic.c
@@ -34,9 +34,10 @@
 #include "piglit-util.h"
 #include "piglit-framework.h"
 
-int piglit_width = 100;
-int piglit_height = 100;
-int piglit_window_mode = GLUT_DOUBLE | GLUT_RGB | GLUT_DEPTH | GLUT_STENCIL;
+PIGLIT_GL_TEST_MAIN(
+    100 /*window_width*/,
+    100 /*window_height*/,
+    GLUT_DOUBLE | GLUT_RGB | GLUT_DEPTH | GLUT_STENCIL)
 
 static const char *Prog = "gl30basic";
 
diff --git a/tests/general/hiz.c b/tests/general/hiz.c
index 90211cbb2..07d67a3f7 100644
--- a/tests/general/hiz.c
+++ b/tests/general/hiz.c
@@ -33,9 +33,10 @@
 #include "piglit-util.h"
 #include "piglit-framework.h"
 
-int piglit_width = 400;
-int piglit_height = 400;
-int piglit_window_mode = GLUT_RGB | GLUT_DEPTH | GLUT_DOUBLE;
+PIGLIT_GL_TEST_MAIN(
+    400 /*window_width*/,
+    400 /*window_height*/,
+    GLUT_RGB | GLUT_DEPTH | GLUT_DOUBLE)
 
 enum {
 	INSIDE,
diff --git a/tests/general/infinite-spot-light.c b/tests/general/infinite-spot-light.c
index bcae72dc3..278b54205 100644
--- a/tests/general/infinite-spot-light.c
+++ b/tests/general/infinite-spot-light.c
@@ -41,8 +41,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)
 
 /* Already normalized, and 0.5 would be the expected color */
 static GLfloat dir[3] = {0.866025404, 0.0, 0.5};
diff --git a/tests/general/isbufferobj.c b/tests/general/isbufferobj.c
index bb369a9b6..5a95a22c6 100644
--- a/tests/general/isbufferobj.c
+++ b/tests/general/isbufferobj.c
@@ -35,9 +35,10 @@
 #include "piglit-util.h"
 #include "piglit-framework.h"
 
-int piglit_width = 100;
-int piglit_height = 100;
-int piglit_window_mode = GLUT_RGB;
+PIGLIT_GL_TEST_MAIN(
+    100 /*window_width*/,
+    100 /*window_height*/,
+    GLUT_RGB)
 
 static const char *TestName = "isbufferobj";
 
diff --git a/tests/general/line-aa-width.c b/tests/general/line-aa-width.c
index 4cd560cf3..604783680 100644
--- a/tests/general/line-aa-width.c
+++ b/tests/general/line-aa-width.c
@@ -38,8 +38,10 @@
 
 #include "piglit-util.h"
 
-int piglit_width = 300, piglit_height = 100;
-int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
+PIGLIT_GL_TEST_MAIN(
+    300 /*window_width*/,
+    100 /*window_height*/,
+    GLUT_RGB | GLUT_DOUBLE)
 
 static float
 y_from_x(float x)
diff --git a/tests/general/linestipple.c b/tests/general/linestipple.c
index f1e19edd6..36ec57aaa 100644
--- a/tests/general/linestipple.c
+++ b/tests/general/linestipple.c
@@ -28,8 +28,10 @@
 
 #include "piglit-util.h"
 
-int piglit_width = 128, piglit_height = 128;
-int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
+PIGLIT_GL_TEST_MAIN(
+    128 /*window_width*/,
+    128 /*window_height*/,
+    GLUT_RGB | GLUT_DOUBLE)
 
 static void probe_pixel(int x, int y, const float* expected)
 {
diff --git a/tests/general/longprim.c b/tests/general/longprim.c
index 7a3ad68f8..a2f21ed4a 100644
--- a/tests/general/longprim.c
+++ b/tests/general/longprim.c
@@ -31,9 +31,10 @@
 #include "piglit-util.h"
 #include "piglit-framework.h"
 
-int piglit_width = 100;
-int 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 *TestName = "longprim";
 
diff --git a/tests/general/object_purgeable-api-pbo.c b/tests/general/object_purgeable-api-pbo.c
index 80cb22694..cab51c22e 100644
--- a/tests/general/object_purgeable-api-pbo.c
+++ b/tests/general/object_purgeable-api-pbo.c
@@ -32,8 +32,10 @@
 #include "piglit-util.h"
 #include "object_purgeable.h"
 
-int piglit_width = 100, piglit_height = 100;
-int piglit_window_mode = GLUT_RGB;
+PIGLIT_GL_TEST_MAIN(
+    100 /*window_width*/,
+    100 /*window_height*/,
+    GLUT_RGB)
 
 void
 piglit_init(int argc, char **argv)
diff --git a/tests/general/object_purgeable-api-texture.c b/tests/general/object_purgeable-api-texture.c
index 59bce5db9..2e78a879b 100644
--- a/tests/general/object_purgeable-api-texture.c
+++ b/tests/general/object_purgeable-api-texture.c
@@ -32,8 +32,10 @@
 #include "piglit-util.h"
 #include "object_purgeable.h"
 
-int piglit_width = 100, piglit_height = 100;
-int piglit_window_mode = GLUT_RGB;
+PIGLIT_GL_TEST_MAIN(
+    100 /*window_width*/,
+    100 /*window_height*/,
+    GLUT_RGB)
 
 void
 piglit_init(int argc, char **argv)
diff --git a/tests/general/object_purgeable-api-vbo.c b/tests/general/object_purgeable-api-vbo.c
index 0253497c0..4b8ba88c7 100644
--- a/tests/general/object_purgeable-api-vbo.c
+++ b/tests/general/object_purgeable-api-vbo.c
@@ -32,8 +32,10 @@
 #include "piglit-util.h"
 #include "object_purgeable.h"
 
-int piglit_width = 100, piglit_height = 100;
-int piglit_window_mode = GLUT_RGB;
+PIGLIT_GL_TEST_MAIN(
+    100 /*window_width*/,
+    100 /*window_height*/,
+    GLUT_RGB)
 
 void
 piglit_init(int argc, char **argv)
diff --git a/tests/general/occlusion-query-discard.c b/tests/general/occlusion-query-discard.c
index 88b039c45..b35fb64db 100644
--- a/tests/general/occlusion-query-discard.c
+++ b/tests/general/occlusion-query-discard.c
@@ -33,8 +33,10 @@
 
 #include "piglit-util.h"
 
-int piglit_width = 50, piglit_height = 50;
-int piglit_window_mode = GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE;
+PIGLIT_GL_TEST_MAIN(
+    50 /*window_width*/,
+    50 /*window_height*/,
+    GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE)
 
 static char vs_code[] =
 	"varying float do_discard;\n"
diff --git a/tests/general/occlusion_query.c b/tests/general/occlusion_query.c
index ed39369db..8a4f7eafa 100644
--- a/tests/general/occlusion_query.c
+++ b/tests/general/occlusion_query.c
@@ -31,8 +31,10 @@
 
 #include "piglit-util.h"
 
-int piglit_width = 180, piglit_height = 100;
-int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH;
+PIGLIT_GL_TEST_MAIN(
+    180 /*window_width*/,
+    100 /*window_height*/,
+    GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH)
 
 #define MAX_QUERIES 5
 static GLuint occ_queries[MAX_QUERIES];
diff --git a/tests/general/oes-read-format.c b/tests/general/oes-read-format.c
index 4a76cbca5..660190a30 100644
--- a/tests/general/oes-read-format.c
+++ b/tests/general/oes-read-format.c
@@ -33,8 +33,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/general/pbo-drawpixels.c b/tests/general/pbo-drawpixels.c
index e1a17ba78..c60a2a0aa 100644
--- a/tests/general/pbo-drawpixels.c
+++ b/tests/general/pbo-drawpixels.c
@@ -33,8 +33,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/general/pbo-read-argb8888.c b/tests/general/pbo-read-argb8888.c
index 487b6b136..1947c8628 100644
--- a/tests/general/pbo-read-argb8888.c
+++ b/tests/general/pbo-read-argb8888.c
@@ -34,8 +34,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 GLboolean
 probe(int x, int y, uint32_t expected, uint32_t observed)
diff --git a/tests/general/pbo-readpixels-small.c b/tests/general/pbo-readpixels-small.c
index 0b9d43c43..54ff1ce48 100644
--- a/tests/general/pbo-readpixels-small.c
+++ b/tests/general/pbo-readpixels-small.c
@@ -38,8 +38,10 @@
 
 #include "piglit-util.h"
 
-int piglit_width = 2, piglit_height = 2;
-int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
+PIGLIT_GL_TEST_MAIN(
+    2 /*window_width*/,
+    2 /*window_height*/,
+    GLUT_RGB | GLUT_DOUBLE)
 
 static GLboolean
 probe(int x, int y, uint32_t expected, uint32_t observed)
diff --git a/tests/general/pbo-teximage-tiling-2.c b/tests/general/pbo-teximage-tiling-2.c
index 6677105f8..185e5f51d 100644
--- a/tests/general/pbo-teximage-tiling-2.c
+++ b/tests/general/pbo-teximage-tiling-2.c
@@ -34,8 +34,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/general/pbo-teximage-tiling.c b/tests/general/pbo-teximage-tiling.c
index 16c0dbafe..6ab31d13f 100644
--- a/tests/general/pbo-teximage-tiling.c
+++ b/tests/general/pbo-teximage-tiling.c
@@ -34,8 +34,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/general/pbo-teximage.c b/tests/general/pbo-teximage.c
index 058d5191c..3fb840d33 100644
--- a/tests/general/pbo-teximage.c
+++ b/tests/general/pbo-teximage.c
@@ -32,8 +32,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/general/point-line-no-cull.c b/tests/general/point-line-no-cull.c
index a411ad088..aa5254f6f 100644
--- a/tests/general/point-line-no-cull.c
+++ b/tests/general/point-line-no-cull.c
@@ -32,10 +32,10 @@
 
 #include "piglit-util.h"
 
-
-int piglit_width = 120, piglit_height = 120;
-int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
-
+PIGLIT_GL_TEST_MAIN(
+    120 /*window_width*/,
+    120 /*window_height*/,
+    GLUT_RGB | GLUT_DOUBLE)
 
 /** Test if the pixels at (x,y) and (x,y+1) are black.
  * We test two pixels to be sure we hit the primitive we drew.  We could
diff --git a/tests/general/polygon-mode.c b/tests/general/polygon-mode.c
index fdd95cc97..4eb515166 100644
--- a/tests/general/polygon-mode.c
+++ b/tests/general/polygon-mode.c
@@ -30,9 +30,10 @@
 
 #include "piglit-util.h"
 
-
-int piglit_width = 500, piglit_height = 100;
-int piglit_window_mode = GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE;
+PIGLIT_GL_TEST_MAIN(
+    500 /*window_width*/,
+    100 /*window_height*/,
+    GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE)
 
 static float ortho_left = -1, ortho_right = 8, ortho_bottom = -2, ortho_top = 2;
 
diff --git a/tests/general/pos-array.c b/tests/general/pos-array.c
index e4f0fe9d7..3c1616009 100644
--- a/tests/general/pos-array.c
+++ b/tests/general/pos-array.c
@@ -32,8 +32,10 @@
 
 #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 const char *TestName = "pos-array";
 
diff --git a/tests/general/primitive-restart.c b/tests/general/primitive-restart.c
index fc1f9fd03..cbeb882b8 100644
--- a/tests/general/primitive-restart.c
+++ b/tests/general/primitive-restart.c
@@ -33,8 +33,10 @@
 
 #include "piglit-util.h"
 
-int piglit_width = 400, piglit_height = 300;
-int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
+PIGLIT_GL_TEST_MAIN(
+    400 /*window_width*/,
+    300 /*window_height*/,
+    GLUT_RGB | GLUT_DOUBLE)
 
 static const char *TestName = "primitive-restart";
 
diff --git a/tests/general/provoking-vertex.c b/tests/general/provoking-vertex.c
index d8d6d77b7..07da8e0f6 100644
--- a/tests/general/provoking-vertex.c
+++ b/tests/general/provoking-vertex.c
@@ -33,8 +33,10 @@
 
 #include "piglit-util.h"
 
-int piglit_width = 400, piglit_height = 300;
-int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
+PIGLIT_GL_TEST_MAIN(
+    400 /*window_width*/,
+    300 /*window_height*/,
+    GLUT_RGB | GLUT_DOUBLE)
 
 void
 piglit_init(int argc, char **argv)
diff --git a/tests/general/quad-invariance.c b/tests/general/quad-invariance.c
index 06ef451cb..9652c148d 100644
--- a/tests/general/quad-invariance.c
+++ b/tests/general/quad-invariance.c
@@ -38,8 +38,10 @@
 
 #include "piglit-util.h"
 
-int piglit_width = 128, piglit_height = 128;
-int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
+PIGLIT_GL_TEST_MAIN(
+    128 /*window_width*/,
+    128 /*window_height*/,
+    GLUT_RGB | GLUT_DOUBLE)
 
 enum piglit_result
 piglit_display(void)
diff --git a/tests/general/read-front.c b/tests/general/read-front.c
index 562cf1e86..221042128 100644
--- a/tests/general/read-front.c
+++ b/tests/general/read-front.c
@@ -37,8 +37,10 @@
 
 #include "piglit-util.h"
 
-int piglit_width = 100, piglit_height = 100;
-int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH | GLUT_STENCIL;
+PIGLIT_GL_TEST_MAIN(
+    100 /*window_width*/,
+    100 /*window_height*/,
+    GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH | GLUT_STENCIL)
 
 enum piglit_result
 piglit_display(void)
diff --git a/tests/general/readpix-z.c b/tests/general/readpix-z.c
index 51867685b..b7506b049 100644
--- a/tests/general/readpix-z.c
+++ b/tests/general/readpix-z.c
@@ -29,10 +29,9 @@
 
 #include "piglit-util.h"
 
-int piglit_width = 200, piglit_height = 200;
-int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH;
-
-
+PIGLIT_GL_TEST_MAIN(200 /*window_width*/,
+                    200 /*window_height*/,
+                    GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH);
 
 static void
 draw_z_gradient(GLfloat zLeft, GLfloat zRight)
diff --git a/tests/general/roundmode-getintegerv.c b/tests/general/roundmode-getintegerv.c
index e89ce02da..789d5403f 100644
--- a/tests/general/roundmode-getintegerv.c
+++ b/tests/general/roundmode-getintegerv.c
@@ -44,9 +44,10 @@
 
 #include <fenv.h>
 
-int piglit_window_mode = GLUT_DOUBLE;
-int piglit_width = 10;
-int piglit_height = 10;
+PIGLIT_GL_TEST_MAIN(
+    10 /*window_width*/,
+    10 /*window_height*/,
+    GLUT_DOUBLE)
 
 enum piglit_result
 piglit_display(void)
diff --git a/tests/general/roundmode-pixelstore.c b/tests/general/roundmode-pixelstore.c
index 6aac78586..cbc173b94 100644
--- a/tests/general/roundmode-pixelstore.c
+++ b/tests/general/roundmode-pixelstore.c
@@ -41,9 +41,10 @@
 
 #include <fenv.h>
 
-int piglit_window_mode = GLUT_DOUBLE;
-int piglit_width = 10;
-int piglit_height = 10;
+PIGLIT_GL_TEST_MAIN(
+    10 /*window_width*/,
+    10 /*window_height*/,
+    GLUT_DOUBLE)
 
 enum piglit_result
 piglit_display(void)
diff --git a/tests/general/scissor-bitmap.c b/tests/general/scissor-bitmap.c
index b3434129e..94a739d85 100644
--- a/tests/general/scissor-bitmap.c
+++ b/tests/general/scissor-bitmap.c
@@ -34,9 +34,10 @@
 #include "piglit-util.h"
 #include "piglit-framework.h"
 
-int piglit_width = 400;
-int piglit_height = 400;
-int piglit_window_mode = GLUT_DOUBLE | GLUT_RGB;
+PIGLIT_GL_TEST_MAIN(
+    400 /*window_width*/,
+    400 /*window_height*/,
+    GLUT_DOUBLE | GLUT_RGB)
 
 struct probes {
 	struct test_position {
diff --git a/tests/general/scissor-clear.c b/tests/general/scissor-clear.c
index 8fbf8f20d..c47bd9c2a 100644
--- a/tests/general/scissor-clear.c
+++ b/tests/general/scissor-clear.c
@@ -32,8 +32,10 @@
 
 #include "piglit-util.h"
 
-int piglit_width = 100, piglit_height = 100;
-int piglit_window_mode = GLUT_DOUBLE | GLUT_RGB;
+PIGLIT_GL_TEST_MAIN(
+    100 /*window_width*/,
+    100 /*window_height*/,
+    GLUT_DOUBLE | GLUT_RGB)
 
 enum piglit_result
 piglit_display(void)
diff --git a/tests/general/scissor-copypixels.c b/tests/general/scissor-copypixels.c
index 9efc2e06a..91af0f290 100644
--- a/tests/general/scissor-copypixels.c
+++ b/tests/general/scissor-copypixels.c
@@ -32,8 +32,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 GLboolean
 check_red_box_surrounded_by_green(int x, int y, int w, int h)
diff --git a/tests/general/scissor-depth-clear.c b/tests/general/scissor-depth-clear.c
index b40b1c180..a153b9b1d 100644
--- a/tests/general/scissor-depth-clear.c
+++ b/tests/general/scissor-depth-clear.c
@@ -32,8 +32,10 @@
 
 #include "piglit-util.h"
 
-int piglit_width = 100, piglit_height = 100;
-int piglit_window_mode = GLUT_DOUBLE | GLUT_RGB | GLUT_DEPTH | GLUT_STENCIL;
+PIGLIT_GL_TEST_MAIN(
+    100 /*window_width*/,
+    100 /*window_height*/,
+    GLUT_DOUBLE | GLUT_RGB | GLUT_DEPTH | GLUT_STENCIL)
 
 enum piglit_result
 piglit_display(void)
diff --git a/tests/general/scissor-many.c b/tests/general/scissor-many.c
index f33e2fa03..6ad4d63ce 100644
--- a/tests/general/scissor-many.c
+++ b/tests/general/scissor-many.c
@@ -35,8 +35,10 @@
 
 #include "piglit-util.h"
 
-int piglit_width = 100, piglit_height = 100;
-int piglit_window_mode = GLUT_DOUBLE | GLUT_RGB | GLUT_DEPTH | GLUT_STENCIL;
+PIGLIT_GL_TEST_MAIN(
+    100 /*window_width*/,
+    100 /*window_height*/,
+    GLUT_DOUBLE | GLUT_RGB | GLUT_DEPTH | GLUT_STENCIL)
 
 enum piglit_result
 piglit_display(void)
diff --git a/tests/general/scissor-offscreen.c b/tests/general/scissor-offscreen.c
index 9ea970bad..5412bcbba 100644
--- a/tests/general/scissor-offscreen.c
+++ b/tests/general/scissor-offscreen.c
@@ -36,9 +36,10 @@
 
 #include "piglit-util.h"
 
-int piglit_width = 64;
-int piglit_height = 64;
-int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
+PIGLIT_GL_TEST_MAIN(
+    64 /*window_width*/,
+    64 /*window_height*/,
+    GLUT_RGB | GLUT_DOUBLE)
 
 enum piglit_result
 piglit_display(void)
diff --git a/tests/general/scissor-stencil-clear.c b/tests/general/scissor-stencil-clear.c
index 96587c613..b3ca4b962 100644
--- a/tests/general/scissor-stencil-clear.c
+++ b/tests/general/scissor-stencil-clear.c
@@ -32,8 +32,10 @@
 
 #include "piglit-util.h"
 
-int piglit_width = 100, piglit_height = 100;
-int piglit_window_mode = GLUT_DOUBLE | GLUT_RGB | GLUT_DEPTH | GLUT_STENCIL;
+PIGLIT_GL_TEST_MAIN(
+    100 /*window_width*/,
+    100 /*window_height*/,
+    GLUT_DOUBLE | GLUT_RGB | GLUT_DEPTH | GLUT_STENCIL)
 
 enum piglit_result
 piglit_display(void)
diff --git a/tests/general/select.c b/tests/general/select.c
index fa60e39d9..c913b3b4d 100644
--- a/tests/general/select.c
+++ b/tests/general/select.c
@@ -34,9 +34,10 @@
 #include "piglit-util.h"
 #include "piglit-framework.h"
 
-int piglit_width = 100;
-int piglit_height = 100;
-int piglit_window_mode = GLUT_RGB | GLUT_ALPHA | GLUT_DEPTH | GLUT_STENCIL;
+PIGLIT_GL_TEST_MAIN(
+    100 /*window_width*/,
+    100 /*window_height*/,
+    GLUT_RGB | GLUT_ALPHA | GLUT_DEPTH | GLUT_STENCIL)
 
 GLuint ReferenceHitEntries[3][64];
 #define NAME_STACK_DEPTH	0
diff --git a/tests/general/stencil-drawpixels.c b/tests/general/stencil-drawpixels.c
index a3df086bc..33b16d444 100644
--- a/tests/general/stencil-drawpixels.c
+++ b/tests/general/stencil-drawpixels.c
@@ -32,8 +32,10 @@
 
 #include "piglit-util.h"
 
-int piglit_width = 100, piglit_height = 100;
-int piglit_window_mode = GLUT_DOUBLE | GLUT_RGB | GLUT_DEPTH | GLUT_STENCIL;
+PIGLIT_GL_TEST_MAIN(
+    100 /*window_width*/,
+    100 /*window_height*/,
+    GLUT_DOUBLE | GLUT_RGB | GLUT_DEPTH | GLUT_STENCIL)
 
 enum piglit_result
 piglit_display(void)
diff --git a/tests/general/stencil-twoside.c b/tests/general/stencil-twoside.c
index 2d2d623fd..66f93c3a3 100644
--- a/tests/general/stencil-twoside.c
+++ b/tests/general/stencil-twoside.c
@@ -36,9 +36,12 @@
 #include "piglit-util.h"
 
 static int use20syntax = 1;
-int piglit_width = 650;
-int piglit_height = 200;
-int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH | GLUT_STENCIL;
+
+PIGLIT_GL_TEST_MAIN(
+    650 /*window_width*/,
+    200 /*window_height*/,
+    GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH | GLUT_STENCIL)
+
 static const GLfloat Near = 5.0, Far = 25.0;
 
 
diff --git a/tests/general/stencil-wrap.c b/tests/general/stencil-wrap.c
index cc7fbea35..49c3950d3 100644
--- a/tests/general/stencil-wrap.c
+++ b/tests/general/stencil-wrap.c
@@ -34,9 +34,10 @@
 
 #include "piglit-util.h"
 
-int piglit_width = 550;
-int piglit_height = 200;
-int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH | GLUT_STENCIL;
+PIGLIT_GL_TEST_MAIN(
+    550 /*window_width*/,
+    200 /*window_height*/,
+    GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH | GLUT_STENCIL)
 
 enum piglit_result
 piglit_display(void)
diff --git a/tests/general/sync_api.c b/tests/general/sync_api.c
index cd9d8c3fa..efb67e383 100644
--- a/tests/general/sync_api.c
+++ b/tests/general/sync_api.c
@@ -31,9 +31,10 @@
 
 #include "piglit-util.h"
 
-int piglit_window_mode = GLUT_RGB;
-int piglit_width = 400;
-int piglit_height = 300;
+PIGLIT_GL_TEST_MAIN(
+    400 /*window_width*/,
+    300 /*window_height*/,
+    GLUT_RGB)
 
 #define FAIL_ON_ERROR(string)						\
 	do {								\
diff --git a/tests/general/texgen.c b/tests/general/texgen.c
index a05eaeafb..88c640f20 100644
--- a/tests/general/texgen.c
+++ b/tests/general/texgen.c
@@ -28,9 +28,10 @@
 
 #include "piglit-util.h"
 
-int piglit_width = 128;
-int piglit_height = 128;
-int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
+PIGLIT_GL_TEST_MAIN(
+    128 /*window_width*/,
+    128 /*window_height*/,
+    GLUT_RGB | GLUT_DOUBLE)
 
 static int CurrentTest = 0;
 static int UseFragmentProgram = 0;
diff --git a/tests/general/texunits.c b/tests/general/texunits.c
index 667a7b484..b056df807 100644
--- a/tests/general/texunits.c
+++ b/tests/general/texunits.c
@@ -30,10 +30,10 @@
 
 #include "piglit-util.h"
 
-
-int piglit_width = 128, piglit_height = 128;
-int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
-
+PIGLIT_GL_TEST_MAIN(
+    128 /*window_width*/,
+    128 /*window_height*/,
+    GLUT_RGB | GLUT_DOUBLE)
 
 /** random number for checking state */
 static GLfloat Random[128][4];
diff --git a/tests/general/timer_query.c b/tests/general/timer_query.c
index 3e9a29b37..fc42cde59 100644
--- a/tests/general/timer_query.c
+++ b/tests/general/timer_query.c
@@ -33,8 +33,10 @@
 
 #include "piglit-util.h"
 
-int piglit_width = 180, piglit_height = 100;
-int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH;
+PIGLIT_GL_TEST_MAIN(
+    180 /*window_width*/,
+    100 /*window_height*/,
+    GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH)
 
 static GLuint timer_query;
 
diff --git a/tests/general/triangle-rasterization-overdraw.cpp b/tests/general/triangle-rasterization-overdraw.cpp
index 69d0508c4..073a426a5 100644
--- a/tests/general/triangle-rasterization-overdraw.cpp
+++ b/tests/general/triangle-rasterization-overdraw.cpp
@@ -70,9 +70,11 @@ bool break_on_fail = false;
 int random_test_count = 10;
 
 /* Piglit variables */
-int piglit_width = 1000;
-int piglit_height = 1000;
-int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
+
+PIGLIT_GL_TEST_MAIN(
+    1000 /*window_width*/,
+    1000 /*window_height*/,
+    GLUT_RGB | GLUT_DOUBLE)
 
 /* Globals */
 int test_id = 0;
diff --git a/tests/general/triangle-rasterization.cpp b/tests/general/triangle-rasterization.cpp
index 1a9c85511..fd9dae5d1 100644
--- a/tests/general/triangle-rasterization.cpp
+++ b/tests/general/triangle-rasterization.cpp
@@ -98,9 +98,11 @@ int fbo_width = 256;
 int fbo_height = 256;
 
 /* Piglit variables */
-int piglit_width = fbo_width;
-int piglit_height = fbo_height;
-int piglit_window_mode = GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE;
+
+PIGLIT_GL_TEST_MAIN(
+    fbo_width /*window_width*/,
+    fbo_height /*window_height*/,
+    GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE)
 
 /* Globals */
 int test_id = 0;
diff --git a/tests/general/two-sided-lighting-separate-specular.c b/tests/general/two-sided-lighting-separate-specular.c
index 45792df0c..83a986f92 100644
--- a/tests/general/two-sided-lighting-separate-specular.c
+++ b/tests/general/two-sided-lighting-separate-specular.c
@@ -34,9 +34,10 @@
 
 #include "piglit-util.h"
 
-int piglit_width = 256, piglit_height = 256;
-int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
-
+PIGLIT_GL_TEST_MAIN(
+    256 /*window_width*/,
+    256 /*window_height*/,
+    GLUT_RGB | GLUT_DOUBLE)
 
 static const GLfloat red[4] = {1, 0, 0, 0};
 static const GLfloat green[4] = {0, 1, 0, 1};
diff --git a/tests/general/two-sided-lighting.c b/tests/general/two-sided-lighting.c
index 8820d3a89..2cc3eeb19 100644
--- a/tests/general/two-sided-lighting.c
+++ b/tests/general/two-sided-lighting.c
@@ -34,9 +34,10 @@
 
 #include "piglit-util.h"
 
-int piglit_width = 256, piglit_height = 256;
-int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
-
+PIGLIT_GL_TEST_MAIN(
+    256 /*window_width*/,
+    256 /*window_height*/,
+    GLUT_RGB | GLUT_DOUBLE)
 
 static const GLfloat green[4] = {0, 1, 0, 1};
 static const GLfloat blue[4] = {0, 0, 1, 1};
diff --git a/tests/general/user-clip.c b/tests/general/user-clip.c
index ab95940d0..cbe4d17c7 100644
--- a/tests/general/user-clip.c
+++ b/tests/general/user-clip.c
@@ -32,13 +32,10 @@
 
 #define BOX_SIZE   32
 
-
-int piglit_window_mode = GLUT_DOUBLE;
-int piglit_width = 100;
-int piglit_height = 100;
-
-
-
+PIGLIT_GL_TEST_MAIN(
+    100 /*window_width*/,
+    100 /*window_height*/,
+    GLUT_DOUBLE)
 
 static const GLfloat clear_color[4] = { 0.5, 0.5, 0.5, 1.0 };
 
diff --git a/tests/general/vao-01.c b/tests/general/vao-01.c
index 71e4fd782..f0c40ba0f 100644
--- a/tests/general/vao-01.c
+++ b/tests/general/vao-01.c
@@ -38,9 +38,10 @@
 
 #include "piglit-util.h"
 
-int piglit_width = 400;
-int piglit_height = 200;
-int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
+PIGLIT_GL_TEST_MAIN(
+    400 /*window_width*/,
+    200 /*window_height*/,
+    GLUT_RGB | GLUT_DOUBLE)
 
 enum piglit_result
 piglit_display(void)
diff --git a/tests/general/vao-02.c b/tests/general/vao-02.c
index 093e0a804..95c26b5d1 100644
--- a/tests/general/vao-02.c
+++ b/tests/general/vao-02.c
@@ -38,9 +38,10 @@
 
 #include "piglit-util.h"
 
-int piglit_width = 400;
-int piglit_height = 200;
-int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
+PIGLIT_GL_TEST_MAIN(
+    400 /*window_width*/,
+    200 /*window_height*/,
+    GLUT_RGB | GLUT_DOUBLE)
 
 enum piglit_result
 piglit_display(void)
diff --git a/tests/general/vao-element-array-buffer.c b/tests/general/vao-element-array-buffer.c
index fc438ef8c..2f6724711 100644
--- a/tests/general/vao-element-array-buffer.c
+++ b/tests/general/vao-element-array-buffer.c
@@ -30,9 +30,10 @@
 
 #include "piglit-util.h"
 
-int piglit_width = 100;
-int 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 GLuint vao;
 
diff --git a/tests/general/varray-disabled.c b/tests/general/varray-disabled.c
index cbd453d54..b5b403e7a 100644
--- a/tests/general/varray-disabled.c
+++ b/tests/general/varray-disabled.c
@@ -36,8 +36,10 @@
 
 #include "piglit-util.h"
 
-int piglit_width = 128, piglit_height = 128;
-int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
+PIGLIT_GL_TEST_MAIN(
+    128 /*window_width*/,
+    128 /*window_height*/,
+    GLUT_RGB | GLUT_DOUBLE)
 
 static void
 set_colors(GLfloat *color_array, GLfloat *color)
diff --git a/tests/general/vbo-bufferdata.c b/tests/general/vbo-bufferdata.c
index a0469552b..0dba3df50 100644
--- a/tests/general/vbo-bufferdata.c
+++ b/tests/general/vbo-bufferdata.c
@@ -27,8 +27,10 @@
 
 #include "piglit-util.h"
 
-int piglit_width = 400, piglit_height = 300;
-int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
+PIGLIT_GL_TEST_MAIN(
+    400 /*window_width*/,
+    300 /*window_height*/,
+    GLUT_RGB | GLUT_DOUBLE)
 
 static GLuint vbo;
 
diff --git a/tests/general/vbo-map-remap.c b/tests/general/vbo-map-remap.c
index 82ab06d67..87e3350cc 100644
--- a/tests/general/vbo-map-remap.c
+++ b/tests/general/vbo-map-remap.c
@@ -26,8 +26,10 @@
 
 #include "piglit-util.h"
 
-int piglit_width = 400, piglit_height = 300;
-int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
+PIGLIT_GL_TEST_MAIN(
+    400 /*window_width*/,
+    300 /*window_height*/,
+    GLUT_RGB | GLUT_DOUBLE)
 
 static GLuint vbo;
 
diff --git a/tests/general/vbo-subdata-sync.c b/tests/general/vbo-subdata-sync.c
index e4baef253..af2788cdd 100644
--- a/tests/general/vbo-subdata-sync.c
+++ b/tests/general/vbo-subdata-sync.c
@@ -32,8 +32,10 @@
 
 #include "piglit-util.h"
 
-int piglit_width = 400, piglit_height = 300;
-int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
+PIGLIT_GL_TEST_MAIN(
+    400 /*window_width*/,
+    300 /*window_height*/,
+    GLUT_RGB | GLUT_DOUBLE)
 
 static GLuint vbo;
 
diff --git a/tests/general/vbo-subdata-zero.c b/tests/general/vbo-subdata-zero.c
index d0199fadd..cb4787338 100644
--- a/tests/general/vbo-subdata-zero.c
+++ b/tests/general/vbo-subdata-zero.c
@@ -26,8 +26,10 @@
 
 #include "piglit-util.h"
 
-int piglit_width = 400, piglit_height = 300;
-int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
+PIGLIT_GL_TEST_MAIN(
+    400 /*window_width*/,
+    300 /*window_height*/,
+    GLUT_RGB | GLUT_DOUBLE)
 
 static GLuint vbo;
 
diff --git a/tests/general/vs-point_size-zero.c b/tests/general/vs-point_size-zero.c
index f44b0bbd4..de8cc3709 100644
--- a/tests/general/vs-point_size-zero.c
+++ b/tests/general/vs-point_size-zero.c
@@ -24,9 +24,10 @@
 
 #include "piglit-util.h"
 
-int piglit_width = 100, piglit_height = 50;
-int piglit_window_mode = GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE;
-
+PIGLIT_GL_TEST_MAIN(
+    100 /*window_width*/,
+    50 /*window_height*/,
+    GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE)
 
 static const char *vstext =
    "void main() \n"