9 files changed, 36 insertions, 19 deletions
diff --git a/tests/spec/arb_copy_buffer/copy_buffer_coherency.c b/tests/spec/arb_copy_buffer/copy_buffer_coherency.c
index 04c4a1184..6115dac6c 100644
--- a/tests/spec/arb_copy_buffer/copy_buffer_coherency.c
+++ b/tests/spec/arb_copy_buffer/copy_buffer_coherency.c
@@ -31,8 +31,10 @@
 uint8_t src_data[COPY_BUFFER_SIZE];
 uint8_t dest_data[COPY_BUFFER_SIZE];
 
-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)
 
 enum piglit_result
 piglit_display(void)
diff --git a/tests/spec/arb_copy_buffer/copybuffersubdata.c b/tests/spec/arb_copy_buffer/copybuffersubdata.c
index 4b0adfc4b..7d41222b5 100644
--- a/tests/spec/arb_copy_buffer/copybuffersubdata.c
+++ b/tests/spec/arb_copy_buffer/copybuffersubdata.c
@@ -30,9 +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 bool
 test_copy(void)
diff --git a/tests/spec/arb_copy_buffer/dlist.c b/tests/spec/arb_copy_buffer/dlist.c
index 8caf340c8..34bf3dd09 100644
--- a/tests/spec/arb_copy_buffer/dlist.c
+++ b/tests/spec/arb_copy_buffer/dlist.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/spec/arb_copy_buffer/get.c b/tests/spec/arb_copy_buffer/get.c
index eefce1152..8ec966aa9 100644
--- a/tests/spec/arb_copy_buffer/get.c
+++ b/tests/spec/arb_copy_buffer/get.c
@@ -28,8 +28,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/arb_copy_buffer/negative-bound-zero.c b/tests/spec/arb_copy_buffer/negative-bound-zero.c
index 732eec397..91fb75343 100644
--- a/tests/spec/arb_copy_buffer/negative-bound-zero.c
+++ b/tests/spec/arb_copy_buffer/negative-bound-zero.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)
 
 enum piglit_result
 piglit_display(void)
diff --git a/tests/spec/arb_copy_buffer/negative-bounds.c b/tests/spec/arb_copy_buffer/negative-bounds.c
index aa0a6abe0..605702f8f 100644
--- a/tests/spec/arb_copy_buffer/negative-bounds.c
+++ b/tests/spec/arb_copy_buffer/negative-bounds.c
@@ -37,8 +37,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/arb_copy_buffer/negative-mapped.c b/tests/spec/arb_copy_buffer/negative-mapped.c
index 0029cdcf1..1cc296a1e 100644
--- a/tests/spec/arb_copy_buffer/negative-mapped.c
+++ b/tests/spec/arb_copy_buffer/negative-mapped.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)
 
 enum piglit_result
 piglit_display(void)
diff --git a/tests/spec/arb_copy_buffer/overlap.c b/tests/spec/arb_copy_buffer/overlap.c
index 7b6cf7b6e..62b62f8e3 100644
--- a/tests/spec/arb_copy_buffer/overlap.c
+++ b/tests/spec/arb_copy_buffer/overlap.c
@@ -36,8 +36,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 void
 test_copy(GLenum usage, int data_size, int src, int dst, int size)
diff --git a/tests/spec/arb_copy_buffer/targets.c b/tests/spec/arb_copy_buffer/targets.c
index 5d3c7f4de..7378ea642 100644
--- a/tests/spec/arb_copy_buffer/targets.c
+++ b/tests/spec/arb_copy_buffer/targets.c
@@ -47,8 +47,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)