Rename PIGLIT_SUCCESS and PIGLIT_FAILURE to PIGLIT_PASS and PIGLIT_FAIL, resp.

377 files changed, 904 insertions, 907 deletions

diff --git a/tests/asmparsertest/asmparsertest.c b/tests/asmparsertest/asmparsertest.c
index 9ab25ba26..085ec1b63 100644
--- a/tests/asmparsertest/asmparsertest.c
+++ b/tests/asmparsertest/asmparsertest.c
@@ -112,7 +112,7 @@ compile(const char *filename, GLenum target, int use_ARB)
 
 	buf = piglit_load_text_file(filename, &sz);
 	if (buf == NULL) {
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 
@@ -195,7 +195,7 @@ compile(const char *filename, GLenum target, int use_ARB)
 		}
 
 		if ((err == GL_NO_ERROR) != (expected_fail == FALSE)) {
-			piglit_report_result(PIGLIT_FAILURE);
+			piglit_report_result(PIGLIT_FAIL);
 		}
 	}
 
@@ -228,7 +228,7 @@ main(int argc, char **argv)
 	}
 
 	if ((argc - i) < 2) {
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 
@@ -248,13 +248,13 @@ main(int argc, char **argv)
 		piglit_require_extension("GL_NV_fragment_program");
 		use_ARB = 0;
 	} else {
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	for (i++; i < argc; i++) {
 		compile(argv[i], target, use_ARB);
 	}
 
-	piglit_report_result(PIGLIT_SUCCESS);
+	piglit_report_result(PIGLIT_PASS);
 	return 0;
 }
diff --git a/tests/bugs/crash-cubemap-order.c b/tests/bugs/crash-cubemap-order.c
index d7d254c0e..b323a5f03 100644
--- a/tests/bugs/crash-cubemap-order.c
+++ b/tests/bugs/crash-cubemap-order.c
@@ -12,7 +12,7 @@ static int Width = 100, Height = 100;
 
 static void Display(void)
 {
-	piglit_report_result(PIGLIT_SUCCESS);
+	piglit_report_result(PIGLIT_PASS);
 }
 
 static void init(void)
diff --git a/tests/bugs/crash-texparameter-before-teximage.c b/tests/bugs/crash-texparameter-before-teximage.c
index ffa887605..987de00b4 100644
--- a/tests/bugs/crash-texparameter-before-teximage.c
+++ b/tests/bugs/crash-texparameter-before-teximage.c
@@ -14,7 +14,7 @@ static int Width = 100, Height = 100;
 
 static void Display(void)
 {
-	piglit_report_result(PIGLIT_SUCCESS);
+	piglit_report_result(PIGLIT_PASS);
 }
 
 static void init(void)
diff --git a/tests/bugs/fdo20701.c b/tests/bugs/fdo20701.c
index e5a1b592d..279de10af 100644
--- a/tests/bugs/fdo20701.c
+++ b/tests/bugs/fdo20701.c
@@ -103,9 +103,9 @@ init(void)
 		printf("%s:%u: framebuffer status = 0x%04x\n",
 			   __FUNCTION__, __LINE__, status);
 		if (status == GL_FRAMEBUFFER_UNSUPPORTED_EXT)
-			piglit_report_result(PIGLIT_SUCCESS);
+			piglit_report_result(PIGLIT_PASS);
 		else
-			piglit_report_result(PIGLIT_FAILURE);
+			piglit_report_result(PIGLIT_FAIL);
 	}
 }
 
diff --git a/tests/bugs/fdo22540.c b/tests/bugs/fdo22540.c
index 9e9e94354..f9f09a5f6 100644
--- a/tests/bugs/fdo22540.c
+++ b/tests/bugs/fdo22540.c
@@ -88,7 +88,7 @@ display(void)
 	glutSwapBuffers();
 
 	if (Automatic)
-		piglit_report_result(pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE);
+		piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
 
 }
 
diff --git a/tests/bugs/fdo23489.c b/tests/bugs/fdo23489.c
index b4420046b..e28befd97 100644
--- a/tests/bugs/fdo23489.c
+++ b/tests/bugs/fdo23489.c
@@ -18,7 +18,7 @@ static void display(void)
 	glFlush();
 
 	if (Automatic) {
-		piglit_report_result(PIGLIT_SUCCESS);
+		piglit_report_result(PIGLIT_PASS);
 	}
 }
 
diff --git a/tests/bugs/fdo23670-depth_test.c b/tests/bugs/fdo23670-depth_test.c
index 6625e2a01..685d49928 100644
--- a/tests/bugs/fdo23670-depth_test.c
+++ b/tests/bugs/fdo23670-depth_test.c
@@ -79,5 +79,5 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/bugs/fdo23670-drawpix_stencil.c b/tests/bugs/fdo23670-drawpix_stencil.c
index 08f8bf11a..ab0bfbac7 100644
--- a/tests/bugs/fdo23670-drawpix_stencil.c
+++ b/tests/bugs/fdo23670-drawpix_stencil.c
@@ -75,5 +75,5 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/bugs/fdo24066.c b/tests/bugs/fdo24066.c
index 32e2fc9a1..07aacf801 100644
--- a/tests/bugs/fdo24066.c
+++ b/tests/bugs/fdo24066.c
@@ -42,7 +42,7 @@ int piglit_height = 16;
 
 enum piglit_result piglit_display(void)
 {
-	return PIGLIT_SUCCESS;
+	return PIGLIT_PASS;
 }
 
 
@@ -68,5 +68,5 @@ void piglit_init(int argc, char ** argv)
 	printf("Testing whether the following call crashes...\n");
 	glGetProgramivARB(GL_VERTEX_PROGRAM_ARB, GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB, &result);
 
-	piglit_report_result(PIGLIT_SUCCESS);
+	piglit_report_result(PIGLIT_PASS);
 }
diff --git a/tests/bugs/fdo25614-genmipmap.c b/tests/bugs/fdo25614-genmipmap.c
index 06deb361d..4182ce258 100644
--- a/tests/bugs/fdo25614-genmipmap.c
+++ b/tests/bugs/fdo25614-genmipmap.c
@@ -152,5 +152,5 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/bugs/fdo28551.c b/tests/bugs/fdo28551.c
index 52c709253..3a0de62ea 100644
--- a/tests/bugs/fdo28551.c
+++ b/tests/bugs/fdo28551.c
@@ -45,7 +45,7 @@ piglit_display(void)
 	if (att_type != GL_FRAMEBUFFER_DEFAULT) {
 		printf("Default framebuffer's attachment type is not GL_FRAMEBUFFER_DEFAULT\n");
 		while (glGetError());
-		return PIGLIT_FAILURE;
+		return PIGLIT_FAIL;
 	}
 
 	glGetFramebufferAttachmentParameteriv(GL_FRAMEBUFFER,
@@ -58,10 +58,10 @@ piglit_display(void)
 	err = glGetError();
 	if (err) {
 		printf("glGetFramebufferAttachmentParameteriv GL error: 0x%x\n", err);
-		return PIGLIT_FAILURE;
+		return PIGLIT_FAIL;
 	}
 
-       	return PIGLIT_SUCCESS;
+       	return PIGLIT_PASS;
 }
 
 void piglit_init(int argc, char **argv)
diff --git a/tests/bugs/point-sprite.c b/tests/bugs/point-sprite.c
index 8e3c65be2..5ef138221 100644
--- a/tests/bugs/point-sprite.c
+++ b/tests/bugs/point-sprite.c
@@ -141,5 +141,5 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/bugs/r300-readcache.c b/tests/bugs/r300-readcache.c
index cfc78e3f4..e7587fa56 100644
--- a/tests/bugs/r300-readcache.c
+++ b/tests/bugs/r300-readcache.c
@@ -59,7 +59,7 @@ enum piglit_result piglit_display(void)
 								x, y, color,
 								colors[color][0], colors[color][1], colors[color][2],
 								result[0], result[1], result[2]);
-							return PIGLIT_FAILURE;
+							return PIGLIT_FAIL;
 						}
 					}
 				}
@@ -67,7 +67,7 @@ enum piglit_result piglit_display(void)
 		}
 	}
 
-	return PIGLIT_SUCCESS;
+	return PIGLIT_PASS;
 }
 
 void piglit_init(int argc, char **argv)
diff --git a/tests/bugs/tex1d-2dborder.c b/tests/bugs/tex1d-2dborder.c
index 035472d78..5a0527946 100644
--- a/tests/bugs/tex1d-2dborder.c
+++ b/tests/bugs/tex1d-2dborder.c
@@ -98,7 +98,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void piglit_init(int argc, char **argv)
diff --git a/tests/bugs/tri-tex-crash.c b/tests/bugs/tri-tex-crash.c
index 68cd52017..e36c447ea 100644
--- a/tests/bugs/tri-tex-crash.c
+++ b/tests/bugs/tri-tex-crash.c
@@ -100,9 +100,9 @@ piglit_display(void)
    glEnd();
 
    if (piglit_probe_pixel_rgb(piglit_width-5, piglit_height-20, red))
-      result = PIGLIT_SUCCESS;
+      result = PIGLIT_PASS;
    else
-      result = PIGLIT_FAILURE;
+      result = PIGLIT_FAIL;
 
    glutSwapBuffers();
 
diff --git a/tests/bugs/vbo-buffer-unmap.c b/tests/bugs/vbo-buffer-unmap.c
index 509c65e89..021a75eee 100644
--- a/tests/bugs/vbo-buffer-unmap.c
+++ b/tests/bugs/vbo-buffer-unmap.c
@@ -78,7 +78,7 @@ piglit_display(void)
 
    glutSwapBuffers();
 
-   return PIGLIT_SUCCESS;
+   return PIGLIT_PASS;
 }
 
 
diff --git a/tests/egl/egl-create-surface.c b/tests/egl/egl-create-surface.c
index e3e26e600..83ac51070 100644
--- a/tests/egl/egl-create-surface.c
+++ b/tests/egl/egl-create-surface.c
@@ -55,16 +55,16 @@ draw(struct egl_state *state)
 				      state->cfg, state->win, NULL);
 	if (surf != EGL_NO_SURFACE) {
 		fprintf(stderr, "eglCreateWindowSurface() didn't fail\n");
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	if (eglGetError() != EGL_BAD_ALLOC) {
 		fprintf(stderr, "eglCreateWindowSurface() "
 			"error wasn't EGL_BAD_ALLOC\n");
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
-	return PIGLIT_SUCCESS;
+	return PIGLIT_PASS;
 }
 
 static const char *extensions[] = { NULL };
diff --git a/tests/egl/egl-nok-swap-region.c b/tests/egl/egl-nok-swap-region.c
index c02195ff0..1da2d1b7b 100644
--- a/tests/egl/egl-nok-swap-region.c
+++ b/tests/egl/egl-nok-swap-region.c
@@ -53,7 +53,7 @@ draw(struct egl_state *state)
 
 	if (swap_buffers_region == NULL) {
 		fprintf(stderr, "could not getproc eglSwapBuffersRegionNOK");
-		piglit_report_result(PIGLIT_SUCCESS);
+		piglit_report_result(PIGLIT_PASS);
 	}
 
 	/* Clear background to green */
@@ -67,9 +67,9 @@ draw(struct egl_state *state)
 	for (i = 0; i < 16; i += 4)
 		if (!piglit_probe_pixel_rgba(rects[i] + 5,
 					     rects[i + 1] + 5, red))
-			return PIGLIT_FAILURE;
+			return PIGLIT_FAIL;
 
-	return PIGLIT_SUCCESS;
+	return PIGLIT_PASS;
 }
 
 static const struct egl_test test = {
diff --git a/tests/egl/egl-nok-texture-from-pixmap.c b/tests/egl/egl-nok-texture-from-pixmap.c
index e46187acd..0c6dc9ac5 100644
--- a/tests/egl/egl-nok-texture-from-pixmap.c
+++ b/tests/egl/egl-nok-texture-from-pixmap.c
@@ -53,7 +53,7 @@ draw(struct egl_state *state)
 				EGL_Y_INVERTED_NOK, &inv)) {
 		fprintf(stderr,
 			"eglGetConfigAttrib(EGL_Y_INVERTED_NOK) failed\n");
-		return PIGLIT_FAILURE;
+		return PIGLIT_FAIL;
 	}
 	
 	printf("EGL_Y_INVERTED_NOK: %s\n", inv ? "TRUE" : "FALSE");
@@ -61,7 +61,7 @@ draw(struct egl_state *state)
 	pixmap = egl_util_create_pixmap(state, 100, 100, pixmap_attribs);
 	if (!eglMakeCurrent(state->egl_dpy, pixmap, pixmap, state->ctx)) {
 		fprintf(stderr, "eglMakeCurrent() failed\n");
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 	
 	/* Clear pixmap to purple */
@@ -71,7 +71,7 @@ draw(struct egl_state *state)
 	if (!eglMakeCurrent(state->egl_dpy,
 			    state->surf, state->surf, state->ctx)) {
 		fprintf(stderr, "eglMakeCurrent() failed\n");
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	glViewport(0, 0, state->width, state->height);
@@ -95,9 +95,9 @@ draw(struct egl_state *state)
 	    !piglit_probe_pixel_rgba(50, 50, purple) ||
 	    !piglit_probe_pixel_rgba(110, 110, purple) ||
 	    !piglit_probe_pixel_rgba(130, 130, red))
-		return PIGLIT_FAILURE;
+		return PIGLIT_FAIL;
 
-	return PIGLIT_SUCCESS;
+	return PIGLIT_PASS;
 }
 
 static const struct egl_test test = {
diff --git a/tests/egl/egl-util.c b/tests/egl/egl-util.c
index c44b41f0a..b7ae4b2c6 100644
--- a/tests/egl/egl-util.c
+++ b/tests/egl/egl-util.c
@@ -75,14 +75,14 @@ create_window(struct egl_state *state)
 	if (!eglGetConfigAttrib(state->egl_dpy,
 				state->cfg, EGL_NATIVE_VISUAL_ID, &id)) {
 		fprintf(stderr, "eglGetConfigAttrib() failed\n");
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	template.visualid = id;
 	vinfo = XGetVisualInfo(state->dpy, VisualIDMask, &template, &count);
 	if (count != 1) {
 		fprintf(stderr, "XGetVisualInfo() failed\n");
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	state->depth = vinfo->depth;
@@ -107,7 +107,7 @@ static enum piglit_result
 event_loop(struct egl_state *state, const struct egl_test *test)
 {
 	XEvent event;
-	enum piglit_result result = PIGLIT_FAILURE;
+	enum piglit_result result = PIGLIT_FAIL;
 
 	while (1) {
 		XNextEvent (state->dpy, &event);
@@ -164,7 +164,7 @@ egl_util_run(const struct egl_test *test, int argc, char *argv[])
 	state.dpy = XOpenDisplay(NULL);
 	if (state.dpy == NULL) {
 		fprintf(stderr, "couldn't open display\n");
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	eglBindAPI(EGL_OPENGL_API);
@@ -172,12 +172,12 @@ egl_util_run(const struct egl_test *test, int argc, char *argv[])
 	state.egl_dpy = eglGetDisplay(state.dpy);
 	if (state.egl_dpy == EGL_NO_DISPLAY) {
 		fprintf(stderr, "eglGetDisplay() failed\n");
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	if (!eglInitialize(state.egl_dpy, &state.major, &state.minor)) {
 		fprintf(stderr, "eglInitialize() failed\n");
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	check_extensions(&state, test);
@@ -185,14 +185,14 @@ egl_util_run(const struct egl_test *test, int argc, char *argv[])
 	if (!eglChooseConfig(state.egl_dpy, attribs, &state.cfg, 1, &count) ||
 	    count == 0) {
 		fprintf(stderr, "eglChooseConfig() failed\n");
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	state.ctx = eglCreateContext(state.egl_dpy, state.cfg,
 				     EGL_NO_CONTEXT, NULL);
 	if (state.ctx == EGL_NO_CONTEXT) {
 		fprintf(stderr, "eglCreateContext() failed\n");
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	state.width = 300;
@@ -203,13 +203,13 @@ egl_util_run(const struct egl_test *test, int argc, char *argv[])
 					    state.cfg, state.win, NULL);
 	if (state.surf == EGL_NO_SURFACE) {
 		fprintf(stderr, "eglCreateWindowSurface() failed\n");
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	if (!eglMakeCurrent(state.egl_dpy,
 			    state.surf, state.surf, state.ctx)) {
 		fprintf(stderr, "eglMakeCurrent() failed\n");
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	result = event_loop(&state, test);
diff --git a/tests/fbo/fbo-1d.c b/tests/fbo/fbo-1d.c
index 6572cfd95..b998f0b4b 100644
--- a/tests/fbo/fbo-1d.c
+++ b/tests/fbo/fbo-1d.c
@@ -137,7 +137,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void piglit_init(int argc, char **argv)
diff --git a/tests/fbo/fbo-3d.c b/tests/fbo/fbo-3d.c
index 1340e97ab..c5287e294 100644
--- a/tests/fbo/fbo-3d.c
+++ b/tests/fbo/fbo-3d.c
@@ -178,7 +178,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void piglit_init(int argc, char **argv)
diff --git a/tests/fbo/fbo-alpha.c b/tests/fbo/fbo-alpha.c
index 479dabea4..48da59ba5 100644
--- a/tests/fbo/fbo-alpha.c
+++ b/tests/fbo/fbo-alpha.c
@@ -138,7 +138,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/fbo/fbo-alphatest-formats.c b/tests/fbo/fbo-alphatest-formats.c
index 8a7ac5de4..0c8d30800 100644
--- a/tests/fbo/fbo-alphatest-formats.c
+++ b/tests/fbo/fbo-alphatest-formats.c
@@ -273,7 +273,7 @@ static enum piglit_result test_format(const struct format_desc *format, GLenum b
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 enum piglit_result piglit_display(void)
diff --git a/tests/fbo/fbo-array.c b/tests/fbo/fbo-array.c
index 458b0016b..fa3b78aff 100644
--- a/tests/fbo/fbo-array.c
+++ b/tests/fbo/fbo-array.c
@@ -207,7 +207,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void piglit_init(int argc, char **argv)
diff --git a/tests/fbo/fbo-blending-formats.c b/tests/fbo/fbo-blending-formats.c
index 5b806465f..96372107e 100644
--- a/tests/fbo/fbo-blending-formats.c
+++ b/tests/fbo/fbo-blending-formats.c
@@ -324,7 +324,7 @@ static enum piglit_result test_format(const struct format_desc *format, GLenum b
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 enum piglit_result piglit_display(void)
diff --git a/tests/fbo/fbo-blit-d24s8.c b/tests/fbo/fbo-blit-d24s8.c
index 324082b9f..f5373aa14 100644
--- a/tests/fbo/fbo-blit-d24s8.c
+++ b/tests/fbo/fbo-blit-d24s8.c
@@ -196,7 +196,7 @@ run_test(void)
 	err = glGetError();
 	if (err != GL_NO_ERROR) {
 		printf("Unexpected GL error state 0x%04x\n", err);
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	/* WIN(bottom) -> FBO(middle) */
@@ -241,7 +241,7 @@ piglit_display(void)
 {
 	GLboolean pass = run_test();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 
diff --git a/tests/fbo/fbo-blit.c b/tests/fbo/fbo-blit.c
index 81442515a..c1b8b2a81 100644
--- a/tests/fbo/fbo-blit.c
+++ b/tests/fbo/fbo-blit.c
@@ -205,7 +205,7 @@ piglit_display(void)
 {
 	GLboolean pass = run_test();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 
diff --git a/tests/fbo/fbo-clear-formats.c b/tests/fbo/fbo-clear-formats.c
index 7272de53e..b58a470e9 100644
--- a/tests/fbo/fbo-clear-formats.c
+++ b/tests/fbo/fbo-clear-formats.c
@@ -425,7 +425,7 @@ test_format(const struct format_desc *format, GLenum baseformat)
 
 	glDeleteTextures(1, &tex);
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 enum piglit_result piglit_display(void)
diff --git a/tests/fbo/fbo-clearmipmap.c b/tests/fbo/fbo-clearmipmap.c
index 15bf776ed..36a2b8d3a 100644
--- a/tests/fbo/fbo-clearmipmap.c
+++ b/tests/fbo/fbo-clearmipmap.c
@@ -166,5 +166,5 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/fbo/fbo-copypix.c b/tests/fbo/fbo-copypix.c
index 73162e06b..87dde533b 100644
--- a/tests/fbo/fbo-copypix.c
+++ b/tests/fbo/fbo-copypix.c
@@ -202,7 +202,7 @@ piglit_display(void)
 {
 	GLboolean pass = run_test();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 
diff --git a/tests/fbo/fbo-copyteximage-simple.c b/tests/fbo/fbo-copyteximage-simple.c
index dc163c0a3..a22f2f9e7 100644
--- a/tests/fbo/fbo-copyteximage-simple.c
+++ b/tests/fbo/fbo-copyteximage-simple.c
@@ -135,7 +135,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void piglit_init(int argc, char **argv)
diff --git a/tests/fbo/fbo-copyteximage.c b/tests/fbo/fbo-copyteximage.c
index 376d0cf69..876bb9032 100644
--- a/tests/fbo/fbo-copyteximage.c
+++ b/tests/fbo/fbo-copyteximage.c
@@ -138,7 +138,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void piglit_init(int argc, char **argv)
diff --git a/tests/fbo/fbo-cubemap.c b/tests/fbo/fbo-cubemap.c
index de011932c..266a0cad1 100644
--- a/tests/fbo/fbo-cubemap.c
+++ b/tests/fbo/fbo-cubemap.c
@@ -195,7 +195,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void piglit_init(int argc, char **argv)
diff --git a/tests/fbo/fbo-depth-array.c b/tests/fbo/fbo-depth-array.c
index 6e93c72c5..8c796c4d4 100644
--- a/tests/fbo/fbo-depth-array.c
+++ b/tests/fbo/fbo-depth-array.c
@@ -230,7 +230,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void piglit_init(int argc, char **argv)
diff --git a/tests/fbo/fbo-depth-sample-compare.c b/tests/fbo/fbo-depth-sample-compare.c
index 96ff6d1bd..6f64ba0a5 100644
--- a/tests/fbo/fbo-depth-sample-compare.c
+++ b/tests/fbo/fbo-depth-sample-compare.c
@@ -303,9 +303,9 @@ count_and_report_bad_pixels(void)
 
    /* XXX this error test is a total hack for now */
    if (error > ErrorScale)
-      return PIGLIT_FAILURE;
+      return PIGLIT_FAIL;
    else
-      return PIGLIT_SUCCESS;
+      return PIGLIT_PASS;
 }
 
 
diff --git a/tests/fbo/fbo-depth.c b/tests/fbo/fbo-depth.c
index cac5af58a..daa3a1de9 100644
--- a/tests/fbo/fbo-depth.c
+++ b/tests/fbo/fbo-depth.c
@@ -194,7 +194,7 @@ enum piglit_result piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void piglit_init(int argc, char **argv)
diff --git a/tests/fbo/fbo-depthtex.c b/tests/fbo/fbo-depthtex.c
index 26e5f0c3f..a6653e304 100644
--- a/tests/fbo/fbo-depthtex.c
+++ b/tests/fbo/fbo-depthtex.c
@@ -135,7 +135,7 @@ enum piglit_result piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void piglit_init(int argc, char **argv)
diff --git a/tests/fbo/fbo-draw-buffers-blend.c b/tests/fbo/fbo-draw-buffers-blend.c
index 96ad5a1aa..02e9e7206 100644
--- a/tests/fbo/fbo-draw-buffers-blend.c
+++ b/tests/fbo/fbo-draw-buffers-blend.c
@@ -54,7 +54,7 @@ my_assert(int test, const char *text)
 {
    if (!test) {
       printf("%s: assertion %s failed\n", TestName, text);
-      piglit_report_result(PIGLIT_FAILURE);
+      piglit_report_result(PIGLIT_FAIL);
       exit(1);
    }
 }
@@ -67,7 +67,7 @@ check_error(int line)
    if (err) {
       printf("%s: Unexpected error 0x%x at line %d\n",
               TestName, err, line);
-      piglit_report_result(PIGLIT_FAILURE);
+      piglit_report_result(PIGLIT_FAIL);
    }
 }
 
@@ -185,11 +185,11 @@ test(void)
 
       if (!piglit_probe_pixel_rgba(5, 5, expected[i])) {
          printf("For color buffer %d\n", i);
-         return PIGLIT_FAILURE;
+         return PIGLIT_FAIL;
       }
    }
 
-   return PIGLIT_SUCCESS;
+   return PIGLIT_PASS;
 }
 
 
diff --git a/tests/fbo/fbo-drawbuffers-arbfp.c b/tests/fbo/fbo-drawbuffers-arbfp.c
index 625e50f9f..13086c881 100644
--- a/tests/fbo/fbo-drawbuffers-arbfp.c
+++ b/tests/fbo/fbo-drawbuffers-arbfp.c
@@ -133,7 +133,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/fbo/fbo-drawbuffers-blend-add.c b/tests/fbo/fbo-drawbuffers-blend-add.c
index 1710e254d..c5722fc15 100644
--- a/tests/fbo/fbo-drawbuffers-blend-add.c
+++ b/tests/fbo/fbo-drawbuffers-blend-add.c
@@ -216,7 +216,7 @@ piglit_display(void)
 	
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/fbo/fbo-drawbuffers-fragcolor.c b/tests/fbo/fbo-drawbuffers-fragcolor.c
index f6ed72145..561ecf400 100644
--- a/tests/fbo/fbo-drawbuffers-fragcolor.c
+++ b/tests/fbo/fbo-drawbuffers-fragcolor.c
@@ -164,7 +164,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/fbo/fbo-drawbuffers-maxtargets.c b/tests/fbo/fbo-drawbuffers-maxtargets.c
index 968d8266a..061527077 100644
--- a/tests/fbo/fbo-drawbuffers-maxtargets.c
+++ b/tests/fbo/fbo-drawbuffers-maxtargets.c
@@ -120,7 +120,7 @@ generate_and_display_drawbuffers(int count)
 	error = glGetError();
 	if (error) {
 		fprintf(stderr, "glUseProgram error: 0x%x\n", error);
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	/* Now render to all the color buffers. */
@@ -172,7 +172,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/fbo/fbo-drawbuffers.c b/tests/fbo/fbo-drawbuffers.c
index cf4376c77..61127e0b9 100644
--- a/tests/fbo/fbo-drawbuffers.c
+++ b/tests/fbo/fbo-drawbuffers.c
@@ -119,7 +119,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/fbo/fbo-drawbuffers2-blend.c b/tests/fbo/fbo-drawbuffers2-blend.c
index 151d62099..c73591b5b 100644
--- a/tests/fbo/fbo-drawbuffers2-blend.c
+++ b/tests/fbo/fbo-drawbuffers2-blend.c
@@ -130,7 +130,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/fbo/fbo-drawbuffers2-colormask.c b/tests/fbo/fbo-drawbuffers2-colormask.c
index 76fb1fa49..4c38fd0b4 100644
--- a/tests/fbo/fbo-drawbuffers2-colormask.c
+++ b/tests/fbo/fbo-drawbuffers2-colormask.c
@@ -128,7 +128,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/fbo/fbo-flushing.c b/tests/fbo/fbo-flushing.c
index 1979488c7..3272c8fe1 100644
--- a/tests/fbo/fbo-flushing.c
+++ b/tests/fbo/fbo-flushing.c
@@ -123,7 +123,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/fbo/fbo-formats.h b/tests/fbo/fbo-formats.h
index 9cfd9e191..88b9ab8f3 100644
--- a/tests/fbo/fbo-formats.h
+++ b/tests/fbo/fbo-formats.h
@@ -570,7 +570,7 @@ static void add_result(bool *all_skip, enum piglit_result *end_result,
 	if (new != PIGLIT_SKIP)
 		*all_skip = false;
 
-	if (new == PIGLIT_FAILURE)
+	if (new == PIGLIT_FAIL)
 		*end_result = new;
 }
 
@@ -578,7 +578,7 @@ typedef enum piglit_result (*test_func)(const struct format_desc *format, GLenum
 
 static enum piglit_result fbo_formats_display(test_func test_format)
 {
-	enum piglit_result result, end_result = PIGLIT_SUCCESS;
+	enum piglit_result result, end_result = PIGLIT_PASS;
 	bool all_skip = true;
 	int i;
 
diff --git a/tests/fbo/fbo-fragcoord.c b/tests/fbo/fbo-fragcoord.c
index 1d7e35a1c..830214b34 100644
--- a/tests/fbo/fbo-fragcoord.c
+++ b/tests/fbo/fbo-fragcoord.c
@@ -71,7 +71,7 @@ create_fbo(unsigned width, unsigned height, GLuint *out_tex)
 		glDeleteFramebuffersEXT(1, &fb);
 		glDeleteTextures(1, &tex);
 		piglit_report_result((status == GL_FRAMEBUFFER_UNSUPPORTED_EXT)
-				     ? PIGLIT_SKIP : PIGLIT_FAILURE);
+				     ? PIGLIT_SKIP : PIGLIT_FAIL);
 	}
 
 	*out_tex = tex;
@@ -131,7 +131,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/fbo/fbo-fragcoord2.c b/tests/fbo/fbo-fragcoord2.c
index 4f294a3e3..48230e48b 100644
--- a/tests/fbo/fbo-fragcoord2.c
+++ b/tests/fbo/fbo-fragcoord2.c
@@ -72,7 +72,7 @@ check_error(int line)
    if (err) {
       printf("%s: Unexpected error 0x%x at line %d\n",
               TestName, err, line);
-      piglit_report_result(PIGLIT_FAILURE);
+      piglit_report_result(PIGLIT_FAIL);
    }
 }
 
@@ -124,7 +124,7 @@ test(void)
    static const GLfloat half_green[4] = {0, 0.5, 0, 1};
    static const GLfloat green_half_red[4] = {0.5, 1, 0, 1};
    GLenum buffer;
-   enum piglit_result result = PIGLIT_SUCCESS;
+   enum piglit_result result = PIGLIT_PASS;
 
    create_fbo();
 
@@ -170,24 +170,24 @@ test(void)
 
    /* left half probes */
    if (!piglit_probe_pixel_rgb(0, 0, black)) {
-      result = PIGLIT_FAILURE;
+      result = PIGLIT_FAIL;
    }
 
    if (!piglit_probe_pixel_rgb(piglit_width/2-1, 0, half_red)) {
-      result = PIGLIT_FAILURE;
+      result = PIGLIT_FAIL;
    }
 
    if (!piglit_probe_pixel_rgb(0, piglit_height/2, half_green)) {
-      result = PIGLIT_FAILURE;
+      result = PIGLIT_FAIL;
    }
 
    if (!piglit_probe_pixel_rgb(piglit_width/2-1, piglit_height-1, green_half_red)) {
-      result = PIGLIT_FAILURE;
+      result = PIGLIT_FAIL;
    }
 
    /* right half probe */
    if (!piglit_probe_pixel_rgb(piglit_width*3/4, piglit_height/2, blue)) {
-      result = PIGLIT_FAILURE;
+      result = PIGLIT_FAIL;
    }
 
    glutSwapBuffers();
diff --git a/tests/fbo/fbo-generatemipmap-array.c b/tests/fbo/fbo-generatemipmap-array.c
index afea9f172..12c9e30f6 100644
--- a/tests/fbo/fbo-generatemipmap-array.c
+++ b/tests/fbo/fbo-generatemipmap-array.c
@@ -388,7 +388,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void piglit_init(int argc, char **argv)
diff --git a/tests/fbo/fbo-generatemipmap-filtering.c b/tests/fbo/fbo-generatemipmap-filtering.c
index c1c3c9038..9a4926780 100644
--- a/tests/fbo/fbo-generatemipmap-filtering.c
+++ b/tests/fbo/fbo-generatemipmap-filtering.c
@@ -128,7 +128,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void piglit_init(int argc, char **argv)
diff --git a/tests/fbo/fbo-generatemipmap-formats.c b/tests/fbo/fbo-generatemipmap-formats.c
index f19b2ac05..122d24c2b 100644
--- a/tests/fbo/fbo-generatemipmap-formats.c
+++ b/tests/fbo/fbo-generatemipmap-formats.c
@@ -452,7 +452,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 
diff --git a/tests/fbo/fbo-generatemipmap-nonsquare.c b/tests/fbo/fbo-generatemipmap-nonsquare.c
index 454cd6fde..214c7fd41 100644
--- a/tests/fbo/fbo-generatemipmap-nonsquare.c
+++ b/tests/fbo/fbo-generatemipmap-nonsquare.c
@@ -164,7 +164,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void piglit_init(int argc, char **argv)
diff --git a/tests/fbo/fbo-generatemipmap-npot.c b/tests/fbo/fbo-generatemipmap-npot.c
index 15ae1d8bf..b70b47686 100644
--- a/tests/fbo/fbo-generatemipmap-npot.c
+++ b/tests/fbo/fbo-generatemipmap-npot.c
@@ -158,7 +158,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void piglit_init(int argc, char **argv)
diff --git a/tests/fbo/fbo-generatemipmap-scissor.c b/tests/fbo/fbo-generatemipmap-scissor.c
index 5fb5733a1..6e65b6dd0 100644
--- a/tests/fbo/fbo-generatemipmap-scissor.c
+++ b/tests/fbo/fbo-generatemipmap-scissor.c
@@ -164,7 +164,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void piglit_init(int argc, char **argv)
diff --git a/tests/fbo/fbo-generatemipmap-viewport.c b/tests/fbo/fbo-generatemipmap-viewport.c
index db8ae74ee..998aad362 100644
--- a/tests/fbo/fbo-generatemipmap-viewport.c
+++ b/tests/fbo/fbo-generatemipmap-viewport.c
@@ -154,7 +154,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void piglit_init(int argc, char **argv)
diff --git a/tests/fbo/fbo-generatemipmap.c b/tests/fbo/fbo-generatemipmap.c
index 00cf73a8a..c5513e45c 100644
--- a/tests/fbo/fbo-generatemipmap.c
+++ b/tests/fbo/fbo-generatemipmap.c
@@ -158,7 +158,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void piglit_init(int argc, char **argv)
diff --git a/tests/fbo/fbo-getframebufferattachmentparameter-01.c b/tests/fbo/fbo-getframebufferattachmentparameter-01.c
index 6221b31c1..551a03dac 100644
--- a/tests/fbo/fbo-getframebufferattachmentparameter-01.c
+++ b/tests/fbo/fbo-getframebufferattachmentparameter-01.c
@@ -37,7 +37,7 @@ int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
 enum piglit_result
 piglit_display(void)
 {
-	return PIGLIT_FAILURE;
+	return PIGLIT_FAIL;
 }
 
 GLboolean
@@ -102,13 +102,13 @@ piglit_init(int argc, char **argv)
 	err = glGetError();
 	if (err != 0) {
 		printf("Unexpected GL error state 0x%04x\n", err);
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	status = glCheckFramebufferStatusEXT (GL_FRAMEBUFFER);
 	if (status != GL_FRAMEBUFFER_COMPLETE) {
 		printf("FBO incomplete because 0x%04x\n", status);
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	pass = try_GetAttachmentParam(GL_COLOR_ATTACHMENT0,
@@ -152,5 +152,5 @@ piglit_init(int argc, char **argv)
 				      "")
 		&& pass;
 
-	piglit_report_result(pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE);
+	piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
 }
diff --git a/tests/fbo/fbo-incomplete-texture-01.c b/tests/fbo/fbo-incomplete-texture-01.c
index cf424b7c7..496d1d5f9 100644
--- a/tests/fbo/fbo-incomplete-texture-01.c
+++ b/tests/fbo/fbo-incomplete-texture-01.c
@@ -42,7 +42,7 @@ int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
 enum piglit_result
 piglit_display(void)
 {
-	return PIGLIT_FAILURE;
+	return PIGLIT_FAIL;
 }
 
 void
@@ -78,14 +78,14 @@ piglit_init(int argc, char **argv)
 	err = glGetError();
 	if (err != 0) {
 		fprintf(stderr, "Unexpected GL error state 0x%04x\n", err);
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
 	if (status != GL_FRAMEBUFFER_COMPLETE) {
 		fprintf(stderr, "FBO erroneously incomplete: 0x%04x\n",
 			status);
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	glClearColor(color[0], color[1], color[2], color[3]);
@@ -94,14 +94,14 @@ piglit_init(int argc, char **argv)
 	err = glGetError();
 	if (err != 0) {
 		fprintf(stderr, "Unexpected GL error state 0x%04x\n", err);
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	if (!piglit_probe_texel_rect_rgba(GL_TEXTURE_2D, 0, 0, 0, 32, 32,
 					  color)) {
 		fprintf(stderr, "FBO clear didn't work\n");
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
-	piglit_report_result(PIGLIT_SUCCESS);
+	piglit_report_result(PIGLIT_PASS);
 }
diff --git a/tests/fbo/fbo-incomplete-texture-02.c b/tests/fbo/fbo-incomplete-texture-02.c
index 6bd9fe88a..4871d4d3d 100644
--- a/tests/fbo/fbo-incomplete-texture-02.c
+++ b/tests/fbo/fbo-incomplete-texture-02.c
@@ -42,7 +42,7 @@ int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
 enum piglit_result
 piglit_display(void)
 {
-	return PIGLIT_FAILURE;
+	return PIGLIT_FAIL;
 }
 
 void
@@ -85,14 +85,14 @@ piglit_init(int argc, char **argv)
 	err = glGetError();
 	if (err != 0) {
 		fprintf(stderr, "Unexpected GL error state 0x%04x\n", err);
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
 	if (status != GL_FRAMEBUFFER_COMPLETE) {
 		fprintf(stderr, "FBO erroneously incomplete: 0x%04x\n",
 			status);
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	glClearColor(color[0], color[1], color[2], color[3]);
@@ -101,14 +101,14 @@ piglit_init(int argc, char **argv)
 	err = glGetError();
 	if (err != 0) {
 		fprintf(stderr, "Unexpected GL error state 0x%04x\n", err);
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	if (!piglit_probe_texel_rect_rgba(GL_TEXTURE_CUBE_MAP_POSITIVE_X, 0,
 					 0, 0, 32, 32, color)) {
 		fprintf(stderr, "FBO clear didn't work\n");
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
-	piglit_report_result(PIGLIT_SUCCESS);
+	piglit_report_result(PIGLIT_PASS);
 }
diff --git a/tests/fbo/fbo-incomplete-texture-03.c b/tests/fbo/fbo-incomplete-texture-03.c
index 2b5eff98d..0b0bdef98 100644
--- a/tests/fbo/fbo-incomplete-texture-03.c
+++ b/tests/fbo/fbo-incomplete-texture-03.c
@@ -41,7 +41,7 @@ int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
 enum piglit_result
 piglit_display(void)
 {
-	return PIGLIT_FAILURE;
+	return PIGLIT_FAIL;
 }
 
 void
@@ -86,14 +86,14 @@ piglit_init(int argc, char **argv)
 	err = glGetError();
 	if (err != 0) {
 		fprintf(stderr, "Unexpected GL error state 0x%04x\n", err);
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
 	if (status != GL_FRAMEBUFFER_COMPLETE) {
 		fprintf(stderr, "FBO erroneously incomplete: 0x%04x\n",
 			status);
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	glClearColor(color[0], color[1], color[2], color[3]);
@@ -102,14 +102,14 @@ piglit_init(int argc, char **argv)
 	err = glGetError();
 	if (err != 0) {
 		fprintf(stderr, "Unexpected GL error state 0x%04x\n", err);
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	if (!piglit_probe_texel_rect_rgba(GL_TEXTURE_CUBE_MAP_POSITIVE_X, 0,
 					  0, 0, 32, 32, color)) {
 		fprintf(stderr, "FBO clear didn't work\n");
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
-	piglit_report_result(PIGLIT_SUCCESS);
+	piglit_report_result(PIGLIT_PASS);
 }
diff --git a/tests/fbo/fbo-incomplete-texture-04.c b/tests/fbo/fbo-incomplete-texture-04.c
index 0506f49cd..5640854cf 100644
--- a/tests/fbo/fbo-incomplete-texture-04.c
+++ b/tests/fbo/fbo-incomplete-texture-04.c
@@ -42,7 +42,7 @@ int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
 enum piglit_result
 piglit_display(void)
 {
-	return PIGLIT_FAILURE;
+	return PIGLIT_FAIL;
 }
 
 void
@@ -118,13 +118,13 @@ piglit_init(int argc, char **argv)
 	err = glGetError();
 	if (err != 0) {
 		fprintf(stderr, "Unexpected GL error state 0x%04x\n", err);
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	if (!piglit_probe_texel_rect_rgba(GL_TEXTURE_2D, 2, 0, 0, 8, 8,
 					  color)) {
 		fprintf(stderr, "FBO clear didn't work\n");
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	piglit_report_result(PIGLIT_PASS);
diff --git a/tests/fbo/fbo-integer.c b/tests/fbo/fbo-integer.c
index 44eaa9963..5ec59daca 100644
--- a/tests/fbo/fbo-integer.c
+++ b/tests/fbo/fbo-integer.c
@@ -382,9 +382,9 @@ piglit_display(void)
    for (f = 0; f < NUM_FORMATS; f++) {
       GLboolean pass = test_fbo(&Formats[f]);
       if (!pass)
-         return PIGLIT_FAILURE;
+         return PIGLIT_FAIL;
    }
-   return PIGLIT_SUCCESS;
+   return PIGLIT_PASS;
 }
 
 
diff --git a/tests/fbo/fbo-luminance-alpha.c b/tests/fbo/fbo-luminance-alpha.c
index 39ff04834..eebad3b7a 100644
--- a/tests/fbo/fbo-luminance-alpha.c
+++ b/tests/fbo/fbo-luminance-alpha.c
@@ -140,7 +140,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/fbo/fbo-maxsize.c b/tests/fbo/fbo-maxsize.c
index 220525e9a..f8dc77092 100644
--- a/tests/fbo/fbo-maxsize.c
+++ b/tests/fbo/fbo-maxsize.c
@@ -206,7 +206,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void piglit_init(int argc, char **argv)
diff --git a/tests/fbo/fbo-nodepth-test.c b/tests/fbo/fbo-nodepth-test.c
index 5242494f5..d2d292531 100644
--- a/tests/fbo/fbo-nodepth-test.c
+++ b/tests/fbo/fbo-nodepth-test.c
@@ -88,7 +88,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/fbo/fbo-nostencil-test.c b/tests/fbo/fbo-nostencil-test.c
index b5e0cfa71..46fc676ea 100644
--- a/tests/fbo/fbo-nostencil-test.c
+++ b/tests/fbo/fbo-nostencil-test.c
@@ -88,7 +88,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/fbo/fbo-pbo-readpixels-small.c b/tests/fbo/fbo-pbo-readpixels-small.c
index 46c8ca59e..1903bbada 100644
--- a/tests/fbo/fbo-pbo-readpixels-small.c
+++ b/tests/fbo/fbo-pbo-readpixels-small.c
@@ -156,7 +156,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void piglit_init(int argc, char **argv)
diff --git a/tests/fbo/fbo-readdrawpix.c b/tests/fbo/fbo-readdrawpix.c
index 0787646e1..0e879c956 100644
--- a/tests/fbo/fbo-readdrawpix.c
+++ b/tests/fbo/fbo-readdrawpix.c
@@ -205,7 +205,7 @@ piglit_display(void)
 {
 	GLboolean pass = run_test();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 
diff --git a/tests/fbo/fbo-readpixels.c b/tests/fbo/fbo-readpixels.c
index 988f3dd6c..212bc9e87 100644
--- a/tests/fbo/fbo-readpixels.c
+++ b/tests/fbo/fbo-readpixels.c
@@ -194,7 +194,7 @@ piglit_display(void)
 				 0, (BUF_HEIGHT + 1) * 3);
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void piglit_init(int argc, char **argv)
diff --git a/tests/fbo/fbo-rg.c b/tests/fbo/fbo-rg.c
index bf3b677b3..ec2a151ad 100644
--- a/tests/fbo/fbo-rg.c
+++ b/tests/fbo/fbo-rg.c
@@ -88,7 +88,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 static int
@@ -125,7 +125,7 @@ create_fbo(unsigned width, unsigned height, GLenum internal_format)
 		glDeleteFramebuffersEXT(1, &fb);
 		glDeleteTextures(1, &tex);
 		piglit_report_result((status == GL_FRAMEBUFFER_UNSUPPORTED_EXT)
-				     ? PIGLIT_SKIP : PIGLIT_FAILURE);
+				     ? PIGLIT_SKIP : PIGLIT_FAIL);
 	}
 
 	return fb;
@@ -310,7 +310,7 @@ render_and_check_textures(GLenum internal_format)
 		break;
 	default:
 		fprintf(stderr, "invalid format 0x%04x\n", internal_format);
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 		break;
 	}
 
@@ -330,20 +330,20 @@ render_and_check_textures(GLenum internal_format)
 	glBindAttribLocation(fbo_program, 1, "color");
 	glLinkProgram(fbo_program);
 	if (!piglit_link_check_status(fbo_program))
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 
 	scale_loc = glGetUniformLocation(fbo_program, "scale");
 	if (scale_loc < 0) {
 		fprintf(stderr,
 			"couldn't get uniform location for \"scale\"\n");
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	bias_loc = glGetUniformLocation(fbo_program, "bias");
 	if (bias_loc < 0) {
 		fprintf(stderr,
 			"couldn't get uniform location for \"bias\"\n");
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	glUseProgram(fbo_program);
@@ -396,7 +396,7 @@ usage(const char *name)
 		"where internal_format is one of GL_RED, GL_R8, GL_RG, "
 		"GL_RG8, etc.\n",
 		name);
-	piglit_report_result(PIGLIT_FAILURE);
+	piglit_report_result(PIGLIT_FAIL);
 }
 
 void
@@ -478,5 +478,5 @@ piglit_init(int argc, char **argv)
 	pass = render_and_check_textures(internal_format);
 
 	if (piglit_automatic)
-		piglit_report_result(pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE);
+		piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
 }
diff --git a/tests/fbo/fbo-scissor-bitmap.c b/tests/fbo/fbo-scissor-bitmap.c
index f628d2e7f..baf0e4186 100644
--- a/tests/fbo/fbo-scissor-bitmap.c
+++ b/tests/fbo/fbo-scissor-bitmap.c
@@ -176,7 +176,7 @@ draw_and_test(const char *destination, int drawable_width, int drawable_height)
 	error = glGetError();
 	if (error) {
 		fprintf(stderr, "glClear error: 0x%x\n", error);
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	glColor4fv(red);
@@ -376,7 +376,7 @@ piglit_display()
 	glDeleteTextures(1, &texture);
 	glDeleteFramebuffersEXT(1, &fbo);
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/fbo/fbo-srgb-blit.c b/tests/fbo/fbo-srgb-blit.c
index ea393d329..fc8d4e145 100644
--- a/tests/fbo/fbo-srgb-blit.c
+++ b/tests/fbo/fbo-srgb-blit.c
@@ -115,7 +115,7 @@ enum piglit_result piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void piglit_init(int argc, char **argv)
diff --git a/tests/fbo/fbo-srgb.c b/tests/fbo/fbo-srgb.c
index 407e2ff4a..3b6607f48 100644
--- a/tests/fbo/fbo-srgb.c
+++ b/tests/fbo/fbo-srgb.c
@@ -177,7 +177,7 @@ piglit_display(void)
 	} else
 		printf("Failed on format SRGB8_ALPHA8\n");
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 
diff --git a/tests/fbo/fbo-storage-completeness.c b/tests/fbo/fbo-storage-completeness.c
index ecb41a99b..f8d4adbb0 100644
--- a/tests/fbo/fbo-storage-completeness.c
+++ b/tests/fbo/fbo-storage-completeness.c
@@ -48,7 +48,7 @@ check_error(int line)
    if (err) {
       printf("%s: Unexpected error 0x%x at line %d\n",
               TestName, err, line);
-      piglit_report_result(PIGLIT_FAILURE);
+      piglit_report_result(PIGLIT_FAIL);
    }
 }
 
diff --git a/tests/fbo/fbo-storage-formats.c b/tests/fbo/fbo-storage-formats.c
index 57d241c26..70c1d84c5 100644
--- a/tests/fbo/fbo-storage-formats.c
+++ b/tests/fbo/fbo-storage-formats.c
@@ -47,7 +47,7 @@ check_error(int line)
    if (err) {
       printf("%s: Unexpected error 0x%x at line %d\n",
               TestName, err, line);
-      piglit_report_result(PIGLIT_FAILURE);
+      piglit_report_result(PIGLIT_FAIL);
    }
 }
 
@@ -228,7 +228,7 @@ test(void)
       }
    }
 
-   return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+   return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 
diff --git a/tests/fbo/fbo-sys-blit.c b/tests/fbo/fbo-sys-blit.c
index e0aa4399b..9973ef295 100644
--- a/tests/fbo/fbo-sys-blit.c
+++ b/tests/fbo/fbo-sys-blit.c
@@ -53,7 +53,7 @@ enum piglit_result piglit_display(void)
 	glFinish();
 
 	glReadBuffer(GL_FRONT);
-	return piglit_probe_pixel_rgb(w / 2, h / 2, expected) ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return piglit_probe_pixel_rgb(w / 2, h / 2, expected) ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void piglit_init(int argc, char **argv)
diff --git a/tests/general/bgra-sec-color-pointer.c b/tests/general/bgra-sec-color-pointer.c
index 8afb12318..87a21e476 100644
--- a/tests/general/bgra-sec-color-pointer.c
+++ b/tests/general/bgra-sec-color-pointer.c
@@ -121,5 +121,5 @@ piglit_display(void)
 	glDisableClientState(GL_SECONDARY_COLOR_ARRAY);
 	glDisableClientState(GL_VERTEX_ARRAY);
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/general/bgra-vert-attrib-pointer.c b/tests/general/bgra-vert-attrib-pointer.c
index 972844145..176f655e0 100644
--- a/tests/general/bgra-vert-attrib-pointer.c
+++ b/tests/general/bgra-vert-attrib-pointer.c
@@ -189,5 +189,5 @@ piglit_display(void)
 
 	glDisable(GL_BLEND);
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/general/blendminmax.c b/tests/general/blendminmax.c
index 5002b8a11..172c5b0a2 100644
--- a/tests/general/blendminmax.c
+++ b/tests/general/blendminmax.c
@@ -118,7 +118,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/general/blendsquare.c b/tests/general/blendsquare.c
index 611a79c76..3f2302c12 100644
--- a/tests/general/blendsquare.c
+++ b/tests/general/blendsquare.c
@@ -83,7 +83,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/general/clear-varray-2.0.c b/tests/general/clear-varray-2.0.c
index 0baac0af2..e9763e0c4 100644
--- a/tests/general/clear-varray-2.0.c
+++ b/tests/general/clear-varray-2.0.c
@@ -113,7 +113,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 static void reshape(int width, int height)
diff --git a/tests/general/depth-clamp-range.c b/tests/general/depth-clamp-range.c
index cb7b58ac2..c93e7edb3 100644
--- a/tests/general/depth-clamp-range.c
+++ b/tests/general/depth-clamp-range.c
@@ -127,5 +127,5 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/general/depth_clamp.c b/tests/general/depth_clamp.c
index cf1afadca..645fff473 100644
--- a/tests/general/depth_clamp.c
+++ b/tests/general/depth_clamp.c
@@ -146,5 +146,5 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/general/depthfunc.c b/tests/general/depthfunc.c
index b707cd618..2591f7452 100644
--- a/tests/general/depthfunc.c
+++ b/tests/general/depthfunc.c
@@ -122,7 +122,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void piglit_init(int argc, char**argv)
diff --git a/tests/general/depthrange-clear.c b/tests/general/depthrange-clear.c
index 6a2a510c0..1c331cde1 100644
--- a/tests/general/depthrange-clear.c
+++ b/tests/general/depthrange-clear.c
@@ -125,7 +125,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 
diff --git a/tests/general/dlist-clear.c b/tests/general/dlist-clear.c
index 0174aa615..4f8194925 100644
--- a/tests/general/dlist-clear.c
+++ b/tests/general/dlist-clear.c
@@ -87,7 +87,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 
diff --git a/tests/general/dlist-fdo3129-01.c b/tests/general/dlist-fdo3129-01.c
index ec8989a6f..b71eabefa 100644
--- a/tests/general/dlist-fdo3129-01.c
+++ b/tests/general/dlist-fdo3129-01.c
@@ -40,7 +40,7 @@ static GLuint list;
 enum piglit_result
 piglit_display(void)
 {
-	enum piglit_result result = PIGLIT_SUCCESS;
+	enum piglit_result result = PIGLIT_PASS;
 	static const GLfloat color[4] = { 1.0, 1.0, 1.0, 1.0 };
 
 	glClear (GL_COLOR_BUFFER_BIT);
@@ -71,7 +71,7 @@ piglit_display(void)
 	if (!piglit_probe_pixel_rgb(piglit_width / 2,
 				    piglit_height / 2,
 				    color)) {
-		result = PIGLIT_FAILURE;
+		result = PIGLIT_FAIL;
 	}
 
 	glutSwapBuffers();
diff --git a/tests/general/dlist-fdo3129-02.c b/tests/general/dlist-fdo3129-02.c
index 13a2b6bc0..23c2e5077 100644
--- a/tests/general/dlist-fdo3129-02.c
+++ b/tests/general/dlist-fdo3129-02.c
@@ -40,7 +40,7 @@ static GLuint list;
 enum piglit_result
 piglit_display(void)
 {
-	enum piglit_result result = PIGLIT_SUCCESS;
+	enum piglit_result result = PIGLIT_PASS;
 	static const GLfloat color[4] = { 1.0, 1.0, 1.0, 1.0 };
 
 	glClear (GL_COLOR_BUFFER_BIT);
@@ -70,7 +70,7 @@ piglit_display(void)
 	if (!piglit_probe_pixel_rgb(piglit_width / 2,
 				    piglit_height / 2,
 				    color)) {
-		result = PIGLIT_FAILURE;
+		result = PIGLIT_FAIL;
 	}
 
 	glutSwapBuffers();
diff --git a/tests/general/draw-batch.c b/tests/general/draw-batch.c
index b37d916c2..5b7c9f582 100644
--- a/tests/general/draw-batch.c
+++ b/tests/general/draw-batch.c
@@ -196,5 +196,5 @@ piglit_display(void)
 	pass = pass && piglit_probe_pixel_rgb(75, 105, c2);
 
 	glutSwapBuffers();
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/general/draw-elements-base-vertex-neg.c b/tests/general/draw-elements-base-vertex-neg.c
index d1fda8c2d..972f3a476 100644
--- a/tests/general/draw-elements-base-vertex-neg.c
+++ b/tests/general/draw-elements-base-vertex-neg.c
@@ -111,5 +111,5 @@ enum piglit_result piglit_display(void)
 	glFinish();
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/general/draw-elements-base-vertex.c b/tests/general/draw-elements-base-vertex.c
index d53ad0f08..53fc7d251 100644
--- a/tests/general/draw-elements-base-vertex.c
+++ b/tests/general/draw-elements-base-vertex.c
@@ -129,5 +129,5 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/general/draw-elements-vs-inputs.c b/tests/general/draw-elements-vs-inputs.c
index 73e2b781f..dea66dd08 100644
--- a/tests/general/draw-elements-vs-inputs.c
+++ b/tests/general/draw-elements-vs-inputs.c
@@ -174,6 +174,6 @@ piglit_display(void)
 
    glutSwapBuffers();
 
-   return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+   return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
diff --git a/tests/general/draw-elements.c b/tests/general/draw-elements.c
index 7b5e34a2f..12bd06d4f 100644
--- a/tests/general/draw-elements.c
+++ b/tests/general/draw-elements.c
@@ -225,6 +225,6 @@ piglit_display(void)
     glFinish();
     glutSwapBuffers();
 
-    return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+    return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
diff --git a/tests/general/draw-instanced-divisor.c b/tests/general/draw-instanced-divisor.c
index 0a5ba1a2f..19dda7ccf 100644
--- a/tests/general/draw-instanced-divisor.c
+++ b/tests/general/draw-instanced-divisor.c
@@ -146,10 +146,10 @@ piglit_display(void)
 
    for (div = 1; div <= PRIMS; div++) {
       if (!test_instancing(div))
-         return PIGLIT_FAILURE;
+         return PIGLIT_FAIL;
    }
 
-   return PIGLIT_SUCCESS;
+   return PIGLIT_PASS;
 }
 
 
diff --git a/tests/general/draw-instanced.c b/tests/general/draw-instanced.c
index 8c3b9418f..445108e76 100644
--- a/tests/general/draw-instanced.c
+++ b/tests/general/draw-instanced.c
@@ -139,9 +139,9 @@ enum piglit_result
 piglit_display(void)
 {
    if (!test_instancing())
-      return PIGLIT_FAILURE;
+      return PIGLIT_FAIL;
 
-   return PIGLIT_SUCCESS;
+   return PIGLIT_PASS;
 }
 
 
diff --git a/tests/general/draw-vertices-half-float.c b/tests/general/draw-vertices-half-float.c
index 1a545bbea..392982b86 100644
--- a/tests/general/draw-vertices-half-float.c
+++ b/tests/general/draw-vertices-half-float.c
@@ -273,6 +273,6 @@ piglit_display(void)
     glFinish();
     glutSwapBuffers();
 
-    return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+    return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
diff --git a/tests/general/draw-vertices.c b/tests/general/draw-vertices.c
index 176d4eb80..9644e1a3c 100644
--- a/tests/general/draw-vertices.c
+++ b/tests/general/draw-vertices.c
@@ -529,5 +529,5 @@ piglit_display(void)
     glFinish();
     glutSwapBuffers();
 
-    return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+    return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/general/early-z.c b/tests/general/early-z.c
index 47184541c..ae5a5947d 100644
--- a/tests/general/early-z.c
+++ b/tests/general/early-z.c
@@ -133,9 +133,9 @@ enum piglit_result
 piglit_display(void)
 {
    if (!test_early_depth())
-      return PIGLIT_FAILURE;
+      return PIGLIT_FAIL;
 
-   return PIGLIT_SUCCESS;
+   return PIGLIT_PASS;
 }
 
 
diff --git a/tests/general/fog-modes.c b/tests/general/fog-modes.c
index 4e263fb6e..c06790fd7 100644
--- a/tests/general/fog-modes.c
+++ b/tests/general/fog-modes.c
@@ -118,7 +118,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void piglit_init(int argc, char**argv)
diff --git a/tests/general/framebuffer-srgb.c b/tests/general/framebuffer-srgb.c
index bf6e8d1b1..875906567 100644
--- a/tests/general/framebuffer-srgb.c
+++ b/tests/general/framebuffer-srgb.c
@@ -353,7 +353,7 @@ piglit_display(void)
 		pass = framebuffer_srgb_fbo();
 
  out:
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 
diff --git a/tests/general/geterror-inside-begin.c b/tests/general/geterror-inside-begin.c
index 4c7371969..aefabb644 100644
--- a/tests/general/geterror-inside-begin.c
+++ b/tests/general/geterror-inside-begin.c
@@ -41,13 +41,13 @@ int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
 enum piglit_result
 piglit_display(void)
 {
-	return PIGLIT_FAILURE;
+	return PIGLIT_FAIL;
 }
 
 void
 piglit_init(int argc, char **argv)
 {
-	enum piglit_result result = PIGLIT_SUCCESS;
+	enum piglit_result result = PIGLIT_PASS;
 	GLenum err;
 
 	while (glGetError() != 0) {
@@ -62,7 +62,7 @@ piglit_init(int argc, char **argv)
 		printf("Unexpected OpenGL error state 0x%04x for glGetError() "
 		       "inside glBegin/glEnd pair (expected 0x0000).\n",
 		       err);
-		result = PIGLIT_FAILURE;
+		result = PIGLIT_FAIL;
 	}
 
 	err = glGetError();
@@ -71,7 +71,7 @@ piglit_init(int argc, char **argv)
 		printf("Unexpected OpenGL error state 0x%04x for glGetError() "
 		       "inside glBegin/glEnd pair (expected 0x%04x).\n",
 		       err, GL_INVALID_OPERATION);
-		result = PIGLIT_FAILURE;
+		result = PIGLIT_FAIL;
 	}
 
 	piglit_report_result(result);
diff --git a/tests/general/geterror-invalid-enum.c b/tests/general/geterror-invalid-enum.c
index 0cea01a6d..3402601d7 100644
--- a/tests/general/geterror-invalid-enum.c
+++ b/tests/general/geterror-invalid-enum.c
@@ -28,7 +28,7 @@ int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
 enum piglit_result
 piglit_display(void)
 {
-	return PIGLIT_FAILURE;
+	return PIGLIT_FAIL;
 }
 
 void
@@ -38,5 +38,5 @@ piglit_init(int argc, char **argv)
 
 	glGetBooleanv(GL_NONE, &params);
 	piglit_report_result(glGetError() == GL_INVALID_ENUM
-			     ? PIGLIT_SUCCESS : PIGLIT_FAILURE);
+			     ? PIGLIT_PASS : PIGLIT_FAIL);
 }
diff --git a/tests/general/gl30basic.c b/tests/general/gl30basic.c
index 2508d1711..b812dcaaa 100644
--- a/tests/general/gl30basic.c
+++ b/tests/general/gl30basic.c
@@ -68,16 +68,16 @@ test_version(void)
    glGetIntegerv(GL_MAJOR_VERSION, &k);
    if (k != major) {
       printf("%s: major version mismatch (%d vs. %d)\n", Prog, k, major);
-      return PIGLIT_FAILURE;
+      return PIGLIT_FAIL;
    }
 
    glGetIntegerv(GL_MINOR_VERSION, &k);
    if (k != minor) {
       printf("%s: minor version mismatch (%d vs. %d)\n", Prog, k, minor);
-      return PIGLIT_FAILURE;
+      return PIGLIT_FAIL;
    }
 
-   return PIGLIT_SUCCESS;
+   return PIGLIT_PASS;
 }
 
 
@@ -89,7 +89,7 @@ test_extension_list(void)
    glGetIntegerv(GL_NUM_EXTENSIONS, &num_ext);
    if (num_ext < 1 || num_ext > 10000) {
       printf("%s: unreasonable value for GL_NUM_EXTENSIONS: %d\n", Prog, num_ext);
-      return PIGLIT_FAILURE;
+      return PIGLIT_FAIL;
    }
 
    /* check that extension strings are reasonable */
@@ -102,15 +102,15 @@ test_extension_list(void)
           ext[1] != 'L' ||
           ext[2] != '_') {
          printf("%s: bad extension string [%d]: %s\n", Prog, k, ext);
-         return PIGLIT_FAILURE;
+         return PIGLIT_FAIL;
       }
       if (strchr((char *) ext, ' ')) {
          printf("%s: extension string [%d] contains a space: %s\n", Prog, k, ext);
-         return PIGLIT_FAILURE;
+         return PIGLIT_FAIL;
       }
    }
 
-   return PIGLIT_SUCCESS;
+   return PIGLIT_PASS;
 }
 
 
@@ -133,7 +133,7 @@ test_clearing(void)
    err = glGetError();
    if (err) {
       printf("%s: glClearBufferfv() generated error 0x%x.\n", Prog, err);
-      return PIGLIT_FAILURE;
+      return PIGLIT_FAIL;
    }
 
    glReadBuffer(buf);
@@ -143,7 +143,7 @@ test_clearing(void)
        color[2] != purple[2] ||
        color[3] != purple[3]) {
       printf("%s: glClearBufferfv() failed.\n", Prog);
-      return PIGLIT_FAILURE;
+      return PIGLIT_FAIL;
    }
 #endif
 
@@ -152,23 +152,23 @@ test_clearing(void)
    err = glGetError();
    if (err) {
       printf("%s: glClearBufferfi() generated error 0x%x.\n", Prog, err);
-      return PIGLIT_FAILURE;
+      return PIGLIT_FAIL;
    }
 
    glReadPixels(20, 20, 1, 1, GL_DEPTH_COMPONENT, GL_FLOAT, &z);
    if (fabs(z - 0.5) > 0.001) {
       printf("%s: glClearBufferfi() failed (z was %f, expected 0.5).\n", Prog, z);
-      return PIGLIT_FAILURE;
+      return PIGLIT_FAIL;
    }
 
    glReadPixels(20, 20, 1, 1, GL_STENCIL_INDEX, GL_INT, &stencil);
    if (stencil != 3) {
       printf("%s: glClearBufferfi() failed (stencil was %d, expected 3).\n",
              Prog, stencil);
-      return PIGLIT_FAILURE;
+      return PIGLIT_FAIL;
    }
 
-   return PIGLIT_SUCCESS;
+   return PIGLIT_PASS;
 }
 
 
@@ -178,15 +178,15 @@ piglit_display(void)
    enum piglit_result res;
    
    res = test_version();
-   if (res != PIGLIT_SUCCESS)
+   if (res != PIGLIT_PASS)
       return res;
 
    res = test_extension_list();
-   if (res != PIGLIT_SUCCESS)
+   if (res != PIGLIT_PASS)
       return res;
 
    res = test_clearing();
-   if (res != PIGLIT_SUCCESS)
+   if (res != PIGLIT_PASS)
       return res;
 
    return res;
diff --git a/tests/general/isbufferobj.c b/tests/general/isbufferobj.c
index ef6aee3fd..3b59b3a49 100644
--- a/tests/general/isbufferobj.c
+++ b/tests/general/isbufferobj.c
@@ -49,7 +49,7 @@ test(void)
 
    if (glIsBuffer(0)) {
       printf("%s: glIsBuffer(0) returned true instead of false.\n", TestName);
-      return PIGLIT_FAILURE;
+      return PIGLIT_FAIL;
    }
 
    glGenBuffers(2, buffers);
@@ -57,20 +57,20 @@ test(void)
        buffers[1] == 0 ||
        buffers[0] == buffers[1]) {
       printf("%s: glGenBuffers failed\n", TestName);
-      return PIGLIT_FAILURE;
+      return PIGLIT_FAIL;
    }
 
    if (glutExtensionSupported("GL_EXT_pixel_buffer_object")) {
       glBindBuffer(GL_PIXEL_PACK_BUFFER_EXT, buffers[0]);
       if (glGetError()) {
          printf("%s: glBindBuffer failed\n", TestName);
-         return PIGLIT_FAILURE;
+         return PIGLIT_FAIL;
       }
 
       if (!glIsBuffer(buffers[0])) {
          printf("%s: glIsBuffer(%u) returned false instead of true.\n",
                 TestName, buffers[0]);
-         return PIGLIT_FAILURE;
+         return PIGLIT_FAIL;
       }
    }
 
@@ -86,7 +86,7 @@ test(void)
       return PIGLIT_WARN;
    }
 
-   return PIGLIT_SUCCESS;
+   return PIGLIT_PASS;
 }
 
 
diff --git a/tests/general/line-aa-width.c b/tests/general/line-aa-width.c
index c846455b6..038f8865b 100644
--- a/tests/general/line-aa-width.c
+++ b/tests/general/line-aa-width.c
@@ -198,7 +198,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/general/linestipple.c b/tests/general/linestipple.c
index 6d0b385e6..f1e19edd6 100644
--- a/tests/general/linestipple.c
+++ b/tests/general/linestipple.c
@@ -35,7 +35,7 @@ static void probe_pixel(int x, int y, const float* expected)
 {
 	if (!piglit_probe_pixel_rgb(x, y, expected)) {
 		if (piglit_automatic)
-			piglit_report_result(PIGLIT_FAILURE);
+			piglit_report_result(PIGLIT_FAIL);
 	}
 }
 
@@ -185,7 +185,7 @@ piglit_display(void)
 {
 	test();
 
-	return PIGLIT_SUCCESS;
+	return PIGLIT_PASS;
 }
 
 
diff --git a/tests/general/longprim.c b/tests/general/longprim.c
index 04d0298cb..fdcaac4fd 100644
--- a/tests/general/longprim.c
+++ b/tests/general/longprim.c
@@ -106,7 +106,7 @@ enum piglit_result
 piglit_display(void)
 {
    test_prims();
-   return PIGLIT_SUCCESS;
+   return PIGLIT_PASS;
 }
 
 
diff --git a/tests/general/object_purgeable-api-pbo.c b/tests/general/object_purgeable-api-pbo.c
index ec174280e..80cb22694 100644
--- a/tests/general/object_purgeable-api-pbo.c
+++ b/tests/general/object_purgeable-api-pbo.c
@@ -63,5 +63,5 @@ piglit_display(void)
 	pass = test_Purgeable(pbo, GL_BUFFER_OBJECT_APPLE);
 
 	glDeleteBuffersARB(1, &pbo);
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/general/object_purgeable-api-texture.c b/tests/general/object_purgeable-api-texture.c
index a7ea5dc4b..59bce5db9 100644
--- a/tests/general/object_purgeable-api-texture.c
+++ b/tests/general/object_purgeable-api-texture.c
@@ -60,5 +60,5 @@ piglit_display(void)
 	pass = test_Purgeable(texture, GL_TEXTURE);
 
 	glDeleteTextures(1, &texture);
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/general/object_purgeable-api-vbo.c b/tests/general/object_purgeable-api-vbo.c
index 215ad6640..0253497c0 100644
--- a/tests/general/object_purgeable-api-vbo.c
+++ b/tests/general/object_purgeable-api-vbo.c
@@ -62,5 +62,5 @@ piglit_display(void)
 	pass = test_Purgeable(vbo, GL_BUFFER_OBJECT_APPLE);
 
 	glDeleteBuffersARB(1, &vbo);
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/general/occlusion-query-discard.c b/tests/general/occlusion-query-discard.c
index 513fff0ea..cefd089e6 100644
--- a/tests/general/occlusion-query-discard.c
+++ b/tests/general/occlusion-query-discard.c
@@ -118,7 +118,7 @@ piglit_display(void)
 	glUseProgram(0);
 	glDeleteProgram(prog);
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/general/occlusion_query.c b/tests/general/occlusion_query.c
index 9ff0074a3..756e252be 100644
--- a/tests/general/occlusion_query.c
+++ b/tests/general/occlusion_query.c
@@ -144,7 +144,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return test_pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return test_pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 
diff --git a/tests/general/oes-read-format.c b/tests/general/oes-read-format.c
index 28226025e..4a76cbca5 100644
--- a/tests/general/oes-read-format.c
+++ b/tests/general/oes-read-format.c
@@ -56,7 +56,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 
diff --git a/tests/general/pbo-drawpixels.c b/tests/general/pbo-drawpixels.c
index 7b85ab0d2..194d5359b 100644
--- a/tests/general/pbo-drawpixels.c
+++ b/tests/general/pbo-drawpixels.c
@@ -75,7 +75,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 
diff --git a/tests/general/pbo-read-argb8888.c b/tests/general/pbo-read-argb8888.c
index 4651b8862..487b6b136 100644
--- a/tests/general/pbo-read-argb8888.c
+++ b/tests/general/pbo-read-argb8888.c
@@ -86,7 +86,7 @@ piglit_display(void)
 
 	glDeleteBuffersARB(1, &pbo);
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 
diff --git a/tests/general/pbo-readpixels-small.c b/tests/general/pbo-readpixels-small.c
index fe7af2373..0b9d43c43 100644
--- a/tests/general/pbo-readpixels-small.c
+++ b/tests/general/pbo-readpixels-small.c
@@ -107,7 +107,7 @@ piglit_display(void)
 
 	glDeleteBuffersARB(1, &pbo);
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 
diff --git a/tests/general/pbo-teximage-tiling-2.c b/tests/general/pbo-teximage-tiling-2.c
index 3624fa888..23dff7657 100644
--- a/tests/general/pbo-teximage-tiling-2.c
+++ b/tests/general/pbo-teximage-tiling-2.c
@@ -96,7 +96,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 
diff --git a/tests/general/pbo-teximage-tiling.c b/tests/general/pbo-teximage-tiling.c
index 639b26618..cfad261be 100644
--- a/tests/general/pbo-teximage-tiling.c
+++ b/tests/general/pbo-teximage-tiling.c
@@ -96,7 +96,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 
diff --git a/tests/general/pbo-teximage.c b/tests/general/pbo-teximage.c
index 069b26161..fa4239ef9 100644
--- a/tests/general/pbo-teximage.c
+++ b/tests/general/pbo-teximage.c
@@ -88,7 +88,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 
diff --git a/tests/general/point-line-no-cull.c b/tests/general/point-line-no-cull.c
index b77284cb0..9c7dd3500 100644
--- a/tests/general/point-line-no-cull.c
+++ b/tests/general/point-line-no-cull.c
@@ -422,7 +422,7 @@ piglit_display(void)
 
    glutSwapBuffers();
 
-   return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+   return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 
diff --git a/tests/general/polygon-mode.c b/tests/general/polygon-mode.c
index ed736567e..217ff2bcd 100644
--- a/tests/general/polygon-mode.c
+++ b/tests/general/polygon-mode.c
@@ -211,9 +211,9 @@ enum piglit_result
 piglit_display(void)
 {
    if (!test_polygonmode())
-      return PIGLIT_FAILURE;
+      return PIGLIT_FAIL;
 
-   return PIGLIT_SUCCESS;
+   return PIGLIT_PASS;
 }
 
 
diff --git a/tests/general/primitive-restart.c b/tests/general/primitive-restart.c
index 166c559ec..abc9eadaa 100644
--- a/tests/general/primitive-restart.c
+++ b/tests/general/primitive-restart.c
@@ -464,7 +464,7 @@ piglit_display(void)
       pass = pass && test_draw_arrays();
    }
 
-   return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+   return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 
diff --git a/tests/general/provoking-vertex.c b/tests/general/provoking-vertex.c
index 98ee307b9..d8d6d77b7 100644
--- a/tests/general/provoking-vertex.c
+++ b/tests/general/provoking-vertex.c
@@ -82,5 +82,5 @@ piglit_display(void)
 	glFinish();
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/general/quad-invariance.c b/tests/general/quad-invariance.c
index 65f0a98a8..06ef451cb 100644
--- a/tests/general/quad-invariance.c
+++ b/tests/general/quad-invariance.c
@@ -114,7 +114,7 @@ piglit_display(void)
 		}
 	}
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_WARN;
+	return pass ? PIGLIT_PASS : PIGLIT_WARN;
 }
 
 void
diff --git a/tests/general/read-front.c b/tests/general/read-front.c
index 182d70c41..7f6b81a79 100644
--- a/tests/general/read-front.c
+++ b/tests/general/read-front.c
@@ -61,7 +61,7 @@ piglit_display(void)
 
 	glReadBuffer(GL_BACK);
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 
diff --git a/tests/general/scissor-bitmap.c b/tests/general/scissor-bitmap.c
index 88353c1bc..b3434129e 100644
--- a/tests/general/scissor-bitmap.c
+++ b/tests/general/scissor-bitmap.c
@@ -292,7 +292,7 @@ piglit_display()
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 
diff --git a/tests/general/scissor-clear.c b/tests/general/scissor-clear.c
index 8ada18fe9..8fbf8f20d 100644
--- a/tests/general/scissor-clear.c
+++ b/tests/general/scissor-clear.c
@@ -63,7 +63,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 
diff --git a/tests/general/scissor-copypixels.c b/tests/general/scissor-copypixels.c
index 71bc27beb..32d40cf09 100644
--- a/tests/general/scissor-copypixels.c
+++ b/tests/general/scissor-copypixels.c
@@ -101,7 +101,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 
diff --git a/tests/general/scissor-depth-clear.c b/tests/general/scissor-depth-clear.c
index 8d0166e23..b40b1c180 100644
--- a/tests/general/scissor-depth-clear.c
+++ b/tests/general/scissor-depth-clear.c
@@ -81,7 +81,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 
diff --git a/tests/general/scissor-many.c b/tests/general/scissor-many.c
index 94ba890ee..f33e2fa03 100644
--- a/tests/general/scissor-many.c
+++ b/tests/general/scissor-many.c
@@ -61,7 +61,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 
diff --git a/tests/general/scissor-offscreen.c b/tests/general/scissor-offscreen.c
index 1fe12f87c..9ea970bad 100644
--- a/tests/general/scissor-offscreen.c
+++ b/tests/general/scissor-offscreen.c
@@ -71,7 +71,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/general/scissor-stencil-clear.c b/tests/general/scissor-stencil-clear.c
index 7027f7695..96587c613 100644
--- a/tests/general/scissor-stencil-clear.c
+++ b/tests/general/scissor-stencil-clear.c
@@ -92,7 +92,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 
diff --git a/tests/general/stencil-drawpixels.c b/tests/general/stencil-drawpixels.c
index f8fcd97ce..5a387313f 100644
--- a/tests/general/stencil-drawpixels.c
+++ b/tests/general/stencil-drawpixels.c
@@ -99,7 +99,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 
diff --git a/tests/general/stencil-twoside.c b/tests/general/stencil-twoside.c
index e5166bb53..56cfd8132 100644
--- a/tests/general/stencil-twoside.c
+++ b/tests/general/stencil-twoside.c
@@ -211,7 +211,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/general/stencil-wrap.c b/tests/general/stencil-wrap.c
index 6f9188563..6c4f8dcc2 100644
--- a/tests/general/stencil-wrap.c
+++ b/tests/general/stencil-wrap.c
@@ -138,7 +138,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/general/sync_api.c b/tests/general/sync_api.c
index ef4d2ef40..cd9d8c3fa 100644
--- a/tests/general/sync_api.c
+++ b/tests/general/sync_api.c
@@ -157,6 +157,6 @@ piglit_display(void)
 	FAIL_ON_ERROR("glDeleteSync");
 
 done:
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
diff --git a/tests/general/texgen.c b/tests/general/texgen.c
index c878172fc..501cac404 100644
--- a/tests/general/texgen.c
+++ b/tests/general/texgen.c
@@ -56,7 +56,7 @@ static void probe_cell(const char* testname, int x, int y, const float* expected
 	if (!piglit_probe_pixel_rgb((2*x+1)*Width/8, (2*y+1)*Height/8, expected)) {
 		fprintf(stderr, "%s: %i,%i failed\n", testname, x, y);
 		if (Automatic)
-			piglit_report_result(PIGLIT_FAILURE);
+			piglit_report_result(PIGLIT_FAIL);
 	}
 }
 
@@ -179,7 +179,7 @@ static void Redisplay(void)
 		for(i = 0; i < NrTests; ++i)
 			Tests[i].function();
 
-		piglit_report_result(PIGLIT_SUCCESS);
+		piglit_report_result(PIGLIT_PASS);
 	} else {
 		Tests[CurrentTest].function();
 	}
diff --git a/tests/general/texunits.c b/tests/general/texunits.c
index 61d1d2830..564fd35f9 100644
--- a/tests/general/texunits.c
+++ b/tests/general/texunits.c
@@ -369,11 +369,11 @@ redisplay(void)
       pass = test_texture_env() && pass;
 
       if (pass) {
-         piglit_report_result(PIGLIT_SUCCESS);
+         piglit_report_result(PIGLIT_PASS);
       }
       else {
          report_info();
-         piglit_report_result(PIGLIT_FAILURE);
+         piglit_report_result(PIGLIT_FAIL);
       }
       exit(1);
    }
diff --git a/tests/general/timer_query.c b/tests/general/timer_query.c
index 28f495c4c..3e9a29b37 100644
--- a/tests/general/timer_query.c
+++ b/tests/general/timer_query.c
@@ -1,112 +1,112 @@
-/*

- * Copyright © 2009 Intel Corporation

- * Copyright © 2010 Mathias Fröhlich

- *

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the "Software"),

- * to deal in the Software without restriction, including without limitation

- * the rights to use, copy, modify, merge, publish, distribute, sublicense,

- * and/or sell copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following conditions:

- *

- * The above copyright notice and this permission notice (including the next

- * paragraph) shall be included in all copies or substantial portions of the

- * Software.

- *

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS

- * IN THE SOFTWARE.

- *

- * Authors:

- *    Ian Romanick <ian.d.romanick@intel.com>

- *    Mathias Fröhlich <m.froehlich@web.de>

- */

-

-/**

- * \file timer_query.c

- * Simple test for GL_EXT_timer_query.

- */

-

-#include "piglit-util.h"

-

-int piglit_width = 180, piglit_height = 100;

-int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH;

-

-static GLuint timer_query;

-

-void

-piglit_init(int argc, char **argv)

-{

-	GLint query_bits;

-

-	piglit_require_extension("GL_EXT_timer_query");

-

-	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);

-

-	/* It is legal for a driver to support the query API but not have

-	 * any query bits.  I wonder how many applications actually check for

-	 * this case...

-	 */

-	(*glGetQueryivARB)(GL_TIME_ELAPSED, GL_QUERY_COUNTER_BITS, &query_bits);

-	if (query_bits == 0) {

-		piglit_report_result(PIGLIT_SKIP);

-	}

-

-	(*glGenQueriesARB)(1, &timer_query);

-}

-

-enum piglit_result

-piglit_display(void)

-{

-	GLint available = 0;

-	GLint nsecs;

-	GLint64 nsecs64;

-	GLuint64 nsecs64u;

-

-	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);

-

-	/* Start a query */

-	(*glBeginQueryARB)(GL_TIME_ELAPSED_EXT, timer_query);

-

-	/* Paint something */

-	glColor3ub(0xff, 0xff, 0xff);

-

-	glBegin(GL_QUADS);

-	glVertex3f(0, 0, 0);

-	glVertex3f(piglit_width, 0, 0);

-	glVertex3f(piglit_width, piglit_height, 0);

-	glVertex3f(0, piglit_height, 0);

-	glEnd();

-

-	/* Stop a query */

-	(*glEndQueryARB)(GL_TIME_ELAPSED_EXT);

-

-	/* In this case poll until available */

-	while (!available)

-		(*glGetQueryObjectivARB)(timer_query, GL_QUERY_RESULT_AVAILABLE, &available);

-

-	/* Get the result */

-	(*glGetQueryObjectivARB)(timer_query, GL_QUERY_RESULT, &nsecs);

-	(*glGetQueryObjecti64vEXT)(timer_query, GL_QUERY_RESULT, &nsecs64);

-	(*glGetQueryObjectui64vEXT)(timer_query, GL_QUERY_RESULT, &nsecs64u);

-

-	if ((nsecs & 0xffffffff) != (nsecs64 & 0xffffffff)) {

-		printf("timer_query: 32 and 64-bit results differ!\n");

-		return PIGLIT_FAILURE;

-	}

-

-	if ((nsecs & 0xffffffff) != (nsecs64u & 0xffffffff)) {

-		printf("timer_query: 32 and 64-bit unsigned results differ!\n");

-		return PIGLIT_FAILURE;

-	}

-

-	/*printf("nsecs = %d %ld\n", nsecs, (long int) nsecs64);*/

-

-	glutSwapBuffers();

-

-	return PIGLIT_SUCCESS;

-}

+/*
+ * Copyright © 2009 Intel Corporation
+ * Copyright © 2010 Mathias Fröhlich
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Ian Romanick <ian.d.romanick@intel.com>
+ *    Mathias Fröhlich <m.froehlich@web.de>
+ */
+
+/**
+ * \file timer_query.c
+ * Simple test for GL_EXT_timer_query.
+ */
+
+#include "piglit-util.h"
+
+int piglit_width = 180, piglit_height = 100;
+int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH;
+
+static GLuint timer_query;
+
+void
+piglit_init(int argc, char **argv)
+{
+	GLint query_bits;
+
+	piglit_require_extension("GL_EXT_timer_query");
+
+	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
+
+	/* It is legal for a driver to support the query API but not have
+	 * any query bits.  I wonder how many applications actually check for
+	 * this case...
+	 */
+	(*glGetQueryivARB)(GL_TIME_ELAPSED, GL_QUERY_COUNTER_BITS, &query_bits);
+	if (query_bits == 0) {
+		piglit_report_result(PIGLIT_SKIP);
+	}
+
+	(*glGenQueriesARB)(1, &timer_query);
+}
+
+enum piglit_result
+piglit_display(void)
+{
+	GLint available = 0;
+	GLint nsecs;
+	GLint64 nsecs64;
+	GLuint64 nsecs64u;
+
+	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+	/* Start a query */
+	(*glBeginQueryARB)(GL_TIME_ELAPSED_EXT, timer_query);
+
+	/* Paint something */
+	glColor3ub(0xff, 0xff, 0xff);
+
+	glBegin(GL_QUADS);
+	glVertex3f(0, 0, 0);
+	glVertex3f(piglit_width, 0, 0);
+	glVertex3f(piglit_width, piglit_height, 0);
+	glVertex3f(0, piglit_height, 0);
+	glEnd();
+
+	/* Stop a query */
+	(*glEndQueryARB)(GL_TIME_ELAPSED_EXT);
+
+	/* In this case poll until available */
+	while (!available)
+		(*glGetQueryObjectivARB)(timer_query, GL_QUERY_RESULT_AVAILABLE, &available);
+
+	/* Get the result */
+	(*glGetQueryObjectivARB)(timer_query, GL_QUERY_RESULT, &nsecs);
+	(*glGetQueryObjecti64vEXT)(timer_query, GL_QUERY_RESULT, &nsecs64);
+	(*glGetQueryObjectui64vEXT)(timer_query, GL_QUERY_RESULT, &nsecs64u);
+
+	if ((nsecs & 0xffffffff) != (nsecs64 & 0xffffffff)) {
+		printf("timer_query: 32 and 64-bit results differ!\n");
+		return PIGLIT_FAIL;
+	}
+
+	if ((nsecs & 0xffffffff) != (nsecs64u & 0xffffffff)) {
+		printf("timer_query: 32 and 64-bit unsigned results differ!\n");
+		return PIGLIT_FAIL;
+	}
+
+	/*printf("nsecs = %d %ld\n", nsecs, (long int) nsecs64);*/
+
+	glutSwapBuffers();
+
+	return PIGLIT_PASS;
+}
diff --git a/tests/general/user-clip.c b/tests/general/user-clip.c
index 7cd32d6c8..232a6d2df 100644
--- a/tests/general/user-clip.c
+++ b/tests/general/user-clip.c
@@ -50,7 +50,7 @@ piglit_display(void)
 {
 	static const GLfloat green[4] = { 0.0, 1.0, 0.0, 1.0 };
 	static const GLfloat red[4] = { 1.0, 0.0, 0.0, 1.0 };
-	enum piglit_result result = PIGLIT_SUCCESS;
+	enum piglit_result result = PIGLIT_PASS;
 
 	glClear(GL_COLOR_BUFFER_BIT);
 
@@ -66,7 +66,7 @@ piglit_display(void)
 	if (!piglit_probe_pixel_rgb(piglit_width - 2,
 				    piglit_height / 2,
 				    clear_color)) {
-		result = PIGLIT_FAILURE;
+		result = PIGLIT_FAIL;
 	}
 
 	glutSwapBuffers();
diff --git a/tests/general/vao-01.c b/tests/general/vao-01.c
index ee8014522..71e4fd782 100644
--- a/tests/general/vao-01.c
+++ b/tests/general/vao-01.c
@@ -45,7 +45,7 @@ int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
 enum piglit_result
 piglit_display(void)
 {
-	return PIGLIT_SUCCESS;
+	return PIGLIT_PASS;
 }
 
 void
@@ -70,14 +70,14 @@ piglit_init(int argc, char **argv)
 
 	if (! glIsEnabled(GL_VERTEX_ARRAY)) {
 		printf("Array state is incorrectly disabled.\n");
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	glGetPointerv(GL_VERTEX_ARRAY_POINTER, & ptr);
 	if (ptr != (void *) 0xDEADBEEF) {
 		printf("Array pointer is incorrectly set to 0x%p.\n", ptr);
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
-	piglit_report_result(PIGLIT_SUCCESS);
+	piglit_report_result(PIGLIT_PASS);
 }
diff --git a/tests/general/vao-02.c b/tests/general/vao-02.c
index 8ea4fecd7..093e0a804 100644
--- a/tests/general/vao-02.c
+++ b/tests/general/vao-02.c
@@ -45,7 +45,7 @@ int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
 enum piglit_result
 piglit_display(void)
 {
-	return PIGLIT_SUCCESS;
+	return PIGLIT_PASS;
 }
 
 void
@@ -109,8 +109,8 @@ piglit_init(int argc, char **argv)
 	}
 
 	if (! pass) {
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	} else {
-		piglit_report_result(PIGLIT_SUCCESS);
+		piglit_report_result(PIGLIT_PASS);
 	}
 }
diff --git a/tests/general/varray-disabled.c b/tests/general/varray-disabled.c
index 50ad78bc0..cbd453d54 100644
--- a/tests/general/varray-disabled.c
+++ b/tests/general/varray-disabled.c
@@ -125,7 +125,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 
diff --git a/tests/general/vbo-map-remap.c b/tests/general/vbo-map-remap.c
index 7b9938224..82ab06d67 100644
--- a/tests/general/vbo-map-remap.c
+++ b/tests/general/vbo-map-remap.c
@@ -50,12 +50,12 @@ vbo_write_floats_mapped(const float *varray, size_t count)
 	float *ptr = glMapBufferARB(GL_ARRAY_BUFFER_ARB, GL_WRITE_ONLY_ARB);
 
 	if (ptr == NULL)
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 
 	memcpy(ptr, varray, count * sizeof(GLfloat));
 
 	if (!glUnmapBufferARB(GL_ARRAY_BUFFER_ARB))
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 }
 
 enum piglit_result
@@ -99,5 +99,5 @@ piglit_display(void)
 
 	glDisableClientState(GL_VERTEX_ARRAY);
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/general/vbo-subdata-sync.c b/tests/general/vbo-subdata-sync.c
index 8be862072..e4baef253 100644
--- a/tests/general/vbo-subdata-sync.c
+++ b/tests/general/vbo-subdata-sync.c
@@ -91,5 +91,5 @@ piglit_display(void)
 
 	glDisableClientState(GL_VERTEX_ARRAY);
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/general/vbo-subdata-zero.c b/tests/general/vbo-subdata-zero.c
index 6693c84e1..d0199fadd 100644
--- a/tests/general/vbo-subdata-zero.c
+++ b/tests/general/vbo-subdata-zero.c
@@ -50,12 +50,12 @@ vbo_write_floats_mapped(const float *varray, size_t count)
 	float *ptr = glMapBufferARB(GL_ARRAY_BUFFER_ARB, GL_WRITE_ONLY_ARB);
 
 	if (ptr == NULL)
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 
 	memcpy(ptr, varray, count * sizeof(GLfloat));
 
 	if (!glUnmapBufferARB(GL_ARRAY_BUFFER_ARB))
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 }
 
 enum piglit_result
@@ -100,5 +100,5 @@ piglit_display(void)
 
 	glDisableClientState(GL_VERTEX_ARRAY);
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/general/windowoverlap.c b/tests/general/windowoverlap.c
index 8d47c6f6f..47b6d95a9 100644
--- a/tests/general/windowoverlap.c
+++ b/tests/general/windowoverlap.c
@@ -135,7 +135,7 @@ static void test(void)
 	success = success && verify(0, 1, 1, 1, 1, 0, "render in main window");
 
 	if (Automatic)
-		piglit_report_result(success ? PIGLIT_SUCCESS : PIGLIT_FAILURE);
+		piglit_report_result(success ? PIGLIT_PASS : PIGLIT_FAIL);
 }
 
 static void RedisplayMain(void)
diff --git a/tests/gles2/gles2_shader_runner.c b/tests/gles2/gles2_shader_runner.c
index 07c78cb48..31fcb5ea7 100644
--- a/tests/gles2/gles2_shader_runner.c
+++ b/tests/gles2/gles2_shader_runner.c
@@ -110,7 +110,7 @@ compile_glsl(GLenum target, bool release_text)
 			info);
 
 		free(info);
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	if (release_text) {
@@ -232,7 +232,7 @@ load_shader_file(const char *line)
 		strcpy_to_space(buf, line);
 
 		printf("could not load file \"%s\"\n", buf);
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	shader_strings[num_shader_strings] = text;
@@ -282,7 +282,7 @@ process_comparison(const char *src, enum comparison *cmp)
 	strncpy(buf, src, sizeof(buf));
 	buf[sizeof(buf) - 1] = '\0';
 	printf("invalid comparison in test script:\n%s\n", buf);
-	piglit_report_result(PIGLIT_FAILURE);
+	piglit_report_result(PIGLIT_FAIL);
 
 	/* Won't get here. */
 	return NULL;
@@ -437,7 +437,7 @@ link_and_use_shaders(void)
 			info);
 
 		free(info);
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	glUseProgram(prog);
@@ -455,7 +455,7 @@ link_and_use_shaders(void)
 		glGetProgramInfoLog(prog, size, NULL, info);
 		fprintf(stderr, "Info log: %s\n", info);
 
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 }
 
@@ -470,7 +470,7 @@ process_test_script(const char *script_name)
 
 	if (line == NULL) {
 		printf("could not read file \"%s\"\n", script_name);
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	while (line[0] != '\0') {
@@ -564,7 +564,7 @@ set_uniform(const char *line)
 	if (loc < 0) {
 		printf("cannot get location of uniform \"%s\"\n",
 		       name);
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	if (strncmp("float", type, 5) == 0) {
@@ -594,7 +594,7 @@ set_uniform(const char *line)
 
 	strcpy_to_space(name, type);
 	printf("unknown uniform type \"%s\"", name);
-	piglit_report_result(PIGLIT_FAILURE);
+	piglit_report_result(PIGLIT_FAIL);
 
 	return;
 }
@@ -613,7 +613,7 @@ piglit_display(void)
 	GLbitfield clear_bits = 0;
 
 	if (test_start == NULL)
-		return PIGLIT_SUCCESS;
+		return PIGLIT_PASS;
 
 
 	line = test_start;
@@ -711,7 +711,7 @@ piglit_display(void)
 		} else if ((line[0] != '\n') && (line[0] != '\0')
 			   && (line[0] != '#')) {
 			printf("unknown command \"%s\"", line);
-			piglit_report_result(PIGLIT_FAILURE);
+			piglit_report_result(PIGLIT_FAIL);
 		}
 
 		line = strchrnul(line, '\n');
@@ -725,7 +725,7 @@ piglit_display(void)
 		glUseProgram(0);
 	}
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 
diff --git a/tests/glslparsertest/glslparsertest.c b/tests/glslparsertest/glslparsertest.c
index 965e5b5af..6a20a0de3 100644
--- a/tests/glslparsertest/glslparsertest.c
+++ b/tests/glslparsertest/glslparsertest.c
@@ -105,7 +105,7 @@ test(void)
 	else {
 		fprintf(stderr, "Couldn't determine type of program %s\n",
 			filename);
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 		exit(1);
 	}
 
@@ -177,7 +177,7 @@ test(void)
 		free(info);
 	free(prog_string);
 	piglit_DeleteShader(prog);
-	piglit_report_result (pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE);
+	piglit_report_result (pass ? PIGLIT_PASS : PIGLIT_FAIL);
 }
 
 static void usage(char *name)
diff --git a/tests/glx/glx-destroycontext-1.c b/tests/glx/glx-destroycontext-1.c
index 2342b0f3d..8beb1fbe8 100644
--- a/tests/glx/glx-destroycontext-1.c
+++ b/tests/glx/glx-destroycontext-1.c
@@ -67,7 +67,7 @@ draw(Display *dpy)
 	glXMakeCurrent(dpy, None, NULL);
 	glXDestroyContext(dpy, ctx);
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 int
@@ -85,7 +85,7 @@ main(int argc, char **argv)
 	dpy = XOpenDisplay(NULL);
 	if (dpy == NULL) {
 		fprintf(stderr, "couldn't open display\n");
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 	visinfo = piglit_get_glx_visual(dpy);
 	win = piglit_get_glx_window(dpy, visinfo);
diff --git a/tests/glx/glx-destroycontext-2.c b/tests/glx/glx-destroycontext-2.c
index 5e18f748d..8da12e91e 100644
--- a/tests/glx/glx-destroycontext-2.c
+++ b/tests/glx/glx-destroycontext-2.c
@@ -66,7 +66,7 @@ draw(Display *dpy)
 	glXMakeCurrent(dpy, None, NULL);
 	glXDestroyContext(dpy, ctx);
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 int
@@ -84,7 +84,7 @@ main(int argc, char **argv)
 	dpy = XOpenDisplay(NULL);
 	if (dpy == NULL) {
 		fprintf(stderr, "couldn't open display\n");
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 	visinfo = piglit_get_glx_visual(dpy);
 	win = piglit_get_glx_window(dpy, visinfo);
diff --git a/tests/glx/glx-fbconfig-compliance.c b/tests/glx/glx-fbconfig-compliance.c
index d47876805..d9c45c898 100644
--- a/tests/glx/glx-fbconfig-compliance.c
+++ b/tests/glx/glx-fbconfig-compliance.c
@@ -160,7 +160,7 @@ main(int argc, char **argv)
 	dpy = XOpenDisplay(NULL);
 	if (dpy == NULL) {
 		fprintf(stderr, "couldn't open display\n");
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	/* Test requires at least GLX version 1.3.  Otherwise there is no
@@ -214,6 +214,6 @@ main(int argc, char **argv)
 	}
 
 out:
-	piglit_report_result(conformant ? PIGLIT_SUCCESS : PIGLIT_FAILURE);
+	piglit_report_result(conformant ? PIGLIT_PASS : PIGLIT_FAIL);
 	return 0;
 }
diff --git a/tests/glx/glx-fbconfig-sanity.c b/tests/glx/glx-fbconfig-sanity.c
index b352bae34..896db1714 100644
--- a/tests/glx/glx-fbconfig-sanity.c
+++ b/tests/glx/glx-fbconfig-sanity.c
@@ -40,7 +40,7 @@ static PFNGLXGETVISUALFROMFBCONFIGPROC GetVisualFromFBConfig = NULL;
 static void
 fbconfig_sanity_warn(int *result)
 {
-	if (*result != PIGLIT_FAILURE)
+	if (*result != PIGLIT_FAIL)
 		*result = PIGLIT_WARN;
 }
 
@@ -49,14 +49,14 @@ main(int argc, char **argv)
 {
 	Display *dpy;
 	int i;
-	int result = PIGLIT_SUCCESS;
+	int result = PIGLIT_PASS;
 	GLXFBConfig *configs;
 	int num_configs;
 
 	dpy = XOpenDisplay(NULL);
 	if (dpy == NULL) {
 		fprintf(stderr, "couldn't open display\n");
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	/* Test requires at least GLX version 1.3.  Otherwise there is no
@@ -121,7 +121,7 @@ main(int argc, char **argv)
 			fprintf(stderr, "FBconfig 0x%x has GLX_WINDOW_BIT "
 				"set, but the Visual ID is 0!\n",
 				config_id);
-			result = PIGLIT_FAILURE;
+			result = PIGLIT_FAIL;
 		}
 
 		GetFBConfigAttrib(dpy, configs[i], GLX_TRANSPARENT_TYPE,
@@ -132,7 +132,7 @@ main(int argc, char **argv)
 				"visual ID = 0x%x.  Both or neither must be "
 				"NULL / zero.\n",
 				config_id, vinfo, visual_id);
-			result = PIGLIT_FAILURE;
+			result = PIGLIT_FAIL;
 		}
 
 		if (vinfo != NULL && vinfo->visualid != visual_id) {
@@ -140,7 +140,7 @@ main(int argc, char **argv)
 				"vinfo->visualid = 0x%x and visual ID = 0x%x. "
 				"These should match!\n",
 				config_id, (int) vinfo->visualid, visual_id);
-			result = PIGLIT_FAILURE;
+			result = PIGLIT_FAIL;
 		}
 
 		if (vinfo) {
@@ -156,7 +156,7 @@ main(int argc, char **argv)
 						"match!\n", config_id, depth,
 						(int)vinfo->visualid,
 						vinfo->depth);
-					result = PIGLIT_FAILURE;
+					result = PIGLIT_FAIL;
 				}
 			}
 			if (vinfo->class == TrueColor ||
@@ -169,14 +169,14 @@ main(int argc, char **argv)
 						config_id, depth,
 						(int)vinfo->visualid,
 						vinfo->depth);
-					result = PIGLIT_FAILURE;
+					result = PIGLIT_FAIL;
 				}
 			}
 			if (vtype == GLX_NONE) {
 				fprintf(stderr, "FBConfig 0x%x supports "
 					"windows but has no visual type\n",
 					config_id);
-				result = PIGLIT_FAILURE;
+				result = PIGLIT_FAIL;
 			} else {
 				int fail = 0;
 				int ci_fail = 0;
@@ -220,21 +220,21 @@ main(int argc, char **argv)
 						"{True,Direct}Color but claims "
 						"support for color-index\n",
 						config_id);
-					result = PIGLIT_FAILURE;
+					result = PIGLIT_FAIL;
 				}
 				if (fail == 2) {
 					fprintf(stderr, "FBConfig 0x%x has "
 						"visual with unknown class "
 						"%d\n", config_id,
 						vinfo->class);
-					result = PIGLIT_FAILURE;
+					result = PIGLIT_FAIL;
 				} else if (fail == 1) {
 					fprintf(stderr, "FBConfig 0x%x claims "
 						"visual class that does not "
 						"match visual 0x%x\n",
 						config_id,
 						(int)vinfo->visualid);
-					result = PIGLIT_FAILURE;
+					result = PIGLIT_FAIL;
 				}
 			}
 		}
@@ -248,7 +248,7 @@ main(int argc, char **argv)
 					"0 sample buffers but %d "
 					"samples, should be 0\n",
 					config_id, samples);
-				result = PIGLIT_FAILURE;
+				result = PIGLIT_FAIL;
 			}
 		} else if (sample_buffers == 1) {
 			/* TODO check color/depth/stencil bits per sample */
@@ -256,14 +256,14 @@ main(int argc, char **argv)
 			fprintf(stderr, "FBConfig 0x%x has bizarre "
 				"GLX_SAMPLE_BUFFERS of %d, should be "
 				"0 or 1\n", config_id, sample_buffers);
-			result = PIGLIT_FAILURE;
+			result = PIGLIT_FAIL;
 		}
 
 		if (render_type == 0) {
 			fprintf(stderr, "FBConfig 0x%x can be bound to "
 				"neither RGBA nor color-index contexts\n",
 				config_id);
-			result = PIGLIT_FAILURE;
+			result = PIGLIT_FAIL;
 		} else if
 		    (render_type & ~(GLX_RGBA_BIT | GLX_COLOR_INDEX_BIT)) {
 			fprintf(stderr, "FBConfig 0x%x supports rendering "
@@ -283,7 +283,7 @@ main(int argc, char **argv)
 			fprintf(stderr, "FBConfig 0x%x claims to not be X "
 				"renderable but claims to support windows "
 				"and/or pixmaps\n", config_id);
-			result = PIGLIT_FAILURE;
+			result = PIGLIT_FAIL;
 		}
 
 		switch (caveat) {
@@ -294,7 +294,7 @@ main(int argc, char **argv)
 			default:
 				fprintf(stderr, "FBConfig 0x%x has unknown "
 					"caveat 0x%x\n", config_id, caveat);
-				result = PIGLIT_FAILURE;
+				result = PIGLIT_FAIL;
 				break;
 		}
 
@@ -307,7 +307,7 @@ main(int argc, char **argv)
 					fprintf(stderr, "FBConfig 0x%x is rgb "
 						"transparent but not an rgb "
 						"visual type\n", config_id);
-					result = PIGLIT_FAILURE;
+					result = PIGLIT_FAIL;
 				}
 				break;
 			case GLX_TRANSPARENT_INDEX:
@@ -316,14 +316,14 @@ main(int argc, char **argv)
 					fprintf(stderr, "FBConfig 0x%x is ci "
 						"transparent but not a ci "
 						"visual type\n", config_id);
-					result = PIGLIT_FAILURE;
+					result = PIGLIT_FAIL;
 				}
 				break;
 			default:
 				fprintf(stderr, "FBConfig 0x%x has unknown "
 					"transparency type 0x%x\n", config_id,
 					transparency);
-				result = PIGLIT_FAILURE;
+				result = PIGLIT_FAIL;
 				break;
 		}
 	}
diff --git a/tests/glx/glx-make-current-bad-context.c b/tests/glx/glx-make-current-bad-context.c
index 8114540ec..7bb0ae00b 100644
--- a/tests/glx/glx-make-current-bad-context.c
+++ b/tests/glx/glx-make-current-bad-context.c
@@ -71,7 +71,7 @@ main(int argc, char **argv)
 	dpy = XOpenDisplay(NULL);
 	if (dpy == NULL) {
 		fprintf(stderr, "couldn't open display\n");
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 	visinfo = piglit_get_glx_visual(dpy);
 	win = piglit_get_glx_window(dpy, visinfo);
diff --git a/tests/glx/glx-make-current.c b/tests/glx/glx-make-current.c
index 099615ee8..c80776aec 100644
--- a/tests/glx/glx-make-current.c
+++ b/tests/glx/glx-make-current.c
@@ -71,7 +71,7 @@ draw(Display *dpy)
 	glXMakeCurrent(dpy, None, NULL);
 	glXDestroyContext(dpy, ctx);
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 int
@@ -89,7 +89,7 @@ main(int argc, char **argv)
 	dpy = XOpenDisplay(NULL);
 	if (dpy == NULL) {
 		fprintf(stderr, "couldn't open display\n");
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 	visinfo = piglit_get_glx_visual(dpy);
 	win_one = piglit_get_glx_window(dpy, visinfo);
diff --git a/tests/glx/glx-make-glxdrawable-current.c b/tests/glx/glx-make-glxdrawable-current.c
index e03dcede0..8050c04ea 100644
--- a/tests/glx/glx-make-glxdrawable-current.c
+++ b/tests/glx/glx-make-glxdrawable-current.c
@@ -66,8 +66,8 @@ draw(Display *dpy)
 	if (nconfigs == 0 || !configs) {
 		fprintf(stderr,
 			"Couldn't get an RGBA, double-buffered FBConfig\n");
-		piglit_report_result(PIGLIT_FAILURE);
-		return PIGLIT_FAILURE;
+		piglit_report_result(PIGLIT_FAIL);
+		return PIGLIT_FAIL;
 	}
 
 	glxwin_one = glXCreateWindow(dpy, configs[0], win_one, NULL);
@@ -100,7 +100,7 @@ draw(Display *dpy)
 	glXMakeCurrent(dpy, None, NULL);
 	glXDestroyContext(dpy, ctx);
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 int
@@ -118,7 +118,7 @@ main(int argc, char **argv)
 	dpy = XOpenDisplay(NULL);
 	if (dpy == NULL) {
 		fprintf(stderr, "couldn't open display\n");
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 	visinfo = piglit_get_glx_visual(dpy);
 	win_one = piglit_get_glx_window(dpy, visinfo);
diff --git a/tests/glx/glx-multithread-makecurrent-1.c b/tests/glx/glx-multithread-makecurrent-1.c
index aa5b5a133..632646138 100644
--- a/tests/glx/glx-multithread-makecurrent-1.c
+++ b/tests/glx/glx-multithread-makecurrent-1.c
@@ -150,7 +150,7 @@ draw(Display *dpy)
 	glXMakeCurrent(dpy, None, None);
 	glXDestroyContext(dpy, ctx);
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 int
@@ -168,7 +168,7 @@ main(int argc, char **argv)
 	dpy = XOpenDisplay(NULL);
 	if (dpy == NULL) {
 		fprintf(stderr, "couldn't open display\n");
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 	visinfo = piglit_get_glx_visual(dpy);
 	win = piglit_get_glx_window(dpy, visinfo);
diff --git a/tests/glx/glx-multithread-makecurrent-2.c b/tests/glx/glx-multithread-makecurrent-2.c
index ae3276cd1..819f5db2e 100644
--- a/tests/glx/glx-multithread-makecurrent-2.c
+++ b/tests/glx/glx-multithread-makecurrent-2.c
@@ -150,7 +150,7 @@ draw(Display *dpy)
 	glXMakeCurrent(dpy, None, None);
 	glXDestroyContext(dpy, ctx);
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 int
@@ -168,7 +168,7 @@ main(int argc, char **argv)
 	dpy = XOpenDisplay(NULL);
 	if (dpy == NULL) {
 		fprintf(stderr, "couldn't open display\n");
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 	visinfo = piglit_get_glx_visual(dpy);
 	win = piglit_get_glx_window(dpy, visinfo);
diff --git a/tests/glx/glx-multithread-makecurrent-3.c b/tests/glx/glx-multithread-makecurrent-3.c
index c1f55408a..bb6c2686f 100644
--- a/tests/glx/glx-multithread-makecurrent-3.c
+++ b/tests/glx/glx-multithread-makecurrent-3.c
@@ -142,7 +142,7 @@ draw(Display *dpy)
 	glXMakeCurrent(dpy, None, None);
 	glXDestroyContext(dpy, ctx);
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 int
@@ -160,7 +160,7 @@ main(int argc, char **argv)
 	dpy = XOpenDisplay(NULL);
 	if (dpy == NULL) {
 		fprintf(stderr, "couldn't open display\n");
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 	visinfo = piglit_get_glx_visual(dpy);
 	win = piglit_get_glx_window(dpy, visinfo);
diff --git a/tests/glx/glx-multithread-makecurrent-4.c b/tests/glx/glx-multithread-makecurrent-4.c
index 211827127..299f261ad 100644
--- a/tests/glx/glx-multithread-makecurrent-4.c
+++ b/tests/glx/glx-multithread-makecurrent-4.c
@@ -141,7 +141,7 @@ draw(Display *dpy)
 
 	glXMakeCurrent(dpy, None, None);
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 int
@@ -159,7 +159,7 @@ main(int argc, char **argv)
 	dpy = XOpenDisplay(NULL);
 	if (dpy == NULL) {
 		fprintf(stderr, "couldn't open display\n");
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 	visinfo = piglit_get_glx_visual(dpy);
 	win = piglit_get_glx_window(dpy, visinfo);
diff --git a/tests/glx/glx-multithread.c b/tests/glx/glx-multithread.c
index 8e9417a18..d01c8e93b 100644
--- a/tests/glx/glx-multithread.c
+++ b/tests/glx/glx-multithread.c
@@ -104,7 +104,7 @@ draw(Display *dpy)
 
 	glXSwapBuffers(dpy, win);
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 int
@@ -122,7 +122,7 @@ main(int argc, char **argv)
 	dpy = XOpenDisplay(NULL);
 	if (dpy == NULL) {
 		fprintf(stderr, "couldn't open display\n");
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 	visinfo = piglit_get_glx_visual(dpy);
 	win = piglit_get_glx_window(dpy, visinfo);
diff --git a/tests/glx/glx-pixmap-crosscheck.c b/tests/glx/glx-pixmap-crosscheck.c
index 0cf5cf1f0..963a6c88c 100644
--- a/tests/glx/glx-pixmap-crosscheck.c
+++ b/tests/glx/glx-pixmap-crosscheck.c
@@ -68,7 +68,7 @@ main(int argc, char **argv)
 	dpy = XOpenDisplay(NULL);
 	if (dpy == NULL) {
 		fprintf(stderr, "couldn't open display\n");
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
         piglit_glx_get_error(dpy, NULL);
diff --git a/tests/glx/glx-pixmap-life.c b/tests/glx/glx-pixmap-life.c
index 0c688e68b..70436cea2 100644
--- a/tests/glx/glx-pixmap-life.c
+++ b/tests/glx/glx-pixmap-life.c
@@ -63,7 +63,7 @@ main(int argc, char **argv)
 	dpy = XOpenDisplay(NULL);
 	if (dpy == NULL) {
 		fprintf(stderr, "couldn't open display\n");
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	visinfo = piglit_get_glx_visual(dpy);
@@ -90,7 +90,7 @@ main(int argc, char **argv)
 
 	XSync(dpy, 0);
 
-	piglit_report_result(pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE);
+	piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
 
 	return 0;
 }
diff --git a/tests/glx/glx-pixmap-multi.c b/tests/glx/glx-pixmap-multi.c
index 438039dcd..0c2fec63e 100644
--- a/tests/glx/glx-pixmap-multi.c
+++ b/tests/glx/glx-pixmap-multi.c
@@ -57,7 +57,6 @@ handler(Display *dpy, XErrorEvent *err)
 int
 main(int argc, char **argv)
 {
-	int i;
 	Pixmap p;
 	GLXPixmap g1, g2;
 	GLXFBConfig fbc;
@@ -65,7 +64,7 @@ main(int argc, char **argv)
 	dpy = XOpenDisplay(NULL);
 	if (dpy == NULL) {
 		fprintf(stderr, "couldn't open display\n");
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	visinfo = piglit_get_glx_visual(dpy);
@@ -90,7 +89,7 @@ main(int argc, char **argv)
 
 	XSync(dpy, 0);
 
-	piglit_report_result(pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE);
+	piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
 
 	return 0;
 }
diff --git a/tests/glx/glx-pixmap13-life.c b/tests/glx/glx-pixmap13-life.c
index 8f95f38e2..7ea3f6109 100644
--- a/tests/glx/glx-pixmap13-life.c
+++ b/tests/glx/glx-pixmap13-life.c
@@ -65,7 +65,7 @@ main(int argc, char **argv)
 	dpy = XOpenDisplay(NULL);
 	if (dpy == NULL) {
 		fprintf(stderr, "couldn't open display\n");
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	piglit_require_glx_version(dpy, 1, 3);
@@ -95,7 +95,7 @@ main(int argc, char **argv)
 
 	XSync(dpy, 0);
 
-	piglit_report_result(pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE);
+	piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
 
 	return 0;
 }
diff --git a/tests/glx/glx-shader-sharing.c b/tests/glx/glx-shader-sharing.c
index db6d3bdcf..bed19c261 100644
--- a/tests/glx/glx-shader-sharing.c
+++ b/tests/glx/glx-shader-sharing.c
@@ -80,7 +80,7 @@ draw(Display *dpy)
 
    if (!ctx1 || !ctx2) {
       fprintf(stderr, "%s: create contexts failed\n", TestName);
-      piglit_report_result(PIGLIT_FAILURE);
+      piglit_report_result(PIGLIT_FAIL);
    }
 
    /*
@@ -121,7 +121,7 @@ draw(Display *dpy)
 
    if (!ok) {
       printf("%s: drawing with context 1 failed\n", TestName);
-      return PIGLIT_FAILURE;
+      return PIGLIT_FAIL;
    }
 
    /*
@@ -156,13 +156,13 @@ draw(Display *dpy)
 
    if (!ok) {
       printf("%s: drawing with context 2 failed\n", TestName);
-      return PIGLIT_FAILURE;
+      return PIGLIT_FAIL;
    }
 
    glXDestroyContext(dpy, ctx2);
 
 
-   return PIGLIT_SUCCESS;
+   return PIGLIT_PASS;
 }
 
 
@@ -181,7 +181,7 @@ main(int argc, char **argv)
    dpy = XOpenDisplay(NULL);
    if (dpy == NULL) {
       fprintf(stderr, "%s: open display failed\n", TestName);
-      piglit_report_result(PIGLIT_FAILURE);
+      piglit_report_result(PIGLIT_FAIL);
    }
 
    visinfo = piglit_get_glx_visual(dpy);
diff --git a/tests/glx/glx-swap-event.c b/tests/glx/glx-swap-event.c
index 2e245ac51..3d5e6c7fb 100644
--- a/tests/glx/glx-swap-event.c
+++ b/tests/glx/glx-swap-event.c
@@ -136,14 +136,14 @@ draw_frame(Display *dpy, Window win)
                 interval=(*pglXGetSwapIntervalMESA)();
                 if ( !  interval == 1 ) {
                     printf("Failed to set swap interval to 1.\n");
-                    piglit_report_result(PIGLIT_FAILURE);
+                    piglit_report_result(PIGLIT_FAIL);
                 }
             } else{
                 (*pglXSwapIntervalMESA)(0);
                 interval=(*pglXGetSwapIntervalMESA)();
                 if ( !  interval == 0 ) {
                     printf("Failed to set swap interval to 0.\n");
-                    piglit_report_result(PIGLIT_FAILURE);
+                    piglit_report_result(PIGLIT_FAIL);
                 }
             }
         }
@@ -168,7 +168,7 @@ event_count, seconds);
                             printf("There is swap event received, and the swap \
 type is %s.\n", swap_event_type);
                         }
-                        piglit_report_result(PIGLIT_SUCCESS);
+                        piglit_report_result(PIGLIT_PASS);
                     } else{
                         if (verbose) {
                             printf("glXSwapBuffers is called %d times and there\
@@ -177,7 +177,7 @@ event_count, seconds);
                             printf("There is no swap event received, and the \
 swap type is %s.\n", swap_event_type);
                         }
-                        piglit_report_result(PIGLIT_FAILURE);
+                        piglit_report_result(PIGLIT_FAIL);
                     }
                     
                 }
@@ -188,21 +188,21 @@ swap type is %s.\n", swap_event_type);
                             printf("The swap frequency of no swap interval is \
 much larger than swap interval being 1.\n");
                         }
-                        piglit_report_result(PIGLIT_SUCCESS);
+                        piglit_report_result(PIGLIT_PASS);
                     } else{
 			if(fullscreen)
 			{
 			   if(verbose)
 			        printf("In fullscreen mode, the swap frequency of \
 no swap interval is limited under fresh rate.\n");
-			   piglit_report_result(PIGLIT_SUCCESS);
+			   piglit_report_result(PIGLIT_PASS);
 			}
                         if (verbose) {
                             printf("The swap frequency of no swap interval is \
 not much larger than swap interval being 1. They are %lf and %lf.\n",
 swap_freq[0], swap_freq[1]);
                         }
-                        piglit_report_result(PIGLIT_FAILURE);
+                        piglit_report_result(PIGLIT_FAIL);
                     }
                 }
                 if (async) {
@@ -211,9 +211,9 @@ swap_freq[0], swap_freq[1]);
  the glXSwapBuffers call on average.\n", (time_val / frames));
                     }
                     if (async_swap ==1 ) {
-                        piglit_report_result(PIGLIT_SUCCESS);
+                        piglit_report_result(PIGLIT_PASS);
                     } else{
-                        piglit_report_result(PIGLIT_FAILURE);
+                        piglit_report_result(PIGLIT_FAIL);
                     }
                 }
             }    
@@ -492,7 +492,7 @@ main(int argc, char *argv[])
     if (!dpy) {
         printf("Error: couldn't open display %s\n",
             dpyName ? dpyName : getenv("DISPLAY"));
-        piglit_report_result(PIGLIT_FAILURE);
+        piglit_report_result(PIGLIT_FAIL);
     }
     
     make_window(dpy, "Swap event test", x, y, winWidth, winHeight, &win, &ctx, &glxWin);
@@ -506,7 +506,7 @@ main(int argc, char *argv[])
         interval=(*pglXGetSwapIntervalMESA)();
         if ( !  interval == 1 ) {
             printf("Failed to set swap interval to 1.\n");
-            piglit_report_result(PIGLIT_FAILURE);
+            piglit_report_result(PIGLIT_FAIL);
         }
     }
     event_loop(dpy, glxWin);
diff --git a/tests/glx/glx-swap-exchange.c b/tests/glx/glx-swap-exchange.c
index 228a6d316..122c7dcbf 100644
--- a/tests/glx/glx-swap-exchange.c
+++ b/tests/glx/glx-swap-exchange.c
@@ -61,7 +61,7 @@ draw(Display *dpy)
 
 	glXSwapBuffers(dpy, win);
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 
@@ -108,7 +108,7 @@ main(int argc, char **argv)
 	dpy = XOpenDisplay(NULL);
 	if (dpy == NULL) {
 		fprintf(stderr, "couldn't open display\n");
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	glx_extension_list = glXQueryExtensionsString(dpy, DefaultScreen(dpy));
diff --git a/tests/glx/glx-tfp.c b/tests/glx/glx-tfp.c
index dfc3d67a1..45a79638f 100644
--- a/tests/glx/glx-tfp.c
+++ b/tests/glx/glx-tfp.c
@@ -179,7 +179,7 @@ draw(Display *dpy)
 	pass &= check_results(GL_FALSE, rgb_x, rgb_y, draw_w, draw_h);
 	pass &= check_results(GL_TRUE, rgba_x, rgba_y, draw_w, draw_h);
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 static void
@@ -324,7 +324,7 @@ int main(int argc, char**argv)
 	dpy = XOpenDisplay(NULL);
 	if (dpy == NULL) {
 		fprintf(stderr, "couldn't open display\n");
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 	screen = DefaultScreen(dpy);
 	root_win = RootWindow(dpy, screen);
@@ -355,7 +355,7 @@ int main(int argc, char**argv)
 		glXGetProcAddress((GLubyte *)"glXReleaseTexImageEXT");
 	if (pglXBindTexImageEXT == NULL || pglXReleaseTexImageEXT == NULL) {
 		fprintf(stderr, "Couldn't get TFP functions\n");
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 		exit(1);
 	}
 
diff --git a/tests/glx/glx-window-life.c b/tests/glx/glx-window-life.c
index 88288a15a..673ba3946 100644
--- a/tests/glx/glx-window-life.c
+++ b/tests/glx/glx-window-life.c
@@ -67,7 +67,7 @@ main(int argc, char **argv)
 	dpy = XOpenDisplay(NULL);
 	if (dpy == NULL) {
 		fprintf(stderr, "couldn't open display\n");
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
         piglit_glx_get_error(dpy, NULL);
@@ -77,7 +77,7 @@ main(int argc, char **argv)
         fbc = piglit_glx_get_fbconfig_for_visinfo(dpy, visinfo);
         if (fbc == None) {
 		fprintf(stderr, "No fbconfig available\n");
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	/*
@@ -106,7 +106,7 @@ main(int argc, char **argv)
 
 	XSync(dpy, 0);
 
-	piglit_report_result(pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE);
+	piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
 
 	return 0;
 }
diff --git a/tests/shaders/activeprogram-bad-program.c b/tests/shaders/activeprogram-bad-program.c
index 3d0218c26..f87a94e93 100644
--- a/tests/shaders/activeprogram-bad-program.c
+++ b/tests/shaders/activeprogram-bad-program.c
@@ -42,13 +42,13 @@ static const char good_vs_text[] =
 enum piglit_result
 piglit_display(void)
 {
-	return PIGLIT_FAILURE;
+	return PIGLIT_FAIL;
 }
 
 void
 piglit_init(int argc, char **argv)
 {
-	enum piglit_result result = PIGLIT_SUCCESS;
+	enum piglit_result result = PIGLIT_PASS;
 	GLenum err;
 	GLint ok;
 	GLuint prog;
@@ -73,7 +73,7 @@ piglit_init(int argc, char **argv)
 		fprintf(stderr,
 			"Linking with unresolved symbol succeeded when it "
 			"should have failed.\n");
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	/* There shouldn't be any GL errors, but clear them all just to be
@@ -93,7 +93,7 @@ piglit_init(int argc, char **argv)
 		       "glActiveProgramEXT called with\n"
 		       "an unlinked shader program (expected 0x%04x).\n",
 		       err, GL_INVALID_OPERATION);
-		result = PIGLIT_FAILURE;
+		result = PIGLIT_FAIL;
 	}
 
 	glDeleteProgram(prog);
@@ -124,7 +124,7 @@ piglit_init(int argc, char **argv)
 		       "glActiveProgramEXT called with\n"
 		       "an unlinked shader program (expected 0x%04x).\n",
 		       err, GL_INVALID_OPERATION);
-		result = PIGLIT_FAILURE;
+		result = PIGLIT_FAIL;
 	}
 
 	glDeleteProgram(prog);
diff --git a/tests/shaders/activeprogram-get.c b/tests/shaders/activeprogram-get.c
index d6075cd8c..b0fd2c36a 100644
--- a/tests/shaders/activeprogram-get.c
+++ b/tests/shaders/activeprogram-get.c
@@ -38,13 +38,13 @@ static const char vs_text[] =
 enum piglit_result
 piglit_display(void)
 {
-	return PIGLIT_FAILURE;
+	return PIGLIT_FAIL;
 }
 
 void
 piglit_init(int argc, char **argv)
 {
-	enum piglit_result result = PIGLIT_SUCCESS;
+	enum piglit_result result = PIGLIT_PASS;
 	GLuint prog[2];
 	GLuint got;
 	GLuint vs;
@@ -66,7 +66,7 @@ piglit_init(int argc, char **argv)
 		printf("After calling glUseProgram, "
 		       "GL_ACTIVE_PROGRAM_EXT should be %d (got %d)\n",
 		       prog[0], got);
-		result = PIGLIT_FAILURE;
+		result = PIGLIT_FAIL;
 	}
 
 	glActiveProgramEXT(prog[1]);
@@ -75,7 +75,7 @@ piglit_init(int argc, char **argv)
 		printf("After calling glActiveProgramEXT, "
 		       "GL_ACTIVE_PROGRAM_EXT should be %d (got %d)\n",
 		       prog[1], got);
-		result = PIGLIT_FAILURE;
+		result = PIGLIT_FAIL;
 	}
 
 	glUseProgram(0);
diff --git a/tests/shaders/ati-fs-bad-delete.c b/tests/shaders/ati-fs-bad-delete.c
index 3d3b82aaf..fd391efe0 100644
--- a/tests/shaders/ati-fs-bad-delete.c
+++ b/tests/shaders/ati-fs-bad-delete.c
@@ -42,7 +42,7 @@ piglit_display(void)
 {
 	glDeleteFragmentShaderATI(1001);
 
-	return glGetError() == 0 ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return glGetError() == 0 ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void piglit_init(int argc, char **argv)
diff --git a/tests/shaders/attribute0.c b/tests/shaders/attribute0.c
index 5f02cd7c8..c6fbe6de3 100644
--- a/tests/shaders/attribute0.c
+++ b/tests/shaders/attribute0.c
@@ -64,7 +64,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/shaders/createshaderprogram-attached-shaders.c b/tests/shaders/createshaderprogram-attached-shaders.c
index 8b4c36b64..c54c5bc0b 100644
--- a/tests/shaders/createshaderprogram-attached-shaders.c
+++ b/tests/shaders/createshaderprogram-attached-shaders.c
@@ -39,7 +39,7 @@ static const char vs_text[] =
 enum piglit_result
 piglit_display(void)
 {
-	return PIGLIT_FAILURE;
+	return PIGLIT_FAIL;
 }
 
 void
@@ -73,5 +73,5 @@ piglit_init(int argc, char **argv)
 		pass = GL_FALSE;
 	}
 
-	piglit_report_result(pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE);
+	piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
 }
diff --git a/tests/shaders/createshaderprogram-bad-type.c b/tests/shaders/createshaderprogram-bad-type.c
index 59c13ec0b..315137955 100644
--- a/tests/shaders/createshaderprogram-bad-type.c
+++ b/tests/shaders/createshaderprogram-bad-type.c
@@ -53,7 +53,7 @@ static const char fs_text[] =
 enum piglit_result
 piglit_display(void)
 {
-	return PIGLIT_FAILURE;
+	return PIGLIT_FAIL;
 }
 
 GLboolean
@@ -126,5 +126,5 @@ piglit_init(int argc, char **argv)
 	pass = try_CreateShaderProgram(GL_GEOMETRY_SHADER_ARB, gs_text, expect)
 		&& pass;
 
-	piglit_report_result(pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE);
+	piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
 }
diff --git a/tests/shaders/fp-abs-01.c b/tests/shaders/fp-abs-01.c
index 3f8f85e74..48047bd8c 100644
--- a/tests/shaders/fp-abs-01.c
+++ b/tests/shaders/fp-abs-01.c
@@ -117,7 +117,7 @@ enum piglit_result
 piglit_display(void)
 {
 	static const GLfloat color[4] = { 0.0, 1.0, 0.0, 0.0 };
-	enum piglit_result result = PIGLIT_SUCCESS;
+	enum piglit_result result = PIGLIT_PASS;
 	unsigned i;
 
 	glClear(GL_COLOR_BUFFER_BIT);
@@ -138,7 +138,7 @@ piglit_display(void)
 		if (!piglit_probe_pixel_rgb(x + (BOX_SIZE / 2),
 					    1 + (BOX_SIZE / 2),
 					    color)) {
-			result = PIGLIT_FAILURE;
+			result = PIGLIT_FAIL;
 		}
 	}
 
diff --git a/tests/shaders/fp-abs-02.c b/tests/shaders/fp-abs-02.c
index 72359c2b0..ba8f1a1d5 100644
--- a/tests/shaders/fp-abs-02.c
+++ b/tests/shaders/fp-abs-02.c
@@ -139,7 +139,7 @@ enum piglit_result
 piglit_display(void)
 {
 	static const GLfloat color[4] = { 0.0, 1.0, 0.0, 0.0 };
-	enum piglit_result result = PIGLIT_SUCCESS;
+	enum piglit_result result = PIGLIT_PASS;
 	unsigned i;
 
 	glClear(GL_COLOR_BUFFER_BIT);
@@ -160,7 +160,7 @@ piglit_display(void)
 		if (!piglit_probe_pixel_rgb(x + (BOX_SIZE / 2),
 					    1 + (BOX_SIZE / 2),
 					    color)) {
-			result = PIGLIT_FAILURE;
+			result = PIGLIT_FAIL;
 		}
 	}
 
diff --git a/tests/shaders/fp-condition_codes-01.c b/tests/shaders/fp-condition_codes-01.c
index aa1e54d92..34e28fb43 100644
--- a/tests/shaders/fp-condition_codes-01.c
+++ b/tests/shaders/fp-condition_codes-01.c
@@ -190,7 +190,7 @@ piglit_display(void)
 	unsigned i = 0;
 	unsigned cc;
 	unsigned mask;
-	enum piglit_result result = PIGLIT_SUCCESS;
+	enum piglit_result result = PIGLIT_PASS;
 
 
 	glClear(GL_COLOR_BUFFER_BIT);
@@ -223,7 +223,7 @@ piglit_display(void)
 					       cc_strings[cc],
 					       mask_strings[mask]);
 
-				result = PIGLIT_FAILURE;
+				result = PIGLIT_FAIL;
 			}
 		}
 	}
diff --git a/tests/shaders/fp-fog.c b/tests/shaders/fp-fog.c
index d685e34fb..9301d3de4 100644
--- a/tests/shaders/fp-fog.c
+++ b/tests/shaders/fp-fog.c
@@ -107,7 +107,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 
diff --git a/tests/shaders/fp-formats.c b/tests/shaders/fp-formats.c
index a56a302fb..1b7e1c2b6 100644
--- a/tests/shaders/fp-formats.c
+++ b/tests/shaders/fp-formats.c
@@ -52,7 +52,7 @@ static GLuint textures[1];
 enum piglit_result
 piglit_display(void)
 {
-	enum piglit_result result = PIGLIT_SUCCESS;
+	enum piglit_result result = PIGLIT_PASS;
 
 	const GLfloat expected[4] = { 0.5, 0.0, 0.0, 0.0 };
 
@@ -66,7 +66,7 @@ piglit_display(void)
 	if (!piglit_probe_pixel_rgb(piglit_width / 2,
 				    piglit_height / 2,
 				    expected))
-	  result = PIGLIT_FAILURE;
+	  result = PIGLIT_FAIL;
 
 	glutSwapBuffers();
 	return result;
diff --git a/tests/shaders/fp-fragment-position.c b/tests/shaders/fp-fragment-position.c
index e9abc5e78..330cf2f2b 100644
--- a/tests/shaders/fp-fragment-position.c
+++ b/tests/shaders/fp-fragment-position.c
@@ -289,7 +289,7 @@ piglit_display(void)
 	DoFrame();
 	pass = DoTest();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 
diff --git a/tests/shaders/fp-generic.c b/tests/shaders/fp-generic.c
index 3c806da8e..d1455a99e 100644
--- a/tests/shaders/fp-generic.c
+++ b/tests/shaders/fp-generic.c
@@ -181,7 +181,7 @@ static void TestInstance(struct testinstance* instance)
 	glReadBuffer(GL_FRONT);
 	if (!piglit_probe_pixel_rgba(piglit_width/2, piglit_height/2, instance->expected)) {
 		fprintf(stderr, "Test %s, instance #%i failed\n", Filename, instance-Testcase.instances);
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 }
 
@@ -192,7 +192,7 @@ piglit_display(void)
 	for(i = 0; i < Testcase.nrInstances; ++i)
 		TestInstance(&Testcase.instances[i]);
 
-	return PIGLIT_SUCCESS;
+	return PIGLIT_PASS;
 }
 
 
diff --git a/tests/shaders/fp-incomplete-tex.c b/tests/shaders/fp-incomplete-tex.c
index cd6beac1d..1d979c896 100644
--- a/tests/shaders/fp-incomplete-tex.c
+++ b/tests/shaders/fp-incomplete-tex.c
@@ -181,7 +181,7 @@ piglit_display(void)
 	DoFrame();
 	pass = DoTest();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 
diff --git a/tests/shaders/fp-indirections.c b/tests/shaders/fp-indirections.c
index 9df19db9b..9015cec6e 100644
--- a/tests/shaders/fp-indirections.c
+++ b/tests/shaders/fp-indirections.c
@@ -71,7 +71,7 @@ static char *gen_temporary_dest_indirections(int sample_count,
 
 	if (prog == 0) {
 		printf("malloc failed.\n");
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 		exit(1);
 	}
 
@@ -140,7 +140,7 @@ static char *gen_temporary_source_indirections(int sample_count,
 
 	if (prog == 0) {
 		printf("malloc failed.\n");
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 		exit(1);
 	}
 
@@ -269,7 +269,7 @@ piglit_display(void)
 	pass = test_temporary_dest_indirections() && pass;
 	pass = test_temporary_source_indirections() && pass;
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/shaders/fp-indirections2.c b/tests/shaders/fp-indirections2.c
index 0c56fb15e..d7afd3780 100644
--- a/tests/shaders/fp-indirections2.c
+++ b/tests/shaders/fp-indirections2.c
@@ -190,12 +190,12 @@ static enum piglit_result test(unsigned int dim, unsigned int samples)
 			texture_follow(dim, x, y, 0, samples, expected);
 			if (!piglit_probe_pixel_rgb(x, y, expected)) {
 				fprintf(stderr, "Failure in dim = %i, samples = %i\n", dim, samples);
-				return PIGLIT_FAILURE;
+				return PIGLIT_FAIL;
 			}
 		}
 	}
 
-	return PIGLIT_SUCCESS;
+	return PIGLIT_PASS;
 }
 
 enum piglit_result
@@ -212,7 +212,7 @@ piglit_display(void)
 		samples = 0;
 		for(;;) {
 			result = test(dim, samples);
-			if (result != PIGLIT_SUCCESS)
+			if (result != PIGLIT_PASS)
 				return result;
 
 			if (samples < 8) {
@@ -227,7 +227,7 @@ piglit_display(void)
 		}
 	}
 
-	return PIGLIT_SUCCESS;
+	return PIGLIT_PASS;
 }
 
 
diff --git a/tests/shaders/fp-kil.c b/tests/shaders/fp-kil.c
index 7ce1a29ee..ef0a7c829 100644
--- a/tests/shaders/fp-kil.c
+++ b/tests/shaders/fp-kil.c
@@ -255,7 +255,7 @@ piglit_display(void)
 	DoFrame();
 	pass = DoTest();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 
diff --git a/tests/shaders/fp-lit-mask.c b/tests/shaders/fp-lit-mask.c
index f0613a7df..05ce85da4 100644
--- a/tests/shaders/fp-lit-mask.c
+++ b/tests/shaders/fp-lit-mask.c
@@ -116,7 +116,7 @@ piglit_display(void)
 	DoFrame();
 	pass = DoTest();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 
diff --git a/tests/shaders/fp-long-alu.c b/tests/shaders/fp-long-alu.c
index 77b3c05a1..3a6ce8f89 100644
--- a/tests/shaders/fp-long-alu.c
+++ b/tests/shaders/fp-long-alu.c
@@ -138,10 +138,10 @@ static enum piglit_result test(unsigned int alu_depth)
 
 	if (!piglit_probe_pixel_rgba(16, 16, expected)) {
 		fprintf(stderr, "Failure in alu_depth = %i\n", alu_depth);
-		return PIGLIT_FAILURE;
+		return PIGLIT_FAIL;
 	}
 
-	return PIGLIT_SUCCESS;
+	return PIGLIT_PASS;
 }
 
 enum piglit_result piglit_display(void)
@@ -157,7 +157,7 @@ enum piglit_result piglit_display(void)
 		result = test(alu_depth);
 		if (result == PIGLIT_SKIP)
 			break;
-		if (result != PIGLIT_SUCCESS)
+		if (result != PIGLIT_PASS)
 			return result;
 
 		if (alu_depth < 8) {
@@ -168,7 +168,7 @@ enum piglit_result piglit_display(void)
 		}
 	}
 
-	return PIGLIT_SUCCESS;
+	return PIGLIT_PASS;
 }
 
 
diff --git a/tests/shaders/fp-rfl.c b/tests/shaders/fp-rfl.c
index 08b09f210..1dcb9944f 100644
--- a/tests/shaders/fp-rfl.c
+++ b/tests/shaders/fp-rfl.c
@@ -123,7 +123,7 @@ static const float green[4] = { 0.0, 1.0, 0.0, 0.0 };
 enum piglit_result
 piglit_display(void)
 {
-	enum piglit_result result = PIGLIT_SUCCESS;
+	enum piglit_result result = PIGLIT_PASS;
 	unsigned r;
 	unsigned c;
 
diff --git a/tests/shaders/fp-set-01.c b/tests/shaders/fp-set-01.c
index 7ac4b7294..19e2e6ccd 100644
--- a/tests/shaders/fp-set-01.c
+++ b/tests/shaders/fp-set-01.c
@@ -83,7 +83,7 @@ piglit_display(void)
 	const GLfloat comparitor[4] = { 0.5, 0.5, 0.5, 0.5 };
 	unsigned i;
 	unsigned j;
-	enum piglit_result result = PIGLIT_SUCCESS;
+	enum piglit_result result = PIGLIT_PASS;
 
 
 	glClear(GL_COLOR_BUFFER_BIT);
@@ -122,7 +122,7 @@ piglit_display(void)
                                         printf("shader %u failed on index %u\n",
 					       j, i);
 
-				result = PIGLIT_FAILURE;
+				result = PIGLIT_FAIL;
 			}
 		}
 	}
diff --git a/tests/shaders/fp-set-02.c b/tests/shaders/fp-set-02.c
index e586d8830..9897f28c6 100644
--- a/tests/shaders/fp-set-02.c
+++ b/tests/shaders/fp-set-02.c
@@ -160,7 +160,7 @@ piglit_display(void)
 	static const float values[3] = { 0.0, 0.5, 1.0 };
 	unsigned i;
 	unsigned j;
-	enum piglit_result result = PIGLIT_SUCCESS;
+	enum piglit_result result = PIGLIT_PASS;
 	GLfloat color[4];
 	GLfloat ref[4];
 
@@ -219,7 +219,7 @@ piglit_display(void)
 					       tests[idx].opcode,
 					       ref[0], ref[1], ref[2], ref[2]);
 
-				result = PIGLIT_FAILURE;
+				result = PIGLIT_FAIL;
 			}
 		}
 	}
diff --git a/tests/shaders/fp-unpack-01.c b/tests/shaders/fp-unpack-01.c
index b470b3c56..457b48688 100644
--- a/tests/shaders/fp-unpack-01.c
+++ b/tests/shaders/fp-unpack-01.c
@@ -251,7 +251,7 @@ piglit_display(void)
 {
 	unsigned i;
 	unsigned j;
-	enum piglit_result result = PIGLIT_SUCCESS;
+	enum piglit_result result = PIGLIT_PASS;
 
 
 	glClear(GL_COLOR_BUFFER_BIT);
@@ -285,7 +285,7 @@ piglit_display(void)
 					       colors[i][0], colors[i][1],
 					       colors[i][2], colors[i][3]);
 
-				result = PIGLIT_FAILURE;
+				result = PIGLIT_FAIL;
 			}
 		}
 	}
diff --git a/tests/shaders/getuniform-01.c b/tests/shaders/getuniform-01.c
index 7bc9535cc..ed22e8b8b 100644
--- a/tests/shaders/getuniform-01.c
+++ b/tests/shaders/getuniform-01.c
@@ -62,7 +62,7 @@ static GLint array_location[4];
 enum piglit_result
 piglit_display(void)
 {
-	return PIGLIT_FAILURE;
+	return PIGLIT_FAIL;
 }
 
 union data_blob {
@@ -78,7 +78,7 @@ validate_buffer(const union data_blob *buffer, unsigned size, float expected)
 	if (buffer[0].f != expected) {
 		printf("index 0: got %f, expected %f\n",
 		       buffer[0].f, expected);
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	} else if (!piglit_automatic) {
 		printf("index 0: got %f, expected %f (good)\n",
 		       buffer[0].f, expected);
@@ -87,7 +87,7 @@ validate_buffer(const union data_blob *buffer, unsigned size, float expected)
 	for (i = 1; i < size; i++) {
 		if (buffer[i].u != 0xdeadbeef) {
 			printf("glGetUniformfv overrun at index %u!\n", i);
-			piglit_report_result(PIGLIT_FAILURE);
+			piglit_report_result(PIGLIT_FAIL);
 		}
 	}
 
@@ -121,7 +121,7 @@ piglit_init(int argc, char **argv)
 	base_location = piglit_GetUniformLocation(prog, "c");
 	if (base_location < 0) {
 		printf("Could not get location of `c'.\n");
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	for (i = 0; i < 4; i++) {
@@ -135,7 +135,7 @@ piglit_init(int argc, char **argv)
 		array_location[i] = piglit_GetUniformLocation(prog, name);
 		if (array_location[i] < 0) {
 			printf("Could not get location of `%s'.\n", name);
-			piglit_report_result(PIGLIT_FAILURE);
+			piglit_report_result(PIGLIT_FAIL);
 		}
 	}
 
@@ -152,7 +152,7 @@ piglit_init(int argc, char **argv)
 		printf("Locations of `c' = %d and `c[0]' = %d, but they "
 		       "should be the same.\n",
 		       base_location, array_location[0]);
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	piglit_Uniform1fv(base_location, 4, uniform_data);
@@ -185,5 +185,5 @@ piglit_init(int argc, char **argv)
 		validate_buffer(buffer, ARRAY_SIZE(buffer), uniform_data[i]);
 	}
 
-	piglit_report_result(PIGLIT_SUCCESS);
+	piglit_report_result(PIGLIT_PASS);
 }
diff --git a/tests/shaders/glsl-arb-fragment-coord-conventions-define.c b/tests/shaders/glsl-arb-fragment-coord-conventions-define.c
index 82059611d..b09bd4fc9 100644
--- a/tests/shaders/glsl-arb-fragment-coord-conventions-define.c
+++ b/tests/shaders/glsl-arb-fragment-coord-conventions-define.c
@@ -53,7 +53,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/shaders/glsl-arb-fragment-coord-conventions.c b/tests/shaders/glsl-arb-fragment-coord-conventions.c
index 9a5bf7c8e..81648b688 100644
--- a/tests/shaders/glsl-arb-fragment-coord-conventions.c
+++ b/tests/shaders/glsl-arb-fragment-coord-conventions.c
@@ -201,7 +201,7 @@ piglit_display(void)
 
    glutSwapBuffers();
 
-   return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+   return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 static void key_func(unsigned char key, int x, int y)
diff --git a/tests/shaders/glsl-bindattriblocation.c b/tests/shaders/glsl-bindattriblocation.c
index 2d0db8459..dd1ebde71 100644
--- a/tests/shaders/glsl-bindattriblocation.c
+++ b/tests/shaders/glsl-bindattriblocation.c
@@ -93,7 +93,7 @@ piglit_display(void)
 		fprintf(stderr, "glsl-bindattriblocation: glBindAttribLocation failed\n");
 		fprintf(stderr, "  expectec location 3, found location %d\n",
 			attrib_loc);
-		return PIGLIT_FAILURE;
+		return PIGLIT_FAIL;
 	}
 
 	/* now draw something and check that it works */
@@ -111,7 +111,7 @@ piglit_display(void)
 	glDrawArrays(GL_POLYGON, 0, 4);
 
 	result = piglit_probe_pixel_rgba(20, 20, expColor)
-		? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+		? PIGLIT_PASS : PIGLIT_FAIL;
 
 	glDisableVertexAttribArray(attrib_loc);
 
diff --git a/tests/shaders/glsl-bug-22603.c b/tests/shaders/glsl-bug-22603.c
index fd98794e1..8f184013f 100644
--- a/tests/shaders/glsl-bug-22603.c
+++ b/tests/shaders/glsl-bug-22603.c
@@ -158,7 +158,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/shaders/glsl-cos.c b/tests/shaders/glsl-cos.c
index 398ca9e23..bc3e52af3 100644
--- a/tests/shaders/glsl-cos.c
+++ b/tests/shaders/glsl-cos.c
@@ -102,7 +102,7 @@ enum piglit_result piglit_display(void)
 
     glutSwapBuffers();
 
-    return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+    return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void piglit_init(int argc, char **argv)
diff --git a/tests/shaders/glsl-deriv-varyings.c b/tests/shaders/glsl-deriv-varyings.c
index 20ef28928..3b4902002 100644
--- a/tests/shaders/glsl-deriv-varyings.c
+++ b/tests/shaders/glsl-deriv-varyings.c
@@ -237,6 +237,6 @@ piglit_display(void)
 	glFinish();
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
diff --git a/tests/shaders/glsl-derivs.c b/tests/shaders/glsl-derivs.c
index 80d8464c5..7f350fbe9 100644
--- a/tests/shaders/glsl-derivs.c
+++ b/tests/shaders/glsl-derivs.c
@@ -236,6 +236,6 @@ piglit_display(void)
 	glFinish();
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
diff --git a/tests/shaders/glsl-dlist-getattriblocation.c b/tests/shaders/glsl-dlist-getattriblocation.c
index 8a49114a3..782921885 100644
--- a/tests/shaders/glsl-dlist-getattriblocation.c
+++ b/tests/shaders/glsl-dlist-getattriblocation.c
@@ -88,7 +88,7 @@ piglit_display(void)
 	glEndList();
 
 	pass = (attrib_loc == 1) && (attrib_loc == attrib_loc_in_dlist);
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 
diff --git a/tests/shaders/glsl-empty-vs-no-fs.c b/tests/shaders/glsl-empty-vs-no-fs.c
index 0f5cd05b7..1954e4d09 100644
--- a/tests/shaders/glsl-empty-vs-no-fs.c
+++ b/tests/shaders/glsl-empty-vs-no-fs.c
@@ -67,7 +67,7 @@ piglit_display(void)
 		glDeleteShader(vs);
 	}
 
-	return PIGLIT_SUCCESS;
+	return PIGLIT_PASS;
 }
 
 void
diff --git a/tests/shaders/glsl-explicit-location-01.c b/tests/shaders/glsl-explicit-location-01.c
index 78838df0b..6a91031d5 100644
--- a/tests/shaders/glsl-explicit-location-01.c
+++ b/tests/shaders/glsl-explicit-location-01.c
@@ -39,7 +39,7 @@ int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
 enum piglit_result
 piglit_display(void)
 {
-	return PIGLIT_FAILURE;
+	return PIGLIT_FAIL;
 }
 
 void piglit_init(int argc, char **argv)
@@ -74,6 +74,6 @@ void piglit_init(int argc, char **argv)
 
 	}
 
-	piglit_report_result(ok ? PIGLIT_SUCCESS : PIGLIT_FAILURE);
+	piglit_report_result(ok ? PIGLIT_PASS : PIGLIT_FAIL);
 }
 
diff --git a/tests/shaders/glsl-explicit-location-02.c b/tests/shaders/glsl-explicit-location-02.c
index 5c490827f..f04001228 100644
--- a/tests/shaders/glsl-explicit-location-02.c
+++ b/tests/shaders/glsl-explicit-location-02.c
@@ -41,7 +41,7 @@ int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
 enum piglit_result
 piglit_display(void)
 {
-	return PIGLIT_FAILURE;
+	return PIGLIT_FAIL;
 }
 
 void piglit_init(int argc, char **argv)
@@ -66,21 +66,21 @@ void piglit_init(int argc, char **argv)
 
 	ok = piglit_link_check_status(prog);
 	if (!ok)
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 
 	glBindAttribLocation(prog, 3, "vertex");
 	ok = piglit_link_check_status(prog);
 	if (!ok)
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 
 	loc = glGetAttribLocation(prog, "vertex");
 	if (loc != 0) {
 		fprintf(stderr,
 			"Expected location of 'vertex' to be 0, got "
 			"%d instead.\n", loc);
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
-	piglit_report_result(PIGLIT_SUCCESS);
+	piglit_report_result(PIGLIT_PASS);
 }
 
diff --git a/tests/shaders/glsl-explicit-location-03.c b/tests/shaders/glsl-explicit-location-03.c
index b288280bb..27b4fea05 100644
--- a/tests/shaders/glsl-explicit-location-03.c
+++ b/tests/shaders/glsl-explicit-location-03.c
@@ -39,7 +39,7 @@ int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
 enum piglit_result
 piglit_display(void)
 {
-	return PIGLIT_FAILURE;
+	return PIGLIT_FAIL;
 }
 
 void piglit_init(int argc, char **argv)
@@ -72,6 +72,6 @@ void piglit_init(int argc, char **argv)
 			"Linking with conflicting explicit locations "
 			"succeeded when it should have failed.\n");
 
-	piglit_report_result(!ok ? PIGLIT_SUCCESS : PIGLIT_FAILURE);
+	piglit_report_result(!ok ? PIGLIT_PASS : PIGLIT_FAIL);
 }
 
diff --git a/tests/shaders/glsl-explicit-location-04.c b/tests/shaders/glsl-explicit-location-04.c
index 4d16478cf..c1ae761f1 100644
--- a/tests/shaders/glsl-explicit-location-04.c
+++ b/tests/shaders/glsl-explicit-location-04.c
@@ -36,7 +36,7 @@ int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
 enum piglit_result
 piglit_display(void)
 {
-	return PIGLIT_FAILURE;
+	return PIGLIT_FAIL;
 }
 
 void piglit_init(int argc, char **argv)
@@ -64,6 +64,6 @@ void piglit_init(int argc, char **argv)
 			"Linking with invalid explicit attribute location "
 			"succeeded when it should have failed.\n");
 
-	piglit_report_result(!ok ? PIGLIT_SUCCESS : PIGLIT_FAILURE);
+	piglit_report_result(!ok ? PIGLIT_PASS : PIGLIT_FAIL);
 }
 
diff --git a/tests/shaders/glsl-explicit-location-05.c b/tests/shaders/glsl-explicit-location-05.c
index 091c902f6..75474f8d7 100644
--- a/tests/shaders/glsl-explicit-location-05.c
+++ b/tests/shaders/glsl-explicit-location-05.c
@@ -40,7 +40,7 @@ int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
 enum piglit_result
 piglit_display(void)
 {
-	return PIGLIT_FAILURE;
+	return PIGLIT_FAIL;
 }
 
 void piglit_init(int argc, char **argv)
@@ -70,7 +70,7 @@ void piglit_init(int argc, char **argv)
 
 	ok = piglit_link_check_status(prog);
 	if (!ok)
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 
 	glDeleteProgram(prog);
 
@@ -81,16 +81,16 @@ void piglit_init(int argc, char **argv)
 
 	ok = piglit_link_check_status(prog);
 	if (!ok)
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 
 	loc = glGetAttribLocation(prog, "vertex");
 	if (loc != 0) {
 		fprintf(stderr,
 			"Expected location of 'vertex' to be 0, got %d "
 			"instead.\n", loc);
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
-	piglit_report_result(PIGLIT_SUCCESS);
+	piglit_report_result(PIGLIT_PASS);
 }
 
diff --git a/tests/shaders/glsl-fs-bug25902.c b/tests/shaders/glsl-fs-bug25902.c
index 652815cda..cdb29ebda 100644
--- a/tests/shaders/glsl-fs-bug25902.c
+++ b/tests/shaders/glsl-fs-bug25902.c
@@ -62,7 +62,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/shaders/glsl-fs-discard-02.c b/tests/shaders/glsl-fs-discard-02.c
index 3ec032697..8b51792b7 100644
--- a/tests/shaders/glsl-fs-discard-02.c
+++ b/tests/shaders/glsl-fs-discard-02.c
@@ -105,7 +105,7 @@ enum piglit_result piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void piglit_init(int argc, char **argv)
diff --git a/tests/shaders/glsl-fs-exp2.c b/tests/shaders/glsl-fs-exp2.c
index 240ec1a1f..f76e2da55 100644
--- a/tests/shaders/glsl-fs-exp2.c
+++ b/tests/shaders/glsl-fs-exp2.c
@@ -58,7 +58,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/shaders/glsl-fs-flat-color.c b/tests/shaders/glsl-fs-flat-color.c
index 45883595c..9f275f2e6 100644
--- a/tests/shaders/glsl-fs-flat-color.c
+++ b/tests/shaders/glsl-fs-flat-color.c
@@ -74,7 +74,7 @@ enum piglit_result
 piglit_display(void)
 {
 	float green[4] = { 0.0, 1.0, 0.0, 1.0 };
-	enum piglit_result result = PIGLIT_SUCCESS;
+	enum piglit_result result = PIGLIT_PASS;
 
 	glShadeModel(GL_FLAT);
 
@@ -113,7 +113,7 @@ piglit_init(int argc, char **argv)
 	 * had better succeed!
 	 */
 	if (!piglit_link_check_status(prog))
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 
 	glUseProgram(prog);
 }
diff --git a/tests/shaders/glsl-fs-fragcoord.c b/tests/shaders/glsl-fs-fragcoord.c
index 81e9c19da..65e58818a 100644
--- a/tests/shaders/glsl-fs-fragcoord.c
+++ b/tests/shaders/glsl-fs-fragcoord.c
@@ -64,7 +64,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/shaders/glsl-fs-loop-nested.c b/tests/shaders/glsl-fs-loop-nested.c
index bf01f8e00..e984c264f 100644
--- a/tests/shaders/glsl-fs-loop-nested.c
+++ b/tests/shaders/glsl-fs-loop-nested.c
@@ -91,7 +91,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/shaders/glsl-fs-loop.c b/tests/shaders/glsl-fs-loop.c
index aa70e9d1e..e8c6ff0e5 100644
--- a/tests/shaders/glsl-fs-loop.c
+++ b/tests/shaders/glsl-fs-loop.c
@@ -89,7 +89,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/shaders/glsl-fs-mix-constant.c b/tests/shaders/glsl-fs-mix-constant.c
index 044c66638..2f2fa76d6 100644
--- a/tests/shaders/glsl-fs-mix-constant.c
+++ b/tests/shaders/glsl-fs-mix-constant.c
@@ -53,7 +53,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/shaders/glsl-fs-mix.c b/tests/shaders/glsl-fs-mix.c
index 930009211..680061043 100644
--- a/tests/shaders/glsl-fs-mix.c
+++ b/tests/shaders/glsl-fs-mix.c
@@ -60,7 +60,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/shaders/glsl-fs-pointcoord.c b/tests/shaders/glsl-fs-pointcoord.c
index 2e3f24cc7..bde4f12fb 100644
--- a/tests/shaders/glsl-fs-pointcoord.c
+++ b/tests/shaders/glsl-fs-pointcoord.c
@@ -84,7 +84,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void piglit_init(int argc, char**argv)
diff --git a/tests/shaders/glsl-fs-raytrace-bug27060.c b/tests/shaders/glsl-fs-raytrace-bug27060.c
index 4963ef364..2bc986ffd 100644
--- a/tests/shaders/glsl-fs-raytrace-bug27060.c
+++ b/tests/shaders/glsl-fs-raytrace-bug27060.c
@@ -270,7 +270,7 @@ piglit_display(void)
 
   return ((float)passed_cnt > (1.0F-failing_pixel_percentage)
           *piglit_width*piglit_height)
-    ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+    ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
@@ -303,5 +303,5 @@ piglit_init(int argc, char **argv)
   assert(glIsProgram(program));
 
   if (!piglit_link_check_status(program))
-      piglit_report_result(PIGLIT_FAILURE);
+      piglit_report_result(PIGLIT_FAIL);
 }
diff --git a/tests/shaders/glsl-fs-sampler-numbering.c b/tests/shaders/glsl-fs-sampler-numbering.c
index 5906edb3e..c3e8b9531 100644
--- a/tests/shaders/glsl-fs-sampler-numbering.c
+++ b/tests/shaders/glsl-fs-sampler-numbering.c
@@ -62,7 +62,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/shaders/glsl-fs-shader-stencil-export.c b/tests/shaders/glsl-fs-shader-stencil-export.c
index 16af64cb6..70d947f62 100644
--- a/tests/shaders/glsl-fs-shader-stencil-export.c
+++ b/tests/shaders/glsl-fs-shader-stencil-export.c
@@ -56,7 +56,7 @@ piglit_display(void)
 	/* we hardcode 129 in the shader */
 	if (p[0] != 129)
 		pass = GL_FALSE;
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/shaders/glsl-fs-sqrt-branch.c b/tests/shaders/glsl-fs-sqrt-branch.c
index b3a041297..054909bd0 100644
--- a/tests/shaders/glsl-fs-sqrt-branch.c
+++ b/tests/shaders/glsl-fs-sqrt-branch.c
@@ -58,7 +58,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/shaders/glsl-fs-sqrt-zero.c b/tests/shaders/glsl-fs-sqrt-zero.c
index bf51bf896..512625e0a 100644
--- a/tests/shaders/glsl-fs-sqrt-zero.c
+++ b/tests/shaders/glsl-fs-sqrt-zero.c
@@ -52,7 +52,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/shaders/glsl-fs-texture2drect.c b/tests/shaders/glsl-fs-texture2drect.c
index 367786fdb..364ea2472 100644
--- a/tests/shaders/glsl-fs-texture2drect.c
+++ b/tests/shaders/glsl-fs-texture2drect.c
@@ -121,7 +121,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void piglit_init(int argc, char **argv)
@@ -157,7 +157,7 @@ void piglit_init(int argc, char **argv)
 
 	prog = piglit_link_simple_program(vs, fs);
 	if (!piglit_link_check_status(prog))
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 
 	glUseProgram(prog);
 
diff --git a/tests/shaders/glsl-fs-texturecube-2.c b/tests/shaders/glsl-fs-texturecube-2.c
index 466325ffb..7f409ce18 100644
--- a/tests/shaders/glsl-fs-texturecube-2.c
+++ b/tests/shaders/glsl-fs-texturecube-2.c
@@ -185,7 +185,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void piglit_init(int argc, char **argv)
@@ -218,7 +218,7 @@ void piglit_init(int argc, char **argv)
 
 	prog = piglit_link_simple_program(vs, fs);
 	if (!piglit_link_check_status(prog))
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 
 	glUseProgram(prog);
 
diff --git a/tests/shaders/glsl-fs-texturecube.c b/tests/shaders/glsl-fs-texturecube.c
index aaa281f83..58809451e 100644
--- a/tests/shaders/glsl-fs-texturecube.c
+++ b/tests/shaders/glsl-fs-texturecube.c
@@ -149,7 +149,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void piglit_init(int argc, char **argv)
@@ -182,7 +182,7 @@ void piglit_init(int argc, char **argv)
 
 	prog = piglit_link_simple_program(vs, fs);
 	if (!piglit_link_check_status(prog))
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 
 	glUseProgram(prog);
 
diff --git a/tests/shaders/glsl-fs-texturelod-01.c b/tests/shaders/glsl-fs-texturelod-01.c
index b75716e05..0dc88f0ec 100644
--- a/tests/shaders/glsl-fs-texturelod-01.c
+++ b/tests/shaders/glsl-fs-texturelod-01.c
@@ -117,7 +117,7 @@ piglit_display()
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
@@ -150,14 +150,14 @@ piglit_init(int argc, char **argv)
 	sampler_uniform = glGetUniformLocation(prog, "sampler");
 	if (sampler_uniform == -1) {
 		printf("error: Unable to get location of uniform 'sampler'\n");
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 		return;
 	}
 	glUniform1i(sampler_uniform, texture_unit);
 	lod_uniform = glGetUniformLocation(prog, "lod");
 	if (lod_uniform == -1) {
 		printf("error: Unable to get location of uniform 'lod'\n");
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 		return;
 	}
 }
diff --git a/tests/shaders/glsl-fs-user-varying-ff.c b/tests/shaders/glsl-fs-user-varying-ff.c
index 3710f0330..f36fbdfcc 100644
--- a/tests/shaders/glsl-fs-user-varying-ff.c
+++ b/tests/shaders/glsl-fs-user-varying-ff.c
@@ -47,7 +47,7 @@ enum piglit_result
 piglit_display(void)
 {
 	static const float green[3] = { 0.0, 1.0, 0.0 };
-	enum piglit_result result = PIGLIT_SUCCESS;
+	enum piglit_result result = PIGLIT_PASS;
 
 	glClear(GL_COLOR_BUFFER_BIT);
 
@@ -58,7 +58,7 @@ piglit_display(void)
 	 * illegal way.  The rendered result must not be green!
 	 */
 	if (piglit_probe_pixel_rgb(15, 15, green))
-		result = PIGLIT_FAILURE;
+		result = PIGLIT_FAIL;
 
 	if (!piglit_automatic)
 		glutSwapBuffers();
@@ -89,7 +89,7 @@ piglit_init(int argc, char **argv)
 	 * had better succeed!
 	 */
 	if (!piglit_link_check_status(prog))
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 
 	printf("\"Probe at (.., ..)\" returning mismatched results is "
 	       "expected and correct.\n");
diff --git a/tests/shaders/glsl-fwidth.c b/tests/shaders/glsl-fwidth.c
index b3553add5..a8a301f10 100644
--- a/tests/shaders/glsl-fwidth.c
+++ b/tests/shaders/glsl-fwidth.c
@@ -234,5 +234,5 @@ piglit_display(void)
 	glFinish();
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/shaders/glsl-getactiveuniform-array-size.c b/tests/shaders/glsl-getactiveuniform-array-size.c
index a630a86d4..d8b8daba6 100644
--- a/tests/shaders/glsl-getactiveuniform-array-size.c
+++ b/tests/shaders/glsl-getactiveuniform-array-size.c
@@ -41,7 +41,7 @@ enum piglit_result
 piglit_display(void)
 {
 	/* unreached */
-	return PIGLIT_FAILURE;
+	return PIGLIT_FAIL;
 }
 
 void
@@ -87,7 +87,7 @@ piglit_init(int argc, char **argv)
 	}
 
 	if (pass)
-		piglit_report_result(PIGLIT_SUCCESS);
+		piglit_report_result(PIGLIT_PASS);
 	else
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 }
diff --git a/tests/shaders/glsl-getactiveuniform-count.c b/tests/shaders/glsl-getactiveuniform-count.c
index 2cb224009..ac47253af 100644
--- a/tests/shaders/glsl-getactiveuniform-count.c
+++ b/tests/shaders/glsl-getactiveuniform-count.c
@@ -42,7 +42,7 @@ enum piglit_result
 piglit_display(void)
 {
 	/* unreached */
-	return PIGLIT_FAILURE;
+	return PIGLIT_FAIL;
 }
 
 void
@@ -55,7 +55,7 @@ piglit_init(int argc, char **argv)
 	if (argc < 3) {
 		printf("Usage: %s <vertex shader file> "
 		       "<expected uniform count>\n", argv[0]);
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	expect = (int) strtol(argv[2], NULL, 0);
@@ -75,7 +75,7 @@ piglit_init(int argc, char **argv)
 	}
 
 	if (pass)
-		piglit_report_result(PIGLIT_SUCCESS);
+		piglit_report_result(PIGLIT_PASS);
 	else
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 }
diff --git a/tests/shaders/glsl-getactiveuniform-length.c b/tests/shaders/glsl-getactiveuniform-length.c
index b0f6aebc4..be834d426 100644
--- a/tests/shaders/glsl-getactiveuniform-length.c
+++ b/tests/shaders/glsl-getactiveuniform-length.c
@@ -42,7 +42,7 @@ enum piglit_result
 piglit_display(void)
 {
 	/* unreached */
-	return PIGLIT_FAILURE;
+	return PIGLIT_FAIL;
 }
 
 void
@@ -96,7 +96,7 @@ piglit_init(int argc, char **argv)
 
 
 	if (pass)
-		piglit_report_result(PIGLIT_SUCCESS);
+		piglit_report_result(PIGLIT_PASS);
 	else
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 }
diff --git a/tests/shaders/glsl-getattriblocation.c b/tests/shaders/glsl-getattriblocation.c
index bef78cd71..80c3de548 100644
--- a/tests/shaders/glsl-getattriblocation.c
+++ b/tests/shaders/glsl-getattriblocation.c
@@ -101,7 +101,7 @@ piglit_display(void)
 	glDrawArrays(GL_POLYGON, 0, 4);
 
 	result = piglit_probe_pixel_rgba(20, 20, expColor)
-		? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+		? PIGLIT_PASS : PIGLIT_FAIL;
 
 	glDisableVertexAttribArray(attrib_loc);
 
diff --git a/tests/shaders/glsl-invalid-asm-01.c b/tests/shaders/glsl-invalid-asm-01.c
index f429202a3..92392da71 100644
--- a/tests/shaders/glsl-invalid-asm-01.c
+++ b/tests/shaders/glsl-invalid-asm-01.c
@@ -65,7 +65,7 @@ piglit_display(void)
 
 		pass = GL_FALSE;
         }
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
@@ -99,7 +99,7 @@ piglit_init(int argc, char **argv)
                 printf("Unexpected OpenGL error state 0x%04x with bad "
 		       "fragment program (expected 0x%04x).\n",
 		       err, GL_INVALID_OPERATION);
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
         }
 
 	glEnable(GL_FRAGMENT_PROGRAM_ARB);
diff --git a/tests/shaders/glsl-invalid-asm-02.c b/tests/shaders/glsl-invalid-asm-02.c
index 366579598..c37ed8d11 100644
--- a/tests/shaders/glsl-invalid-asm-02.c
+++ b/tests/shaders/glsl-invalid-asm-02.c
@@ -64,7 +64,7 @@ piglit_display(void)
 
 		pass = GL_FALSE;
         }
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
@@ -98,7 +98,7 @@ piglit_init(int argc, char **argv)
                 printf("Unexpected OpenGL error state 0x%04x with bad "
 		       "vertex program (expected 0x%04x).\n",
 		       err, GL_INVALID_OPERATION);
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
         }
 
 	glEnable(GL_VERTEX_PROGRAM_ARB);
diff --git a/tests/shaders/glsl-kwin-blur-1.c b/tests/shaders/glsl-kwin-blur-1.c
index a617405b4..b29ce9b2e 100644
--- a/tests/shaders/glsl-kwin-blur-1.c
+++ b/tests/shaders/glsl-kwin-blur-1.c
@@ -222,7 +222,7 @@ enum piglit_result piglit_display(void)
 
     glutSwapBuffers();
 
-    return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+    return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void piglit_init(int argc, char **argv)
diff --git a/tests/shaders/glsl-kwin-blur-2.c b/tests/shaders/glsl-kwin-blur-2.c
index 61455fb1e..04cda317c 100644
--- a/tests/shaders/glsl-kwin-blur-2.c
+++ b/tests/shaders/glsl-kwin-blur-2.c
@@ -251,7 +251,7 @@ enum piglit_result piglit_display(void)
 
     glutSwapBuffers();
 
-    return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+    return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void piglit_init(int argc, char **argv)
diff --git a/tests/shaders/glsl-light-model.c b/tests/shaders/glsl-light-model.c
index be7cc71b0..928e6d61e 100644
--- a/tests/shaders/glsl-light-model.c
+++ b/tests/shaders/glsl-light-model.c
@@ -100,5 +100,5 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/shaders/glsl-link-bug30552.c b/tests/shaders/glsl-link-bug30552.c
index ae9626648..ee08803e6 100644
--- a/tests/shaders/glsl-link-bug30552.c
+++ b/tests/shaders/glsl-link-bug30552.c
@@ -35,7 +35,7 @@ int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
 enum piglit_result
 piglit_display(void)
 {
-	return PIGLIT_FAILURE;
+	return PIGLIT_FAIL;
 }
 
 void piglit_init(int argc, char **argv)
@@ -57,5 +57,5 @@ void piglit_init(int argc, char **argv)
 	glLinkProgram(prog);
 
 	ok = piglit_link_check_status(prog);
-	piglit_report_result(ok ? PIGLIT_SUCCESS : PIGLIT_FAILURE);
+	piglit_report_result(ok ? PIGLIT_PASS : PIGLIT_FAIL);
 }
diff --git a/tests/shaders/glsl-link-centroid-01.c b/tests/shaders/glsl-link-centroid-01.c
index b254d034e..39ebffc8c 100644
--- a/tests/shaders/glsl-link-centroid-01.c
+++ b/tests/shaders/glsl-link-centroid-01.c
@@ -48,7 +48,7 @@ int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
 enum piglit_result
 piglit_display(void)
 {
-	return PIGLIT_FAILURE;
+	return PIGLIT_FAIL;
 }
 
 /**
@@ -106,6 +106,6 @@ void piglit_init(int argc, char **argv)
 			"Program should have failed linking, but "
 			"it was (incorrectly) successful.\n");
 
-	piglit_report_result((!ok) ? PIGLIT_SUCCESS : PIGLIT_FAILURE);
+	piglit_report_result((!ok) ? PIGLIT_PASS : PIGLIT_FAIL);
 }
 
diff --git a/tests/shaders/glsl-link-empty-prog-01.c b/tests/shaders/glsl-link-empty-prog-01.c
index 86f231e42..1c44884e9 100644
--- a/tests/shaders/glsl-link-empty-prog-01.c
+++ b/tests/shaders/glsl-link-empty-prog-01.c
@@ -34,12 +34,12 @@ enum piglit_result piglit_display(void)
     glLinkProgram(objID);
     glValidateProgram(objID);
     if (!piglit_link_check_status(objID))
-	piglit_report_result(PIGLIT_FAILURE);
+	piglit_report_result(PIGLIT_FAIL);
     glUseProgram(objID);
     glUseProgram(0);
     glDeleteProgram(objID);
-    piglit_report_result(PIGLIT_SUCCESS);
-    return PIGLIT_SUCCESS;
+    piglit_report_result(PIGLIT_PASS);
+    return PIGLIT_PASS;
 }
 
 void
diff --git a/tests/shaders/glsl-link-empty-prog-02.c b/tests/shaders/glsl-link-empty-prog-02.c
index 7ece5abeb..d9a1789eb 100644
--- a/tests/shaders/glsl-link-empty-prog-02.c
+++ b/tests/shaders/glsl-link-empty-prog-02.c
@@ -82,7 +82,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
@@ -97,7 +97,7 @@ piglit_init(int argc, char **argv)
 
 	glLinkProgram(prog);
 	if (!piglit_link_check_status(prog))
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 
 	glUseProgram(prog);
 
diff --git a/tests/shaders/glsl-link-initializer-01.c b/tests/shaders/glsl-link-initializer-01.c
index 84bae16b7..11c81467d 100644
--- a/tests/shaders/glsl-link-initializer-01.c
+++ b/tests/shaders/glsl-link-initializer-01.c
@@ -42,7 +42,7 @@ int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
 enum piglit_result
 piglit_display(void)
 {
-	return PIGLIT_FAILURE;
+	return PIGLIT_FAIL;
 }
 
 void piglit_init(int argc, char **argv)
@@ -77,6 +77,6 @@ void piglit_init(int argc, char **argv)
 			"Program should have failed linking, but "
 			"it was (incorrectly) successful.\n");
 
-	piglit_report_result((!ok) ? PIGLIT_SUCCESS : PIGLIT_FAILURE);
+	piglit_report_result((!ok) ? PIGLIT_PASS : PIGLIT_FAIL);
 }
 
diff --git a/tests/shaders/glsl-link-initializer-02.c b/tests/shaders/glsl-link-initializer-02.c
index 8e0b8a3a7..c5d1c1cb8 100644
--- a/tests/shaders/glsl-link-initializer-02.c
+++ b/tests/shaders/glsl-link-initializer-02.c
@@ -41,7 +41,7 @@ int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
 enum piglit_result
 piglit_display(void)
 {
-	return PIGLIT_FAILURE;
+	return PIGLIT_FAIL;
 }
 
 void piglit_init(int argc, char **argv)
@@ -73,6 +73,6 @@ void piglit_init(int argc, char **argv)
 			"Program should have failed linking, but "
 			"it was (incorrectly) successful.\n");
 
-	piglit_report_result((!ok) ? PIGLIT_SUCCESS : PIGLIT_FAILURE);
+	piglit_report_result((!ok) ? PIGLIT_PASS : PIGLIT_FAIL);
 }
 
diff --git a/tests/shaders/glsl-link-initializer-03.c b/tests/shaders/glsl-link-initializer-03.c
index 130a90961..bba3778c7 100644
--- a/tests/shaders/glsl-link-initializer-03.c
+++ b/tests/shaders/glsl-link-initializer-03.c
@@ -43,7 +43,7 @@ int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
 enum piglit_result
 piglit_display(void)
 {
-	return PIGLIT_FAILURE;
+	return PIGLIT_FAIL;
 }
 
 void piglit_init(int argc, char **argv)
@@ -74,6 +74,6 @@ void piglit_init(int argc, char **argv)
         glGetProgramiv(prog_a, GL_LINK_STATUS, &a);
         glGetProgramiv(prog_b, GL_LINK_STATUS, &b);
 
-	piglit_report_result((a && b) ? PIGLIT_SUCCESS : PIGLIT_FAILURE);
+	piglit_report_result((a && b) ? PIGLIT_PASS : PIGLIT_FAIL);
 }
 
diff --git a/tests/shaders/glsl-link-initializer-04.c b/tests/shaders/glsl-link-initializer-04.c
index f5cff6832..9c08bbaf6 100644
--- a/tests/shaders/glsl-link-initializer-04.c
+++ b/tests/shaders/glsl-link-initializer-04.c
@@ -40,7 +40,7 @@ int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
 enum piglit_result
 piglit_display(void)
 {
-	return PIGLIT_FAILURE;
+	return PIGLIT_FAIL;
 }
 
 void piglit_init(int argc, char **argv)
@@ -66,6 +66,6 @@ void piglit_init(int argc, char **argv)
 	glLinkProgram(prog);
 
 	ok = piglit_link_check_status(prog);
-	piglit_report_result(ok ? PIGLIT_SUCCESS : PIGLIT_FAILURE);
+	piglit_report_result(ok ? PIGLIT_PASS : PIGLIT_FAIL);
 }
 
diff --git a/tests/shaders/glsl-link-initializer-05.c b/tests/shaders/glsl-link-initializer-05.c
index 85f534c3d..3c9eb523e 100644
--- a/tests/shaders/glsl-link-initializer-05.c
+++ b/tests/shaders/glsl-link-initializer-05.c
@@ -40,7 +40,7 @@ int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
 enum piglit_result
 piglit_display(void)
 {
-	return PIGLIT_FAILURE;
+	return PIGLIT_FAIL;
 }
 
 void piglit_init(int argc, char **argv)
@@ -66,6 +66,6 @@ void piglit_init(int argc, char **argv)
 	glLinkProgram(prog);
 
 	ok = piglit_link_check_status(prog);
-	piglit_report_result(ok ? PIGLIT_SUCCESS : PIGLIT_FAILURE);
+	piglit_report_result(ok ? PIGLIT_PASS : PIGLIT_FAIL);
 }
 
diff --git a/tests/shaders/glsl-link-initializer-06.c b/tests/shaders/glsl-link-initializer-06.c
index 294f9c5ae..e3031734e 100644
--- a/tests/shaders/glsl-link-initializer-06.c
+++ b/tests/shaders/glsl-link-initializer-06.c
@@ -40,7 +40,7 @@ int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
 enum piglit_result
 piglit_display(void)
 {
-	return PIGLIT_FAILURE;
+	return PIGLIT_FAIL;
 }
 
 void piglit_init(int argc, char **argv)
@@ -71,6 +71,6 @@ void piglit_init(int argc, char **argv)
 			"Program should have failed linking, but "
 			"it was (incorrectly) successful.\n");
 
-	piglit_report_result((!ok) ? PIGLIT_SUCCESS : PIGLIT_FAILURE);
+	piglit_report_result((!ok) ? PIGLIT_PASS : PIGLIT_FAIL);
 }
 
diff --git a/tests/shaders/glsl-link-invariant-01.c b/tests/shaders/glsl-link-invariant-01.c
index fedec7b1d..07f02a321 100644
--- a/tests/shaders/glsl-link-invariant-01.c
+++ b/tests/shaders/glsl-link-invariant-01.c
@@ -48,7 +48,7 @@ int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
 enum piglit_result
 piglit_display(void)
 {
-	return PIGLIT_FAILURE;
+	return PIGLIT_FAIL;
 }
 
 /**
@@ -106,6 +106,6 @@ void piglit_init(int argc, char **argv)
 			"Program should have failed linking, but "
 			"it was (incorrectly) successful.\n");
 
-	piglit_report_result((!ok) ? PIGLIT_SUCCESS : PIGLIT_FAILURE);
+	piglit_report_result((!ok) ? PIGLIT_PASS : PIGLIT_FAIL);
 }
 
diff --git a/tests/shaders/glsl-link-struct-array.c b/tests/shaders/glsl-link-struct-array.c
index 5a6621c07..a41bfb34c 100644
--- a/tests/shaders/glsl-link-struct-array.c
+++ b/tests/shaders/glsl-link-struct-array.c
@@ -29,7 +29,7 @@ int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
 enum piglit_result
 piglit_display(void)
 {
-	return PIGLIT_FAILURE;
+	return PIGLIT_FAIL;
 }
 
 GLboolean
@@ -73,6 +73,6 @@ void piglit_init(int argc, char **argv)
 	glLinkProgram(prog);
 
 	ok = link_check_status(prog);
-	piglit_report_result((ok) ? PIGLIT_SUCCESS : PIGLIT_FAILURE);
+	piglit_report_result((ok) ? PIGLIT_PASS : PIGLIT_FAIL);
 }
 
diff --git a/tests/shaders/glsl-lod-bias.c b/tests/shaders/glsl-lod-bias.c
index ed07322b8..9de328a87 100644
--- a/tests/shaders/glsl-lod-bias.c
+++ b/tests/shaders/glsl-lod-bias.c
@@ -202,5 +202,5 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/shaders/glsl-mat-attribute.c b/tests/shaders/glsl-mat-attribute.c
index b7c30f71a..16634ca4d 100644
--- a/tests/shaders/glsl-mat-attribute.c
+++ b/tests/shaders/glsl-mat-attribute.c
@@ -181,7 +181,7 @@ enum piglit_result piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void piglit_init(int argc, char **argv)
diff --git a/tests/shaders/glsl-max-varyings.c b/tests/shaders/glsl-max-varyings.c
index 538043155..c6799d9cb 100644
--- a/tests/shaders/glsl-max-varyings.c
+++ b/tests/shaders/glsl-max-varyings.c
@@ -175,7 +175,7 @@ draw(int max_varyings)
 
 		glLinkProgram(prog);
 		if (!piglit_link_check_status(prog))
-			piglit_report_result(PIGLIT_FAILURE);
+			piglit_report_result(PIGLIT_FAIL);
 
 		glUseProgram(prog);
 
@@ -248,11 +248,11 @@ printf("GL_MAX_VARYING_FLOATS = %i\n", max_components);
 	glutSwapBuffers();
 
 	if (!pass)
-		return PIGLIT_FAILURE;
+		return PIGLIT_FAIL;
 	if (warned)
 		return PIGLIT_WARN;
 	else
-		return PIGLIT_SUCCESS;
+		return PIGLIT_PASS;
 }
 
 void piglit_init(int argc, char **argv)
diff --git a/tests/shaders/glsl-novertexdata.c b/tests/shaders/glsl-novertexdata.c
index 96570fa37..b73476446 100644
--- a/tests/shaders/glsl-novertexdata.c
+++ b/tests/shaders/glsl-novertexdata.c
@@ -91,7 +91,7 @@ piglit_display(void)
 
 	result = piglit_probe_pixel_rgba(piglit_width /2, piglit_height / 2,
                                          expColor)
-		? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+		? PIGLIT_PASS : PIGLIT_FAIL;
 
 	glutSwapBuffers();
 
diff --git a/tests/shaders/glsl-orangebook-ch06-bump.c b/tests/shaders/glsl-orangebook-ch06-bump.c
index 960516e6e..e712286c7 100644
--- a/tests/shaders/glsl-orangebook-ch06-bump.c
+++ b/tests/shaders/glsl-orangebook-ch06-bump.c
@@ -93,7 +93,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/shaders/glsl-preprocessor-comments.c b/tests/shaders/glsl-preprocessor-comments.c
index 57b46e295..9684576cf 100644
--- a/tests/shaders/glsl-preprocessor-comments.c
+++ b/tests/shaders/glsl-preprocessor-comments.c
@@ -58,7 +58,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/shaders/glsl-reload-source.c b/tests/shaders/glsl-reload-source.c
index 8e4c505d7..b01bf02d9 100644
--- a/tests/shaders/glsl-reload-source.c
+++ b/tests/shaders/glsl-reload-source.c
@@ -87,7 +87,7 @@ static void compile_shader(GLuint shader, const char * text)
 		GLsizei len;
 		glGetInfoLogARB(shader, 1000, &len, log);
 		fprintf(stderr, "Error: problem compiling shader: %s\n", log);
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 }
 
@@ -102,7 +102,7 @@ static void link_program(GLuint program)
 		GLsizei len;
 		glGetInfoLogARB(program, 1000, &len, log);
 		fprintf(stderr, "Error: problem linking program: %s\n", log);
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 }
 
@@ -118,7 +118,7 @@ static void setup_shaders(const char * vstext, const char * fstext)
 enum piglit_result
 piglit_display(void)
 {
-	enum piglit_result result = PIGLIT_SUCCESS;
+	enum piglit_result result = PIGLIT_PASS;
 
 	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
@@ -127,22 +127,22 @@ piglit_display(void)
 	setup_shaders(vs_one, fs_one);
 	piglit_draw_rect(0, 0, piglit_width/2, piglit_height/2);
 	if (!piglit_probe_pixel_rgb(piglit_width/4, piglit_height/4, expect_one_one))
-		result = PIGLIT_FAILURE;
+		result = PIGLIT_FAIL;
 
 	setup_shaders(vs_one, fs_two);
 	piglit_draw_rect(piglit_width/2, 0, piglit_width/2, piglit_height/2);
 	if (!piglit_probe_pixel_rgb(3*piglit_width/4, piglit_height/4, expect_one_two))
-		result = PIGLIT_FAILURE;
+		result = PIGLIT_FAIL;
 
 	setup_shaders(vs_two, fs_one);
 	piglit_draw_rect(0, piglit_height/2, piglit_width/2, piglit_height/2);
 	if (!piglit_probe_pixel_rgb(piglit_width/4, 3*piglit_height/4, expect_two_one))
-		result = PIGLIT_FAILURE;
+		result = PIGLIT_FAIL;
 
 	setup_shaders(vs_two, fs_two);
 	piglit_draw_rect(piglit_width/2, piglit_height/2, piglit_width/2, piglit_height/2);
 	if (!piglit_probe_pixel_rgb(3*piglit_width/4, 3*piglit_height/4, expect_two_two))
-		result = PIGLIT_FAILURE;
+		result = PIGLIT_FAIL;
 
 	return result;
 }
diff --git a/tests/shaders/glsl-routing.c b/tests/shaders/glsl-routing.c
index 618230470..6194f6028 100644
--- a/tests/shaders/glsl-routing.c
+++ b/tests/shaders/glsl-routing.c
@@ -311,7 +311,7 @@ piglit_display(void)
 
     glutSwapBuffers();
 
-    return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+    return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void piglit_init(int argc, char **argv)
diff --git a/tests/shaders/glsl-sin.c b/tests/shaders/glsl-sin.c
index a3f348ae3..cddeb78ab 100644
--- a/tests/shaders/glsl-sin.c
+++ b/tests/shaders/glsl-sin.c
@@ -102,7 +102,7 @@ enum piglit_result piglit_display(void)
 
     glutSwapBuffers();
 
-    return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+    return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void piglit_init(int argc, char **argv)
diff --git a/tests/shaders/glsl-uniform-out-of-bounds.c b/tests/shaders/glsl-uniform-out-of-bounds.c
index a689339de..6810a0c0f 100644
--- a/tests/shaders/glsl-uniform-out-of-bounds.c
+++ b/tests/shaders/glsl-uniform-out-of-bounds.c
@@ -54,7 +54,7 @@ static void expect_error(GLenum expect, const char * where, ...)
 		va_end(va);
 		fprintf(stderr, "\n");
 
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 }
 
@@ -73,7 +73,7 @@ static GLuint compile_shader(GLenum shaderType, const char * text)
 		GLsizei len;
 		glGetInfoLogARB(shader, 1000, &len, log);
 		fprintf(stderr, "Error: problem compiling shader: %s\n", log);
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 	return shader;
 }
@@ -96,7 +96,7 @@ static GLuint link_program(GLuint vs, GLuint fs)
 		GLsizei len;
 		glGetInfoLogARB(program, 1000, &len, log);
 		fprintf(stderr, "Error: problem linking program: %s\n", log);
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	return program;
@@ -300,7 +300,7 @@ piglit_display(void)
 	test_vector("vec3", ", 0", glUniform3fvARB);
 	test_vector("vec4", "", glUniform4fvARB);
 
-	return PIGLIT_SUCCESS;
+	return PIGLIT_PASS;
 }
 
 void
diff --git a/tests/shaders/glsl-uniform-update.c b/tests/shaders/glsl-uniform-update.c
index 203533fe1..18bdad732 100644
--- a/tests/shaders/glsl-uniform-update.c
+++ b/tests/shaders/glsl-uniform-update.c
@@ -65,7 +65,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/shaders/glsl-unused-varying.c b/tests/shaders/glsl-unused-varying.c
index 155cf3f5d..93f41292a 100644
--- a/tests/shaders/glsl-unused-varying.c
+++ b/tests/shaders/glsl-unused-varying.c
@@ -68,7 +68,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void piglit_init(int argc, char **argv)
diff --git a/tests/shaders/glsl-useprogram-displaylist.c b/tests/shaders/glsl-useprogram-displaylist.c
index d26f718c1..616c28536 100644
--- a/tests/shaders/glsl-useprogram-displaylist.c
+++ b/tests/shaders/glsl-useprogram-displaylist.c
@@ -92,5 +92,5 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/shaders/glsl-vs-arrays.c b/tests/shaders/glsl-vs-arrays.c
index 77c38b419..c587e096a 100644
--- a/tests/shaders/glsl-vs-arrays.c
+++ b/tests/shaders/glsl-vs-arrays.c
@@ -55,7 +55,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void piglit_init(int argc, char **argv)
diff --git a/tests/shaders/glsl-vs-functions.c b/tests/shaders/glsl-vs-functions.c
index c48958b40..97a40a514 100644
--- a/tests/shaders/glsl-vs-functions.c
+++ b/tests/shaders/glsl-vs-functions.c
@@ -56,7 +56,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/shaders/glsl-vs-if-bool.c b/tests/shaders/glsl-vs-if-bool.c
index a73e18b2d..0b512f655 100644
--- a/tests/shaders/glsl-vs-if-bool.c
+++ b/tests/shaders/glsl-vs-if-bool.c
@@ -58,7 +58,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void piglit_init(int argc, char **argv)
diff --git a/tests/shaders/glsl-vs-loop-nested.c b/tests/shaders/glsl-vs-loop-nested.c
index e8a1298b5..2d59c6183 100644
--- a/tests/shaders/glsl-vs-loop-nested.c
+++ b/tests/shaders/glsl-vs-loop-nested.c
@@ -90,7 +90,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/shaders/glsl-vs-loop.c b/tests/shaders/glsl-vs-loop.c
index 60f6a14aa..67a625e06 100644
--- a/tests/shaders/glsl-vs-loop.c
+++ b/tests/shaders/glsl-vs-loop.c
@@ -89,7 +89,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/shaders/glsl-vs-mov-after-deref.c b/tests/shaders/glsl-vs-mov-after-deref.c
index 7ab9bb595..447b70c75 100644
--- a/tests/shaders/glsl-vs-mov-after-deref.c
+++ b/tests/shaders/glsl-vs-mov-after-deref.c
@@ -55,7 +55,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void piglit_init(int argc, char **argv)
diff --git a/tests/shaders/glsl-vs-normalscale.c b/tests/shaders/glsl-vs-normalscale.c
index a8f383521..30b0031c8 100644
--- a/tests/shaders/glsl-vs-normalscale.c
+++ b/tests/shaders/glsl-vs-normalscale.c
@@ -59,7 +59,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void piglit_init(int argc, char **argv)
diff --git a/tests/shaders/glsl-vs-point-size.c b/tests/shaders/glsl-vs-point-size.c
index 3e831540b..5b7fc1d0b 100644
--- a/tests/shaders/glsl-vs-point-size.c
+++ b/tests/shaders/glsl-vs-point-size.c
@@ -76,7 +76,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/shaders/glsl-vs-raytrace-bug26691.c b/tests/shaders/glsl-vs-raytrace-bug26691.c
index 7ff4f2dc1..22fd9905f 100644
--- a/tests/shaders/glsl-vs-raytrace-bug26691.c
+++ b/tests/shaders/glsl-vs-raytrace-bug26691.c
@@ -261,7 +261,7 @@ piglit_display(void)
 
   return ((float)passed_cnt > (1.0F-failing_pixel_percentage)
           *piglit_width*piglit_height)
-    ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+    ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
@@ -290,5 +290,5 @@ piglit_init(int argc, char **argv)
 
   assert(glIsProgram(program));
   if (!piglit_link_check_status(program))
-      piglit_report_result(PIGLIT_FAILURE);
+      piglit_report_result(PIGLIT_FAIL);
 }
diff --git a/tests/shaders/glsl-vs-sqrt-zero.c b/tests/shaders/glsl-vs-sqrt-zero.c
index d689c88dc..2794c1416 100644
--- a/tests/shaders/glsl-vs-sqrt-zero.c
+++ b/tests/shaders/glsl-vs-sqrt-zero.c
@@ -52,7 +52,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/shaders/glsl-vs-texturematrix-1.c b/tests/shaders/glsl-vs-texturematrix-1.c
index e7b9c7a03..d46c63e60 100644
--- a/tests/shaders/glsl-vs-texturematrix-1.c
+++ b/tests/shaders/glsl-vs-texturematrix-1.c
@@ -74,7 +74,7 @@ piglit_display(void)
 
 	glDeleteTextures(1, &tex);
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void piglit_init(int argc, char **argv)
diff --git a/tests/shaders/glsl-vs-texturematrix-2.c b/tests/shaders/glsl-vs-texturematrix-2.c
index 192a2fe8a..1efe26143 100644
--- a/tests/shaders/glsl-vs-texturematrix-2.c
+++ b/tests/shaders/glsl-vs-texturematrix-2.c
@@ -76,7 +76,7 @@ piglit_display(void)
 
 	glDeleteTextures(1, &tex);
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void piglit_init(int argc, char **argv)
diff --git a/tests/shaders/glsl-vs-user-varying-ff.c b/tests/shaders/glsl-vs-user-varying-ff.c
index 317fd9511..1fdb30d6f 100644
--- a/tests/shaders/glsl-vs-user-varying-ff.c
+++ b/tests/shaders/glsl-vs-user-varying-ff.c
@@ -49,14 +49,14 @@ enum piglit_result
 piglit_display(void)
 {
 	static const float green[3] = { 0.0, 1.0, 0.0 };
-	enum piglit_result result = PIGLIT_SUCCESS;
+	enum piglit_result result = PIGLIT_PASS;
 
 	glClear(GL_COLOR_BUFFER_BIT);
 
 	piglit_draw_rect(10, 10, 10, 10);
 
 	if (!piglit_probe_pixel_rgb(15, 15, green))
-		result = PIGLIT_FAILURE;
+		result = PIGLIT_FAIL;
 
 	if (!piglit_automatic)
 		glutSwapBuffers();
@@ -87,7 +87,7 @@ piglit_init(int argc, char **argv)
 	 * had better succeed!
 	 */
 	if (!piglit_link_check_status(prog))
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 
 	glUseProgram(prog);
 }
diff --git a/tests/shaders/gpu_shader4_attribs.c b/tests/shaders/gpu_shader4_attribs.c
index a8290961f..55f99601b 100644
--- a/tests/shaders/gpu_shader4_attribs.c
+++ b/tests/shaders/gpu_shader4_attribs.c
@@ -505,15 +505,15 @@ enum piglit_result
 piglit_display(void)
 {
    if (!test_attrib_funcs())
-      return PIGLIT_FAILURE;
+      return PIGLIT_FAIL;
 
    if (!test_uniform_funcs())
-      return PIGLIT_FAILURE;
+      return PIGLIT_FAIL;
 
    if (!test_attrib_array())
-      return PIGLIT_FAILURE;
+      return PIGLIT_FAIL;
 
-   return PIGLIT_SUCCESS;
+   return PIGLIT_PASS;
 }
 
 
diff --git a/tests/shaders/link-mismatch-layout-01.c b/tests/shaders/link-mismatch-layout-01.c
index fdcba4382..ec0de6de8 100644
--- a/tests/shaders/link-mismatch-layout-01.c
+++ b/tests/shaders/link-mismatch-layout-01.c
@@ -56,7 +56,7 @@ static const char layout_upper[] =
 enum piglit_result
 piglit_display(void)
 {
-	return PIGLIT_FAILURE;
+	return PIGLIT_FAIL;
 }
 
 void
@@ -87,8 +87,8 @@ piglit_init(int argc, char **argv)
 		fprintf(stderr,
 			"Linking with mismatched gl_FragCoord layouts "
 			"succeeded when it should have failed.\n");
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
-	piglit_report_result(PIGLIT_SUCCESS);
+	piglit_report_result(PIGLIT_PASS);
 }
diff --git a/tests/shaders/link-mismatch-layout-02.c b/tests/shaders/link-mismatch-layout-02.c
index 52841419e..063646dba 100644
--- a/tests/shaders/link-mismatch-layout-02.c
+++ b/tests/shaders/link-mismatch-layout-02.c
@@ -56,7 +56,7 @@ static const char layout_less[] =
 enum piglit_result
 piglit_display(void)
 {
-	return PIGLIT_FAILURE;
+	return PIGLIT_FAIL;
 }
 
 void
@@ -87,8 +87,8 @@ piglit_init(int argc, char **argv)
 		fprintf(stderr,
 			"Linking with mismatched gl_FragDepth layouts "
 			"succeeded when it should have failed.\n");
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
-	piglit_report_result(PIGLIT_SUCCESS);
+	piglit_report_result(PIGLIT_PASS);
 }
diff --git a/tests/shaders/link-mismatch-layout-03.c b/tests/shaders/link-mismatch-layout-03.c
index 65d645656..77d2c823f 100644
--- a/tests/shaders/link-mismatch-layout-03.c
+++ b/tests/shaders/link-mismatch-layout-03.c
@@ -54,7 +54,7 @@ static const char layout_upper[] =
 enum piglit_result
 piglit_display(void)
 {
-	return PIGLIT_FAILURE;
+	return PIGLIT_FAIL;
 }
 
 void
@@ -85,8 +85,8 @@ piglit_init(int argc, char **argv)
 		fprintf(stderr,
 			"Linking with gl_FragCoord layouts "
 			"failed when it should have succeeded.\n");
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
-	piglit_report_result(PIGLIT_SUCCESS);
+	piglit_report_result(PIGLIT_PASS);
 }
diff --git a/tests/shaders/link-unresolved-function.c b/tests/shaders/link-unresolved-function.c
index 879b81dbf..a255b287e 100644
--- a/tests/shaders/link-unresolved-function.c
+++ b/tests/shaders/link-unresolved-function.c
@@ -39,7 +39,7 @@ static const char bad_vs_text[] =
 enum piglit_result
 piglit_display(void)
 {
-	return PIGLIT_FAILURE;
+	return PIGLIT_FAIL;
 }
 
 void
@@ -65,8 +65,8 @@ piglit_init(int argc, char **argv)
 		fprintf(stderr,
 			"Linking with unresolved symbol succeeded when it "
 			"should have failed.\n");
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
-	piglit_report_result(PIGLIT_SUCCESS);
+	piglit_report_result(PIGLIT_PASS);
 }
diff --git a/tests/shaders/shader_runner.c b/tests/shaders/shader_runner.c
index 315841d2e..92bd13031 100644
--- a/tests/shaders/shader_runner.c
+++ b/tests/shaders/shader_runner.c
@@ -135,7 +135,7 @@ compile_glsl(GLenum target, bool release_text)
 			info);
 
 		free(info);
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	if (release_text) {
@@ -262,7 +262,7 @@ load_shader_file(const char *line)
 		strcpy_to_space(buf, line);
 
 		printf("could not load file \"%s\"\n", buf);
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	shader_strings[num_shader_strings] = text;
@@ -312,7 +312,7 @@ process_comparison(const char *src, enum comparison *cmp)
 	strncpy(buf, src, sizeof(buf));
 	buf[sizeof(buf) - 1] = '\0';
 	printf("invalid comparison in test script:\n%s\n", buf);
-	piglit_report_result(PIGLIT_FAILURE);
+	piglit_report_result(PIGLIT_FAIL);
 
 	/* Won't get here. */
 	return NULL;
@@ -523,7 +523,7 @@ link_and_use_shaders(void)
 			info);
 
 		free(info);
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	piglit_UseProgram(prog);
@@ -541,7 +541,7 @@ link_and_use_shaders(void)
 		piglit_GetProgramInfoLog(prog, size, NULL, info);
 		fprintf(stderr, "Info log: %s\n", info);
 
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 }
 
@@ -556,7 +556,7 @@ process_test_script(const char *script_name)
 
 	if (line == NULL) {
 		printf("could not read file \"%s\"\n", script_name);
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	while (line[0] != '\0') {
@@ -655,7 +655,7 @@ set_uniform(const char *line)
 	if (loc < 0) {
 		printf("cannot get location of uniform \"%s\"\n",
 		       name);
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	if (strncmp("float", type, 5) == 0) {
@@ -685,7 +685,7 @@ set_uniform(const char *line)
 
 	strcpy_to_space(name, type);
 	printf("unknown uniform type \"%s\"", name);
-	piglit_report_result(PIGLIT_FAILURE);
+	piglit_report_result(PIGLIT_FAIL);
 
 	return;
 }
@@ -736,7 +736,7 @@ piglit_display(void)
 	GLbitfield clear_bits = 0;
 
 	if (test_start == NULL)
-		return PIGLIT_SUCCESS;
+		return PIGLIT_PASS;
 
 
 	line = test_start;
@@ -901,7 +901,7 @@ piglit_display(void)
 		} else if ((line[0] != '\n') && (line[0] != '\0')
 			   && (line[0] != '#')) {
 			printf("unknown command \"%s\"", line);
-			piglit_report_result(PIGLIT_FAILURE);
+			piglit_report_result(PIGLIT_FAIL);
 		}
 
 		line = strchrnul(line, '\n');
@@ -917,7 +917,7 @@ piglit_display(void)
 		piglit_UseProgram(0);
 	}
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 
diff --git a/tests/shaders/sso-simple.c b/tests/shaders/sso-simple.c
index 2a359e2df..99a77f946 100644
--- a/tests/shaders/sso-simple.c
+++ b/tests/shaders/sso-simple.c
@@ -51,7 +51,7 @@ piglit_display(void)
 {
 	static const float green[3] = { 0.0, 1.0, 0.0 };
 	static const float blue[3]  = { 0.0, 0.0, 1.0 };
-	enum piglit_result result = PIGLIT_SUCCESS;
+	enum piglit_result result = PIGLIT_PASS;
 	float x = 10.0;
 
 	glClear(GL_COLOR_BUFFER_BIT);
@@ -65,7 +65,7 @@ piglit_display(void)
 	glUseShaderProgramEXT(GL_FRAGMENT_SHADER, prog[1]);
 	piglit_draw_rect(x, 10, 10, 10);
 	if (!piglit_probe_pixel_rgb(x + 5, 15, green))
-		result = PIGLIT_FAILURE;
+		result = PIGLIT_FAIL;
 
 	x += 20.0;
 
@@ -81,7 +81,7 @@ piglit_display(void)
 	glUseShaderProgramEXT(GL_FRAGMENT_SHADER, prog[1]);
 	piglit_draw_rect(x, 10, 10, 10);
 	if (!piglit_probe_pixel_rgb(x + 5, 15, green))
-		result = PIGLIT_FAILURE;
+		result = PIGLIT_FAIL;
 
 	x += 20.0;
 
@@ -92,7 +92,7 @@ piglit_display(void)
 	glUseShaderProgramEXT(GL_VERTEX_SHADER, 0);
 	piglit_draw_rect(x, 10, 10, 10);
 	if (!piglit_probe_pixel_rgb(x + 5, 15, blue))
-		result = PIGLIT_FAILURE;
+		result = PIGLIT_FAIL;
 
 	if (!piglit_automatic)
 		glutSwapBuffers();
diff --git a/tests/shaders/sso-uniforms-01.c b/tests/shaders/sso-uniforms-01.c
index c483ecbdd..100390bfe 100644
--- a/tests/shaders/sso-uniforms-01.c
+++ b/tests/shaders/sso-uniforms-01.c
@@ -53,7 +53,7 @@ piglit_display(void)
 {
 	static const float green[3] = { 0.0, 1.0, 0.0 };
 	static const float blue[3]  = { 0.0, 0.0, 1.0 };
-	enum piglit_result result = PIGLIT_SUCCESS;
+	enum piglit_result result = PIGLIT_PASS;
 
 	glClear(GL_COLOR_BUFFER_BIT);
 	glColor3fv(blue);
@@ -66,7 +66,7 @@ piglit_display(void)
 	glUseShaderProgramEXT(GL_FRAGMENT_SHADER, prog[1]);
 	piglit_draw_rect(10, 10, 10, 10);
 	if (!piglit_probe_pixel_rgb(15, 15, green))
-		result = PIGLIT_FAILURE;
+		result = PIGLIT_FAIL;
 
 	if (!piglit_automatic)
 		glutSwapBuffers();
@@ -97,7 +97,7 @@ piglit_init(int argc, char **argv)
 	if (loc < 0) {
 		printf("Unable to get uniform location in separate vertex "
 		       "shader");
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	glActiveProgramEXT(prog[0]);
@@ -107,7 +107,7 @@ piglit_init(int argc, char **argv)
 	if (loc < 0) {
 		printf("Unable to get uniform location in separate fragment "
 		       "shader");
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	glActiveProgramEXT(prog[1]);
diff --git a/tests/shaders/sso-uniforms-02.c b/tests/shaders/sso-uniforms-02.c
index 5e56dcb28..d335a2289 100644
--- a/tests/shaders/sso-uniforms-02.c
+++ b/tests/shaders/sso-uniforms-02.c
@@ -52,7 +52,7 @@ piglit_display(void)
 {
 	static const float green[3] = { 0.0, 1.0, 0.0 };
 	static const float blue[3]  = { 0.0, 0.0, 1.0 };
-	enum piglit_result result = PIGLIT_SUCCESS;
+	enum piglit_result result = PIGLIT_PASS;
 
 	glClear(GL_COLOR_BUFFER_BIT);
 	glColor3fv(blue);
@@ -65,7 +65,7 @@ piglit_display(void)
 	glUseShaderProgramEXT(GL_FRAGMENT_SHADER, prog[1]);
 	piglit_draw_rect(10, 10, 10, 10);
 	if (!piglit_probe_pixel_rgb(15, 15, green))
-		result = PIGLIT_FAILURE;
+		result = PIGLIT_FAIL;
 
 	if (!piglit_automatic)
 		glutSwapBuffers();
@@ -96,7 +96,7 @@ piglit_init(int argc, char **argv)
 	if (loc < 0) {
 		printf("Unable to get uniform location in separate vertex "
 		       "shader");
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	glActiveProgramEXT(prog[0]);
@@ -106,7 +106,7 @@ piglit_init(int argc, char **argv)
 	if (loc < 0) {
 		printf("Unable to get uniform location in separate fragment "
 		       "shader");
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	glActiveProgramEXT(prog[1]);
diff --git a/tests/shaders/sso-user-varying-01.c b/tests/shaders/sso-user-varying-01.c
index 3b51d4ac3..29c355f6e 100644
--- a/tests/shaders/sso-user-varying-01.c
+++ b/tests/shaders/sso-user-varying-01.c
@@ -57,7 +57,7 @@ enum piglit_result
 piglit_display(void)
 {
 	static const float green[3] = { 0.0, 1.0, 0.0 };
-	enum piglit_result result = PIGLIT_SUCCESS;
+	enum piglit_result result = PIGLIT_PASS;
 
 	glClear(GL_COLOR_BUFFER_BIT);
 
@@ -69,7 +69,7 @@ piglit_display(void)
 	 * illegal way.  The rendered result must not be green!
 	 */
 	if (piglit_probe_pixel_rgb(15, 15, green))
-		result = PIGLIT_FAILURE;
+		result = PIGLIT_FAIL;
 
 	if (!piglit_automatic)
 		glutSwapBuffers();
@@ -111,7 +111,7 @@ piglit_init(int argc, char **argv)
 		&& try_to_render;
 
 	if (!try_to_render)
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 
 	printf("\"Probe at (.., ..)\" returning mismatched results is "
 	       "expected and correct.\n");
diff --git a/tests/shaders/sso-user-varying-02.c b/tests/shaders/sso-user-varying-02.c
index ff9ebb7ab..abdc90bba 100644
--- a/tests/shaders/sso-user-varying-02.c
+++ b/tests/shaders/sso-user-varying-02.c
@@ -57,7 +57,7 @@ enum piglit_result
 piglit_display(void)
 {
 	static const float green[3] = { 0.0, 1.0, 0.0 };
-	enum piglit_result result = PIGLIT_SUCCESS;
+	enum piglit_result result = PIGLIT_PASS;
 
 	glClear(GL_COLOR_BUFFER_BIT);
 
@@ -69,7 +69,7 @@ piglit_display(void)
 	 * illegal way.  The rendered result must not be green!
 	 */
 	if (piglit_probe_pixel_rgb(15, 15, green))
-		result = PIGLIT_FAILURE;
+		result = PIGLIT_FAIL;
 
 	if (!piglit_automatic)
 		glutSwapBuffers();
@@ -107,7 +107,7 @@ piglit_init(int argc, char **argv)
 		&& try_to_render;
 
 	if (!try_to_render)
-		piglit_report_result(PIGLIT_SUCCESS);
+		piglit_report_result(PIGLIT_PASS);
 
 	printf("\"Probe at (.., ..)\" returning mismatched results is "
 	       "expected and correct.\n");
diff --git a/tests/shaders/trinity-fp1.c b/tests/shaders/trinity-fp1.c
index 639a38509..5568e1b04 100644
--- a/tests/shaders/trinity-fp1.c
+++ b/tests/shaders/trinity-fp1.c
@@ -156,7 +156,7 @@ piglit_display(void)
 	DoFrame();
 	succ = DoTest();
 
-	return succ ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return succ ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 
diff --git a/tests/shaders/useprogram-flushverts-1.c b/tests/shaders/useprogram-flushverts-1.c
index 399497e0f..b4ed7c746 100644
--- a/tests/shaders/useprogram-flushverts-1.c
+++ b/tests/shaders/useprogram-flushverts-1.c
@@ -88,7 +88,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/shaders/useprogram-flushverts-2.c b/tests/shaders/useprogram-flushverts-2.c
index 95137d079..7ed71af95 100644
--- a/tests/shaders/useprogram-flushverts-2.c
+++ b/tests/shaders/useprogram-flushverts-2.c
@@ -94,7 +94,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/shaders/useprogram-inside-begin.c b/tests/shaders/useprogram-inside-begin.c
index 22fb57a20..f9bc974d7 100644
--- a/tests/shaders/useprogram-inside-begin.c
+++ b/tests/shaders/useprogram-inside-begin.c
@@ -41,13 +41,13 @@ static const char fs_text[] =
 enum piglit_result
 piglit_display(void)
 {
-	return PIGLIT_FAILURE;
+	return PIGLIT_FAIL;
 }
 
 void
 piglit_init(int argc, char **argv)
 {
-	enum piglit_result result = PIGLIT_SUCCESS;
+	enum piglit_result result = PIGLIT_PASS;
 	GLint prog;
 	GLint fs;
 	GLint vs;
@@ -80,7 +80,7 @@ piglit_init(int argc, char **argv)
 		       "glUseProgram(0) "
 		       "inside glBegin/glEnd pair (expected 0x%04x).\n",
 		       err, GL_INVALID_OPERATION);
-		result = PIGLIT_FAILURE;
+		result = PIGLIT_FAIL;
 	}
 
 	while (glGetError() != 0)
@@ -101,7 +101,7 @@ piglit_init(int argc, char **argv)
 		       "glUseProgram(prog) "
 		       "inside glBegin/glEnd pair (expected 0x%04x).\n",
 		       err, GL_INVALID_OPERATION);
-		result = PIGLIT_FAILURE;
+		result = PIGLIT_FAIL;
 	}
 
 	piglit_report_result(result);
diff --git a/tests/shaders/useprogram-refcount-1.c b/tests/shaders/useprogram-refcount-1.c
index a43413a1a..a52d1f192 100644
--- a/tests/shaders/useprogram-refcount-1.c
+++ b/tests/shaders/useprogram-refcount-1.c
@@ -62,7 +62,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/shaders/useshaderprogram-bad-program.c b/tests/shaders/useshaderprogram-bad-program.c
index 5b6b95362..4318f6be6 100644
--- a/tests/shaders/useshaderprogram-bad-program.c
+++ b/tests/shaders/useshaderprogram-bad-program.c
@@ -42,13 +42,13 @@ static const char good_vs_text[] =
 enum piglit_result
 piglit_display(void)
 {
-	return PIGLIT_FAILURE;
+	return PIGLIT_FAIL;
 }
 
 void
 piglit_init(int argc, char **argv)
 {
-	enum piglit_result result = PIGLIT_SUCCESS;
+	enum piglit_result result = PIGLIT_PASS;
 	GLenum err;
 	GLint ok;
 	GLuint prog;
@@ -73,7 +73,7 @@ piglit_init(int argc, char **argv)
 		fprintf(stderr,
 			"Linking with unresolved symbol succeeded when it "
 			"should have failed.\n");
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	/* There shouldn't be any GL errors, but clear them all just to be
@@ -93,7 +93,7 @@ piglit_init(int argc, char **argv)
 		       "glUseShaderProgramEXT called with\n"
 		       "an unlinked shader program (expected 0x%04x).\n",
 		       err, GL_INVALID_OPERATION);
-		result = PIGLIT_FAILURE;
+		result = PIGLIT_FAIL;
 	}
 
 	glDeleteProgram(prog);
@@ -124,7 +124,7 @@ piglit_init(int argc, char **argv)
 		       "glUseShaderProgramEXT called with\n"
 		       "an unlinked shader program (expected 0x%04x).\n",
 		       err, GL_INVALID_OPERATION);
-		result = PIGLIT_FAILURE;
+		result = PIGLIT_FAIL;
 	}
 
 	glDeleteProgram(prog);
diff --git a/tests/shaders/useshaderprogram-bad-type.c b/tests/shaders/useshaderprogram-bad-type.c
index 0b0f5df00..150406a72 100644
--- a/tests/shaders/useshaderprogram-bad-type.c
+++ b/tests/shaders/useshaderprogram-bad-type.c
@@ -35,7 +35,7 @@ int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
 enum piglit_result
 piglit_display(void)
 {
-	return PIGLIT_FAILURE;
+	return PIGLIT_FAIL;
 }
 
 GLboolean
@@ -94,5 +94,5 @@ piglit_init(int argc, char **argv)
 	pass = try_UseShaderProgram(GL_GEOMETRY_SHADER_ARB, expect)
 		&& pass;
 
-	piglit_report_result(pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE);
+	piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
 }
diff --git a/tests/shaders/useshaderprogram-flushverts-1.c b/tests/shaders/useshaderprogram-flushverts-1.c
index 5303f29d8..99410db25 100644
--- a/tests/shaders/useshaderprogram-flushverts-1.c
+++ b/tests/shaders/useshaderprogram-flushverts-1.c
@@ -90,7 +90,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/shaders/vp-address-01.c b/tests/shaders/vp-address-01.c
index ee5c64ef4..9d3da173d 100644
--- a/tests/shaders/vp-address-01.c
+++ b/tests/shaders/vp-address-01.c
@@ -77,7 +77,7 @@ piglit_display(void)
 	static const GLfloat color[4] = { 0.0, 1.0, 0.0, 1.0 };
 	static const GLfloat good_color[4] = { 0.0, 1.0, 0.0, 1.0 };
 	static const GLfloat bad_color[4] = { 1.0, 0.0, 0.0, 1.0 };
-	enum piglit_result result = PIGLIT_SUCCESS;
+	enum piglit_result result = PIGLIT_PASS;
 	unsigned i;
 
 	glClear(GL_COLOR_BUFFER_BIT);
@@ -103,7 +103,7 @@ piglit_display(void)
 				printf("shader %u failed with attribute "
 				       "%.1f\n", i, attrib[i]);
 
-			result = PIGLIT_FAILURE;
+			result = PIGLIT_FAIL;
 		}
 	}
 
@@ -132,7 +132,7 @@ piglit_init(int argc, char **argv)
 		/* we have to have at least one address register */
 		if (! piglit_automatic)
 			printf("GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB == 0\n");
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	for (i = 0; i < ELEMENTS(progs); i++) {
diff --git a/tests/shaders/vp-address-02.c b/tests/shaders/vp-address-02.c
index d0c706a3e..19cb57af5 100644
--- a/tests/shaders/vp-address-02.c
+++ b/tests/shaders/vp-address-02.c
@@ -88,7 +88,7 @@ piglit_display(void)
 	static const GLfloat color[4] = { 0.0, 0.5, 0.0, 0.5 };
 	static const GLfloat good_color[4] = { 0.0, 1.0, 0.0, 1.0 };
 	static const GLfloat bad_color[4] = { 1.0, 0.0, 0.0, 1.0 };
-	enum piglit_result result = PIGLIT_SUCCESS;
+	enum piglit_result result = PIGLIT_PASS;
 	unsigned i;
 
 	glClear(GL_COLOR_BUFFER_BIT);
@@ -117,7 +117,7 @@ piglit_display(void)
 				       attrib[(i * 2) + 0],
 				       attrib[(i * 2) + 1]);
 
-			result = PIGLIT_FAILURE;
+			result = PIGLIT_FAIL;
 		}
 	}
 
@@ -147,7 +147,7 @@ piglit_init(int argc, char **argv)
 		if (! piglit_automatic)
 			printf("GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB == 0\n");
 
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	} else 	if (max_address_registers == 1) {
 		if (glutExtensionSupported("GL_NV_vertex_program2_option")) {
 			/* this extension requires two address regs */
@@ -155,7 +155,7 @@ piglit_init(int argc, char **argv)
 				printf("GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB "
 				       "== 1\n");
 
-			piglit_report_result(PIGLIT_FAILURE);
+			piglit_report_result(PIGLIT_FAIL);
 		} else {
 			piglit_report_result(PIGLIT_SKIP);
 		}
diff --git a/tests/shaders/vp-address-03.c b/tests/shaders/vp-address-03.c
index ef6a1692b..bb0c03825 100644
--- a/tests/shaders/vp-address-03.c
+++ b/tests/shaders/vp-address-03.c
@@ -69,7 +69,7 @@ piglit_display(void)
 {
 	static const GLfloat color[4] = { 0.0, 1.0, 0.0, 1.0 };
 	static const GLfloat bad_color[4] = { 1.0, 0.0, 0.0, 1.0 };
-	enum piglit_result result = PIGLIT_SUCCESS;
+	enum piglit_result result = PIGLIT_PASS;
 	unsigned i;
 
 	glClear(GL_COLOR_BUFFER_BIT);
@@ -95,7 +95,7 @@ piglit_display(void)
 		if (!piglit_probe_pixel_rgb(x + (BOX_SIZE / 2),
 					    1 + (BOX_SIZE / 2),
 					    color)) {
-			result = PIGLIT_FAILURE;
+			result = PIGLIT_FAIL;
 		}
 	}
 
diff --git a/tests/shaders/vp-address-04.c b/tests/shaders/vp-address-04.c
index 93787d3d8..691f1ebce 100644
--- a/tests/shaders/vp-address-04.c
+++ b/tests/shaders/vp-address-04.c
@@ -130,7 +130,7 @@ piglit_display(void)
 	static const GLfloat color[4] = { 0.0, 0.5, 0.0, 0.5 };
 	static const GLfloat good_color[4] = { 0.0, 1.0, 0.0, 1.0 };
 	static const GLfloat bad_color[4] = { 1.0, 0.0, 0.0, 1.0 };
-	enum piglit_result result = PIGLIT_SUCCESS;
+	enum piglit_result result = PIGLIT_PASS;
 	unsigned i;
 	unsigned j;
 
@@ -173,7 +173,7 @@ piglit_display(void)
 					       src);
 				}
 
-				result = PIGLIT_FAILURE;
+				result = PIGLIT_FAIL;
 			}
 		}
 	}
@@ -243,7 +243,7 @@ piglit_init(int argc, char **argv)
 		if (! piglit_automatic)
 			printf("GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB == 0\n");
 
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	} else 	if (max_address_registers == 1) {
 		if (glutExtensionSupported("GL_NV_vertex_program2_option")) {
 			/* this extension requires two address regs */
@@ -251,7 +251,7 @@ piglit_init(int argc, char **argv)
 				printf("GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB "
 				       "== 1\n");
 
-			piglit_report_result(PIGLIT_FAILURE);
+			piglit_report_result(PIGLIT_FAIL);
 		} else {
 			piglit_report_result(PIGLIT_SKIP);
 		}
diff --git a/tests/shaders/vp-address-05.c b/tests/shaders/vp-address-05.c
index e830aaa5a..8ae521a09 100644
--- a/tests/shaders/vp-address-05.c
+++ b/tests/shaders/vp-address-05.c
@@ -76,7 +76,7 @@ piglit_display(void)
 		{ 0.0, 3.0, 2.0, 1.0 },
 		{ 0.0, 3.0, 1.0, 2.0 },
 	};
-	enum piglit_result result = PIGLIT_SUCCESS;
+	enum piglit_result result = PIGLIT_PASS;
 	unsigned i;
 
 	glClear(GL_COLOR_BUFFER_BIT);
@@ -98,7 +98,7 @@ piglit_display(void)
 		if (!piglit_probe_pixel_rgb(x + (BOX_SIZE / 2),
 					    1 + (BOX_SIZE / 2),
 					    color)) {
-			result = PIGLIT_FAILURE;
+			result = PIGLIT_FAIL;
 		}
 	}
 
diff --git a/tests/shaders/vp-address-06.c b/tests/shaders/vp-address-06.c
index a761bb63a..bf4a552cb 100644
--- a/tests/shaders/vp-address-06.c
+++ b/tests/shaders/vp-address-06.c
@@ -75,7 +75,7 @@ piglit_display(void)
 		{ 1.0, -37.0, 1.0, 68.2 },
 		{ -37.0, 1.0, 68.2, 1.0 },
 	};
-	enum piglit_result result = PIGLIT_SUCCESS;
+	enum piglit_result result = PIGLIT_PASS;
 	unsigned i;
 
 	glClear(GL_COLOR_BUFFER_BIT);
@@ -97,7 +97,7 @@ piglit_display(void)
 		if (!piglit_probe_pixel_rgb(x + (BOX_SIZE / 2),
 					    1 + (BOX_SIZE / 2),
 					    good_color)) {
-			result = PIGLIT_FAILURE;
+			result = PIGLIT_FAIL;
 		}
 	}
 
diff --git a/tests/shaders/vp-bad-program.c b/tests/shaders/vp-bad-program.c
index 0fc144b8c..1a7685963 100644
--- a/tests/shaders/vp-bad-program.c
+++ b/tests/shaders/vp-bad-program.c
@@ -117,7 +117,7 @@ piglit_display(void)
 			err = glGetError();
 	}
 
-	return failed ? PIGLIT_FAILURE : PIGLIT_SUCCESS;
+	return failed ? PIGLIT_FAIL : PIGLIT_PASS;
 }
 
 void piglit_init(int argc, char **argv)
diff --git a/tests/shaders/vp-clipdistance-01.c b/tests/shaders/vp-clipdistance-01.c
index c42cb2d33..c66cae86c 100644
--- a/tests/shaders/vp-clipdistance-01.c
+++ b/tests/shaders/vp-clipdistance-01.c
@@ -82,7 +82,7 @@ piglit_display(void)
 {
 	static const GLfloat color[4] = { 0.0, 1.0, 0.0, 1.0 };
 	static const GLfloat bad_color[4] = { 1.0, 0.0, 0.0, 1.0 };
-	enum piglit_result result = PIGLIT_SUCCESS;
+	enum piglit_result result = PIGLIT_PASS;
 	unsigned i;
 
 	glClear(GL_COLOR_BUFFER_BIT);
@@ -104,13 +104,13 @@ piglit_display(void)
 		if (!piglit_probe_pixel_rgb(x + (BOX_SIZE / 2) - 2,
 					    1 + (BOX_SIZE / 2),
 					    color)) {
-			result = PIGLIT_FAILURE;
+			result = PIGLIT_FAIL;
 		}
 
 		if (!piglit_probe_pixel_rgb(x + (BOX_SIZE / 2) + 2,
 					    1 + (BOX_SIZE / 2),
 					    clear_color)) {
-			result = PIGLIT_FAILURE;
+			result = PIGLIT_FAIL;
 		}
 	}
 
diff --git a/tests/shaders/vp-clipdistance-02.c b/tests/shaders/vp-clipdistance-02.c
index 6de211361..81ff93004 100644
--- a/tests/shaders/vp-clipdistance-02.c
+++ b/tests/shaders/vp-clipdistance-02.c
@@ -83,7 +83,7 @@ enum piglit_result
 piglit_display(void)
 {
 	static const GLfloat color[4] = { 0.0, 1.0, 0.0, 1.0 };
-	enum piglit_result result = PIGLIT_SUCCESS;
+	enum piglit_result result = PIGLIT_PASS;
 	unsigned i;
 
 	glClear(GL_COLOR_BUFFER_BIT);
@@ -105,7 +105,7 @@ piglit_display(void)
 		if (!piglit_probe_pixel_rgb(x + (BOX_SIZE / 2),
 					    1 + (BOX_SIZE / 2),
 					    color)) {
-			result = PIGLIT_FAILURE;
+			result = PIGLIT_FAIL;
 		}
 	}
 
diff --git a/tests/shaders/vp-clipdistance-03.c b/tests/shaders/vp-clipdistance-03.c
index 31253e18f..50dcb8acf 100644
--- a/tests/shaders/vp-clipdistance-03.c
+++ b/tests/shaders/vp-clipdistance-03.c
@@ -73,7 +73,7 @@ enum piglit_result
 piglit_display(void)
 {
 	static const GLfloat color[4] = { 0.0, 1.0, 0.0, 1.0 };
-	enum piglit_result result = PIGLIT_SUCCESS;
+	enum piglit_result result = PIGLIT_PASS;
 	unsigned i;
 
 	glClear(GL_COLOR_BUFFER_BIT);
@@ -90,7 +90,7 @@ piglit_display(void)
 		if (!piglit_probe_pixel_rgb(x + (BOX_SIZE / 2),
 					    1 + (BOX_SIZE / 2),
 					    color)) {
-			result = PIGLIT_FAILURE;
+			result = PIGLIT_FAIL;
 		}
 	}
 
diff --git a/tests/shaders/vp-clipdistance-04.c b/tests/shaders/vp-clipdistance-04.c
index 7e27b50ec..4b4afcada 100644
--- a/tests/shaders/vp-clipdistance-04.c
+++ b/tests/shaders/vp-clipdistance-04.c
@@ -77,7 +77,7 @@ enum piglit_result
 piglit_display(void)
 {
 	static const GLfloat color[4] = { 0.0, 1.0, 0.0, 1.0 };
-	enum piglit_result result = PIGLIT_SUCCESS;
+	enum piglit_result result = PIGLIT_PASS;
 	unsigned i;
 
 	glClear(GL_COLOR_BUFFER_BIT);
@@ -95,7 +95,7 @@ piglit_display(void)
 		if (!piglit_probe_pixel_rgb(x + (BOX_SIZE / 2),
 					    1 + (BOX_SIZE / 2),
 					    color)) {
-			result = PIGLIT_FAILURE;
+			result = PIGLIT_FAIL;
 		}
 	}
 
diff --git a/tests/shaders/vp-combined-image-units.c b/tests/shaders/vp-combined-image-units.c
index 324e0dfc2..fdbf0751d 100644
--- a/tests/shaders/vp-combined-image-units.c
+++ b/tests/shaders/vp-combined-image-units.c
@@ -64,9 +64,9 @@ piglit_display(void)
 
 	pass = pass && glGetError() == 0;
 
-	piglit_report_result(pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE);
+	piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
 
-	return PIGLIT_FAILURE; /* NOTREACHED */
+	return PIGLIT_FAIL; /* NOTREACHED */
 }
 
 void
diff --git a/tests/shaders/vp-ignore-input.c b/tests/shaders/vp-ignore-input.c
index 6d53ccaca..d32e25a3b 100644
--- a/tests/shaders/vp-ignore-input.c
+++ b/tests/shaders/vp-ignore-input.c
@@ -131,5 +131,5 @@ piglit_display(void)
 	glFinish();
         glutSwapBuffers();
 
-	return PIGLIT_SUCCESS;
+	return PIGLIT_PASS;
 }
diff --git a/tests/shaders/vp-max-array.c b/tests/shaders/vp-max-array.c
index e37e0aa44..67c8c3aff 100644
--- a/tests/shaders/vp-max-array.c
+++ b/tests/shaders/vp-max-array.c
@@ -49,7 +49,7 @@ static const char vertex_source_template[] =
 enum piglit_result
 piglit_display(void)
 {
-	return PIGLIT_SUCCESS;
+	return PIGLIT_PASS;
 }
 
 
@@ -71,7 +71,7 @@ piglit_init(int argc, char **argv)
 		if (! piglit_automatic)
 			printf("GL_MAX_PROGRAM_PARAMETERS_ARB < 96\n");
 
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	snprintf(shader_source, sizeof(shader_source),
diff --git a/tests/shaders/vpfp-generic.cpp b/tests/shaders/vpfp-generic.cpp
index 8293dc1f8..8979d4201 100644
--- a/tests/shaders/vpfp-generic.cpp
+++ b/tests/shaders/vpfp-generic.cpp
@@ -262,7 +262,7 @@ void Test::readline(const char* filename, int linenum, char* line)
 	char* p = strchr(line, ' ');
 	if (!p) {
 		fprintf(stderr, "%s:%i: malformed test line\n", filename, linenum);
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	*p++ = 0;
@@ -284,7 +284,7 @@ void Test::readline(const char* filename, int linenum, char* line)
 		parameters.push_back(new ParameterEnv(GL_VERTEX_PROGRAM_NV, atoi(line+12), params));
 	} else {
 		fprintf(stderr, "%s:%i: unknown parameters %s\n", filename, linenum, line);
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 }
 
@@ -304,7 +304,7 @@ void TestGroup::read(const char* filename)
 
 	if (!filp) {
 		fprintf(stderr, "Failed to read test data: %s\n", filename);
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	ReadState state = None;
@@ -343,7 +343,7 @@ void TestGroup::read(const char* filename)
 				state = ReadTest;
 			} else {
 				fprintf(stderr, "%s:%i: unknown %s\n", filename, linenum, p);
-				piglit_report_result(PIGLIT_FAILURE);
+				piglit_report_result(PIGLIT_FAIL);
 			}
 		} else {
 			switch(state) {
@@ -358,7 +358,7 @@ void TestGroup::read(const char* filename)
 				break;
 			default:
 				fprintf(stderr, "%s:%i: unexpected: %s\n", filename, linenum, p);
-				piglit_report_result(PIGLIT_FAILURE);
+				piglit_report_result(PIGLIT_FAIL);
 			}
 		}
 	}
@@ -369,7 +369,7 @@ void TestGroup::read(const char* filename)
 
 extern "C" piglit_result piglit_display(void)
 {
-	return tests.run() ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return tests.run() ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 
@@ -397,7 +397,7 @@ extern "C" void piglit_init(int argc, char **argv)
 	}
 	if (!Filename) {
 		fprintf(stderr, "Need to give a testcase file\n");
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 	tests.read(Filename);
 
diff --git a/tests/spec/arb_color_buffer_float/common.h b/tests/spec/arb_color_buffer_float/common.h
index 91966b80c..611326449 100644
--- a/tests/spec/arb_color_buffer_float/common.h
+++ b/tests/spec/arb_color_buffer_float/common.h
@@ -278,7 +278,7 @@ piglit_display(void)
 		return GL_FALSE;
 	}
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 static unsigned init();
diff --git a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-depthrangef.c b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-depthrangef.c
index 72248cfff..1e2268471 100644
--- a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-depthrangef.c
+++ b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-depthrangef.c
@@ -80,7 +80,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 #else
 	return PIGLIT_SKIP;
 #endif /* GL_ARB_ES2_compatibility */
diff --git a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-drawbuffers.c b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-drawbuffers.c
index a28b45d2b..6c66fd52c 100644
--- a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-drawbuffers.c
+++ b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-drawbuffers.c
@@ -61,7 +61,7 @@ attach_texture(int i)
 enum piglit_result
 piglit_display(void)
 {
-	return PIGLIT_FAILURE;
+	return PIGLIT_FAIL;
 }
 
 void
@@ -90,17 +90,17 @@ piglit_init(int argc, char **argv)
 	status = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
 	if (status == GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER) {
 		fprintf(stderr, "fbo incomplete draw buffer\n");
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	glReadBuffer(GL_COLOR_ATTACHMENT1);
 	status = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
 	if (status == GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER) {
 		fprintf(stderr, "fbo incomplete read buffer\n");
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	assert(glGetError() == 0);
 
-	piglit_report_result(PIGLIT_SUCCESS);
+	piglit_report_result(PIGLIT_PASS);
 }
diff --git a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-maxvectors.c b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-maxvectors.c
index 7fe77fc60..1dfeb060d 100644
--- a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-maxvectors.c
+++ b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-maxvectors.c
@@ -34,7 +34,7 @@ int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
 enum piglit_result
 piglit_display(void)
 {
-	return PIGLIT_FAILURE;
+	return PIGLIT_FAIL;
 }
 
 void
@@ -83,9 +83,9 @@ piglit_init(int argc, char **argv)
 	assert(!glGetError());
 
 	if (!pass)
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	else
-		piglit_report_result(PIGLIT_SUCCESS);
+		piglit_report_result(PIGLIT_PASS);
 #else
 	piglit_report_result(PIGLIT_SKIP);
 
diff --git a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-releaseshadercompiler.c b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-releaseshadercompiler.c
index f48b90e77..eca6b9b3e 100644
--- a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-releaseshadercompiler.c
+++ b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-releaseshadercompiler.c
@@ -104,7 +104,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 #else
 	return PIGLIT_SKIP;
 #endif /* GL_ARB_ES2_compatibility */
diff --git a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-shadercompiler.c b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-shadercompiler.c
index 5ae50b67c..c7febf8b2 100644
--- a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-shadercompiler.c
+++ b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-shadercompiler.c
@@ -35,7 +35,7 @@ int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
 enum piglit_result
 piglit_display(void)
 {
-	return PIGLIT_FAILURE;
+	return PIGLIT_FAIL;
 }
 
 void
@@ -57,9 +57,9 @@ piglit_init(int argc, char **argv)
 	glGetIntegerv(GL_SHADER_COMPILER, &shadercompiler);
 	assert(!glGetError());
 	if (!shadercompiler)
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	else
-		piglit_report_result(PIGLIT_SUCCESS);
+		piglit_report_result(PIGLIT_PASS);
 #else
 	piglit_report_result(PIGLIT_SKIP);
 #endif
diff --git a/tests/spec/arb_instanced_arrays/instanced_arrays.c b/tests/spec/arb_instanced_arrays/instanced_arrays.c
index f65486745..3e8eb0b76 100644
--- a/tests/spec/arb_instanced_arrays/instanced_arrays.c
+++ b/tests/spec/arb_instanced_arrays/instanced_arrays.c
@@ -149,10 +149,10 @@ piglit_display(void)
 
    for (div = 1; div <= PRIMS; div++) {
       if (!test_instancing(div))
-         return PIGLIT_FAILURE;
+         return PIGLIT_FAIL;
    }
 
-   return PIGLIT_SUCCESS;
+   return PIGLIT_PASS;
 }
 
 
diff --git a/tests/spec/arb_robustness/client-mem-bounds.c b/tests/spec/arb_robustness/client-mem-bounds.c
index 7a49b63f4..1e62bae9c 100644
--- a/tests/spec/arb_robustness/client-mem-bounds.c
+++ b/tests/spec/arb_robustness/client-mem-bounds.c
@@ -80,29 +80,29 @@ do {\
     glPixelTransferi(GL_MAP_COLOR, GL_FALSE);\
     glPixelMap##t##v(GL_PIXEL_MAP_R_TO_R, MAPSIZE, v);\
     if (!succeeded(0))\
-        return PIGLIT_FAILURE;\
+        return PIGLIT_FAIL;\
     glPixelMap##t##v(GL_PIXEL_MAP_G_TO_G, MAPSIZE, v);\
     if (!succeeded(0))\
-        return PIGLIT_FAILURE;\
+        return PIGLIT_FAIL;\
     glPixelMap##t##v(GL_PIXEL_MAP_B_TO_B, MAPSIZE, v);\
     if (!succeeded(0))\
-        return PIGLIT_FAILURE;\
+        return PIGLIT_FAIL;\
     glPixelMap##t##v(GL_PIXEL_MAP_A_TO_A, MAPSIZE, v);\
     if (!succeeded(0))\
-        return PIGLIT_FAILURE;\
+        return PIGLIT_FAIL;\
 \
     glGetnPixelMap##t##vARB(GL_PIXEL_MAP_R_TO_R, bufSize, v);\
     if (!succeeded(offby))\
-        return PIGLIT_FAILURE;\
+        return PIGLIT_FAIL;\
     glGetnPixelMap##t##vARB(GL_PIXEL_MAP_G_TO_G, bufSize, v);\
     if (!succeeded(offby))\
-        return PIGLIT_FAILURE;\
+        return PIGLIT_FAIL;\
     glGetnPixelMap##t##vARB(GL_PIXEL_MAP_B_TO_B, bufSize, v);\
     if (!succeeded(offby))\
-        return PIGLIT_FAILURE;\
+        return PIGLIT_FAIL;\
     glGetnPixelMap##t##vARB(GL_PIXEL_MAP_A_TO_A, bufSize, v);\
     if (!succeeded(offby))\
-        return PIGLIT_FAILURE;\
+        return PIGLIT_FAIL;\
 } while (0)
 
     TEST_PIXMAP(float, f);
@@ -111,7 +111,7 @@ do {\
 
 #undef TEST_PIXMAP
 #undef MAPSIZE
-  return PIGLIT_SUCCESS;
+  return PIGLIT_PASS;
 }
 
 static enum piglit_result
@@ -127,17 +127,17 @@ do {\
 \
     glReadnPixelsARB(0, 0, width, height, GL_RGBA, GL_##enumtype, bufSize, v);\
     if (!succeeded(offby))\
-        return PIGLIT_FAILURE;\
+        return PIGLIT_FAIL;\
     glReadnPixelsARB(1, 1, width, height, GL_RGBA, GL_##enumtype, bufSize, v);\
     if (!succeeded(offby))\
-        return PIGLIT_FAILURE;\
+        return PIGLIT_FAIL;\
 } while (0)
 
   TEST_READPIX(float, FLOAT);
   TEST_READPIX(int, INT);
   TEST_READPIX(byte, BYTE);
 #undef TEST_READPIX
-  return PIGLIT_SUCCESS;
+  return PIGLIT_PASS;
 }
 
 static enum piglit_result
@@ -152,13 +152,13 @@ test_stipple(int offby)
 
     glPolygonStipple(pattern);
     if (!succeeded(0))
-        return PIGLIT_FAILURE;
+        return PIGLIT_FAIL;
 
     glGetnPolygonStippleARB(bufSize, pattern);
     if (!succeeded(offby))
-        return PIGLIT_FAILURE;
+        return PIGLIT_FAIL;
 
-    return PIGLIT_SUCCESS;
+    return PIGLIT_PASS;
 }
 
 static enum piglit_result
@@ -171,14 +171,14 @@ test_teximage3d(int offby);
 static enum piglit_result
 test_teximage(int offby)
 {
-    if (test_teximage1d(offby) != PIGLIT_SUCCESS)
-        return PIGLIT_FAILURE;
-    if (test_teximage2d(offby) != PIGLIT_SUCCESS)
-        return PIGLIT_FAILURE;
-    if (test_teximage3d(offby) != PIGLIT_SUCCESS)
-        return PIGLIT_FAILURE;
-
-    return PIGLIT_SUCCESS;
+    if (test_teximage1d(offby) != PIGLIT_PASS)
+        return PIGLIT_FAIL;
+    if (test_teximage2d(offby) != PIGLIT_PASS)
+        return PIGLIT_FAIL;
+    if (test_teximage3d(offby) != PIGLIT_PASS)
+        return PIGLIT_FAIL;
+
+    return PIGLIT_PASS;
 }
 
 static enum piglit_result
@@ -195,18 +195,18 @@ do {\
     glTexImage1D(GL_TEXTURE_1D, 0, GL_RGBA, width,\
                  0, GL_RGBA, GL_##enumtype, v);\
     if (!succeeded(0))\
-        return PIGLIT_FAILURE;\
+        return PIGLIT_FAIL;\
 \
     glGetnTexImageARB(GL_TEXTURE_1D, 0, GL_RGBA, GL_##enumtype, bufSize, v);\
     if (!succeeded(offby))\
-        return PIGLIT_FAILURE;\
+        return PIGLIT_FAIL;\
 } while(0)
 
     TEST_TEX1D(float, FLOAT);
     TEST_TEX1D(int, INT);
     TEST_TEX1D(byte, BYTE);
 #undef TEST_TEX1D
-    return PIGLIT_SUCCESS;
+    return PIGLIT_PASS;
 }
 
 static enum piglit_result
@@ -223,18 +223,18 @@ do {\
     glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height,\
                  0, GL_RGBA, GL_##enumtype, v);\
     if (!succeeded(0))\
-        return PIGLIT_FAILURE;\
+        return PIGLIT_FAIL;\
 \
     glGetnTexImageARB(GL_TEXTURE_2D, 0, GL_RGBA, GL_##enumtype, bufSize, v);\
     if (!succeeded(offby))\
-        return PIGLIT_FAILURE;\
+        return PIGLIT_FAIL;\
 } while(0)
 
     TEST_TEX2D(float, FLOAT);
     TEST_TEX2D(int, INT);
     TEST_TEX2D(byte, BYTE);
 #undef TEST_TEX2D
-    return PIGLIT_SUCCESS;
+    return PIGLIT_PASS;
 }
 
 static enum piglit_result
@@ -251,18 +251,18 @@ do {\
     glTexImage3D(GL_TEXTURE_3D, 0, GL_RGBA, width, height, depth,\
                  0, GL_RGBA, GL_##enumtype, v);\
     if (!succeeded(0))\
-        return PIGLIT_FAILURE;\
+        return PIGLIT_FAIL;\
 \
     glGetnTexImageARB(GL_TEXTURE_3D, 0, GL_RGBA, GL_##enumtype, bufSize, v);\
     if (!succeeded(offby))\
-        return PIGLIT_FAILURE;\
+        return PIGLIT_FAIL;\
 } while(0)
 
     TEST_TEX3D(float, FLOAT);
     TEST_TEX3D(int, INT);
     TEST_TEX3D(byte, BYTE);
 #undef TEST_TEX3D
-    return PIGLIT_SUCCESS;
+    return PIGLIT_PASS;
 }
 
 static enum piglit_result
@@ -273,16 +273,16 @@ test(int offby)
    glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0);
    glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, 0);
 
-    if (test_pixelmap(offby) != PIGLIT_SUCCESS)
-         return PIGLIT_FAILURE;
-    if (test_stipple(offby) != PIGLIT_SUCCESS)
-         return PIGLIT_FAILURE;
-    if (test_readpix(offby) != PIGLIT_SUCCESS)
-         return PIGLIT_FAILURE;
-    if (test_teximage(offby) != PIGLIT_SUCCESS)
-         return PIGLIT_FAILURE;
+    if (test_pixelmap(offby) != PIGLIT_PASS)
+         return PIGLIT_FAIL;
+    if (test_stipple(offby) != PIGLIT_PASS)
+         return PIGLIT_FAIL;
+    if (test_readpix(offby) != PIGLIT_PASS)
+         return PIGLIT_FAIL;
+    if (test_teximage(offby) != PIGLIT_PASS)
+         return PIGLIT_FAIL;
 
-    return PIGLIT_SUCCESS;
+    return PIGLIT_PASS;
 }
 
 enum piglit_result
@@ -296,7 +296,7 @@ piglit_display(void)
     for (i = -9; i <= 1; ++i) {
         res = test(i);
         assert(glGetError() == GL_NO_ERROR);
-        if (res != PIGLIT_SUCCESS)
+        if (res != PIGLIT_PASS)
             break;
     }
 
diff --git a/tests/spec/arb_robustness/draw-vbo-bounds.c b/tests/spec/arb_robustness/draw-vbo-bounds.c
index 3fa5e2ef5..5d1bab2c0 100644
--- a/tests/spec/arb_robustness/draw-vbo-bounds.c
+++ b/tests/spec/arb_robustness/draw-vbo-bounds.c
@@ -206,6 +206,6 @@ piglit_display(void)
 
     glFinish();
 
-    return PIGLIT_SUCCESS;
+    return PIGLIT_PASS;
 }
 
diff --git a/tests/spec/arb_sampler_objects/sampler-objects.c b/tests/spec/arb_sampler_objects/sampler-objects.c
index ab1cc1af0..44647c916 100644
--- a/tests/spec/arb_sampler_objects/sampler-objects.c
+++ b/tests/spec/arb_sampler_objects/sampler-objects.c
@@ -62,33 +62,33 @@ test_objects(void)
 
    glGenSamplers(4, samplers);
    if (check_error(__LINE__))
-      return PIGLIT_FAILURE;
+      return PIGLIT_FAIL;
 
    for (i = 0; i < 4; i++) {
       if (samplers[i] == 0)
-         return PIGLIT_FAILURE;
+         return PIGLIT_FAIL;
       if (i > 1 && samplers[i] == samplers[i-1])
-         return PIGLIT_FAILURE;
+         return PIGLIT_FAIL;
       if (!glIsSampler(samplers[i]))
-         return PIGLIT_FAILURE;
+         return PIGLIT_FAIL;
    }
 
    for (i = 0; i < 4; i++) {
       glBindSampler(i, samplers[i]);
       if (check_error(__LINE__))
-         return PIGLIT_FAILURE;
+         return PIGLIT_FAIL;
    }
 
    glDeleteSamplers(4, samplers);
    if (check_error(__LINE__))
-      return PIGLIT_FAILURE;
+      return PIGLIT_FAIL;
 
    for (i = 0; i < 4; i++) {
       if (glIsSampler(samplers[i]))
-         return PIGLIT_FAILURE;
+         return PIGLIT_FAIL;
    }
 
-   return PIGLIT_SUCCESS;
+   return PIGLIT_PASS;
 }
 
 
@@ -157,7 +157,7 @@ test_samplers(void)
 
    glGenSamplers(NUM_SAMPLERS, samplers);
    if (check_error(__LINE__))
-      return PIGLIT_FAILURE;
+      return PIGLIT_FAIL;
 
    /* Create samplers which clamp lod to a particular mipmap level) */
    for (i = 0; i < NUM_SAMPLERS; i++) {
@@ -231,11 +231,11 @@ piglit_display(void)
    enum piglit_result res;
    
    res = test_objects();
-   if (res != PIGLIT_SUCCESS)
+   if (res != PIGLIT_PASS)
       return res;
 
    res = test_samplers();
-   if (res != PIGLIT_SUCCESS)
+   if (res != PIGLIT_PASS)
       return res;
 
    return res;
diff --git a/tests/spec/arb_texture_float/texture-float-formats.c b/tests/spec/arb_texture_float/texture-float-formats.c
index e63227881..946e86c36 100644
--- a/tests/spec/arb_texture_float/texture-float-formats.c
+++ b/tests/spec/arb_texture_float/texture-float-formats.c
@@ -341,7 +341,7 @@ piglit_display(void)
       if (!test_format(&Formats[f]))
          pass = GL_FALSE;
 
-   return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+   return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 
diff --git a/tests/spec/ati_draw_buffers/arbfp-no-index.c b/tests/spec/ati_draw_buffers/arbfp-no-index.c
index 24251b59d..f9acf8b9d 100644
--- a/tests/spec/ati_draw_buffers/arbfp-no-index.c
+++ b/tests/spec/ati_draw_buffers/arbfp-no-index.c
@@ -142,7 +142,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/spec/ati_draw_buffers/arbfp-no-option.c b/tests/spec/ati_draw_buffers/arbfp-no-option.c
index c090c2f83..c39280641 100644
--- a/tests/spec/ati_draw_buffers/arbfp-no-option.c
+++ b/tests/spec/ati_draw_buffers/arbfp-no-option.c
@@ -128,7 +128,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/spec/ati_draw_buffers/arbfp.c b/tests/spec/ati_draw_buffers/arbfp.c
index 39ea07424..3e7386a2f 100644
--- a/tests/spec/ati_draw_buffers/arbfp.c
+++ b/tests/spec/ati_draw_buffers/arbfp.c
@@ -134,7 +134,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/spec/ati_envmap_bumpmap/bump.c b/tests/spec/ati_envmap_bumpmap/bump.c
index 714ec331e..2bdaa57b6 100644
--- a/tests/spec/ati_envmap_bumpmap/bump.c
+++ b/tests/spec/ati_envmap_bumpmap/bump.c
@@ -181,7 +181,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
@@ -196,7 +196,7 @@ piglit_init(int argc, char **argv)
 	glGetTexBumpParameterivATI(GL_BUMP_ROT_MATRIX_SIZE_ATI, &size);
 	if (size < 4) {
 		printf("GL_BUMP_ROT_MATRIX_SIZE_ATI %d < 4\n", size);
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 	if (size != 4) {
 		printf("What does GL_BUMP_ROT_MATRIX_SIZE_ATI = %d even mean?\n",
@@ -207,7 +207,7 @@ piglit_init(int argc, char **argv)
 	glGetTexBumpParameterivATI(GL_BUMP_NUM_TEX_UNITS_ATI, &num_units);
 	if (num_units < 1) {
 		printf("GL_BUMP_NUM_TEX_UNITS_ATI %d < 4\n", num_units);
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	units = malloc(num_units * sizeof(GLenum));
@@ -217,7 +217,7 @@ piglit_init(int argc, char **argv)
 		if (units[i] < GL_TEXTURE0) {
 			printf("Bad unit in GL_BUMP_TEX_UNITS_ATI: 0x%x\n",
 			       units[i]);
-			piglit_report_result(PIGLIT_FAILURE);
+			piglit_report_result(PIGLIT_FAIL);
 		}
 		if (units[i] == GL_TEXTURE1)
 			found_unit_1 = GL_TRUE;
diff --git a/tests/spec/ext_fog_coord/modes.c b/tests/spec/ext_fog_coord/modes.c
index 43d98dff8..1923b9cc1 100644
--- a/tests/spec/ext_fog_coord/modes.c
+++ b/tests/spec/ext_fog_coord/modes.c
@@ -120,7 +120,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void piglit_init(int argc, char**argv)
diff --git a/tests/spec/nv_texture_barrier/blending-in-shader.c b/tests/spec/nv_texture_barrier/blending-in-shader.c
index f2527685a..6b28ebfcc 100644
--- a/tests/spec/nv_texture_barrier/blending-in-shader.c
+++ b/tests/spec/nv_texture_barrier/blending-in-shader.c
@@ -74,7 +74,7 @@ enum piglit_result piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void piglit_init(int argc, char **argv)
diff --git a/tests/texturing/array-texture.c b/tests/texturing/array-texture.c
index 74efafebe..cb18b299d 100644
--- a/tests/texturing/array-texture.c
+++ b/tests/texturing/array-texture.c
@@ -248,22 +248,22 @@ piglit_display(void)
 
    if (!frag_shader_2d_array) {
       printf("%s: failed to compile 2D fragment shader.\n", prog);
-      return PIGLIT_FAILURE;
+      return PIGLIT_FAIL;
    }
 
    if (!program_2d_array) {
       printf("%s: failed to link 2D shader program.\n", prog);
-      return PIGLIT_FAILURE;
+      return PIGLIT_FAIL;
    }
 
    if (!frag_shader_1d_array) {
       printf("%s: failed to compile 1D fragment shader.\n", prog);
-      return PIGLIT_FAILURE;
+      return PIGLIT_FAIL;
    }
 
    if (!program_1d_array) {
       printf("%s: failed to link 1D shader program.\n", prog);
-      return PIGLIT_FAILURE;
+      return PIGLIT_FAIL;
    }
 
 
@@ -319,7 +319,7 @@ piglit_display(void)
    }
 
    glutSwapBuffers();
-   return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+   return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 
diff --git a/tests/texturing/cubemap.c b/tests/texturing/cubemap.c
index 5a6f3c067..57cfcea31 100644
--- a/tests/texturing/cubemap.c
+++ b/tests/texturing/cubemap.c
@@ -272,7 +272,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/texturing/depth-level-clamp.c b/tests/texturing/depth-level-clamp.c
index a7c1009f3..6e94cb8f1 100644
--- a/tests/texturing/depth-level-clamp.c
+++ b/tests/texturing/depth-level-clamp.c
@@ -154,7 +154,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/texturing/depth-tex-compare.c b/tests/texturing/depth-tex-compare.c
index c903d790d..0babdee82 100644
--- a/tests/texturing/depth-tex-compare.c
+++ b/tests/texturing/depth-tex-compare.c
@@ -246,5 +246,5 @@ piglit_display(void)
 	printf("Top to Bottom: LESS, LEQUAL, GREATER, GEQUAL, "
 	       "ALWAYS, NEVER, NOTEQUAL, EQUAL\n");
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/texturing/depth-tex-modes-common.c b/tests/texturing/depth-tex-modes-common.c
index 3e1687bc4..253454dda 100644
--- a/tests/texturing/depth-tex-modes-common.c
+++ b/tests/texturing/depth-tex-modes-common.c
@@ -236,5 +236,5 @@ depth_tex_display(const GLenum *depth_texture_modes, unsigned num_modes,
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/texturing/depth-tex-modes-glsl.c b/tests/texturing/depth-tex-modes-glsl.c
index a50843b36..c57bdb5f0 100644
--- a/tests/texturing/depth-tex-modes-glsl.c
+++ b/tests/texturing/depth-tex-modes-glsl.c
@@ -308,6 +308,6 @@ piglit_display(void)
 	glFinish();
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 
 }
diff --git a/tests/texturing/fragment-and-vertex-texturing.c b/tests/texturing/fragment-and-vertex-texturing.c
index 12ea1846f..4355df7ea 100644
--- a/tests/texturing/fragment-and-vertex-texturing.c
+++ b/tests/texturing/fragment-and-vertex-texturing.c
@@ -166,7 +166,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/texturing/fxt1-teximage.c b/tests/texturing/fxt1-teximage.c
index 70944bbf8..dc992acaa 100644
--- a/tests/texturing/fxt1-teximage.c
+++ b/tests/texturing/fxt1-teximage.c
@@ -124,7 +124,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/texturing/gen-compressed-teximage.c b/tests/texturing/gen-compressed-teximage.c
index 527cb7469..e46714625 100644
--- a/tests/texturing/gen-compressed-teximage.c
+++ b/tests/texturing/gen-compressed-teximage.c
@@ -155,7 +155,7 @@ piglit_display(void)
 	glutSwapBuffers();
 	glFlush();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/texturing/gen-nonzero-unit.c b/tests/texturing/gen-nonzero-unit.c
index 358d210ec..c9d046c91 100644
--- a/tests/texturing/gen-nonzero-unit.c
+++ b/tests/texturing/gen-nonzero-unit.c
@@ -165,7 +165,7 @@ piglit_display(void)
 
 	glDeleteTextures(3, textures);
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/texturing/gen-teximage.c b/tests/texturing/gen-teximage.c
index 2bea91555..324b46749 100644
--- a/tests/texturing/gen-teximage.c
+++ b/tests/texturing/gen-teximage.c
@@ -153,7 +153,7 @@ piglit_display(void)
 
 	glDeleteTextures(1, &texture);
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/texturing/gen-texsubimage.c b/tests/texturing/gen-texsubimage.c
index bc9f841cb..7033f3d4d 100644
--- a/tests/texturing/gen-texsubimage.c
+++ b/tests/texturing/gen-texsubimage.c
@@ -131,7 +131,7 @@ piglit_display(void)
 
 	glDeleteTextures(1, &texture);
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/texturing/getteximage-simple.c b/tests/texturing/getteximage-simple.c
index d22f34cfa..d61f0a063 100644
--- a/tests/texturing/getteximage-simple.c
+++ b/tests/texturing/getteximage-simple.c
@@ -60,7 +60,7 @@ piglit_display(void)
 
 	pass = test_getteximage();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 static void Reshape(int width, int height)
diff --git a/tests/texturing/levelclamp.c b/tests/texturing/levelclamp.c
index 4d6d6b3b9..26d2c267a 100644
--- a/tests/texturing/levelclamp.c
+++ b/tests/texturing/levelclamp.c
@@ -188,7 +188,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/texturing/lodbias.c b/tests/texturing/lodbias.c
index e08adbcdf..641f6d876 100644
--- a/tests/texturing/lodbias.c
+++ b/tests/texturing/lodbias.c
@@ -248,7 +248,7 @@ piglit_display(void)
 		}
 	}
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 static void Key(unsigned char key, int x, int y)
diff --git a/tests/texturing/lodclamp-between-max.c b/tests/texturing/lodclamp-between-max.c
index 1b7290b73..6559bb9fd 100644
--- a/tests/texturing/lodclamp-between-max.c
+++ b/tests/texturing/lodclamp-between-max.c
@@ -143,7 +143,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/texturing/lodclamp-between.c b/tests/texturing/lodclamp-between.c
index 628fc712a..b84921248 100644
--- a/tests/texturing/lodclamp-between.c
+++ b/tests/texturing/lodclamp-between.c
@@ -143,7 +143,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/texturing/lodclamp.c b/tests/texturing/lodclamp.c
index 276daa91f..4f844c6d6 100644
--- a/tests/texturing/lodclamp.c
+++ b/tests/texturing/lodclamp.c
@@ -188,7 +188,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/texturing/mipmap-setup.c b/tests/texturing/mipmap-setup.c
index 50eadfbfe..627ccc00d 100644
--- a/tests/texturing/mipmap-setup.c
+++ b/tests/texturing/mipmap-setup.c
@@ -172,13 +172,13 @@ enum piglit_result
 piglit_display(void)
 {
    if (!test(NORMAL, "Normal"))
-      return PIGLIT_FAILURE;
+      return PIGLIT_FAIL;
 
    if (!test(REVERSE, "Reverse"))
-      return PIGLIT_FAILURE;
+      return PIGLIT_FAIL;
 
    if (!test(RANDOM, "Random"))
-      return PIGLIT_FAILURE;
+      return PIGLIT_FAIL;
 
-   return PIGLIT_SUCCESS;
+   return PIGLIT_PASS;
 }
diff --git a/tests/texturing/rg-draw-pixels.c b/tests/texturing/rg-draw-pixels.c
index 2260ae9d4..cbd4c34ad 100644
--- a/tests/texturing/rg-draw-pixels.c
+++ b/tests/texturing/rg-draw-pixels.c
@@ -99,7 +99,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 
 	#undef height
 	#undef width
diff --git a/tests/texturing/rg-teximage-01.c b/tests/texturing/rg-teximage-01.c
index f35e229bc..bf26428df 100644
--- a/tests/texturing/rg-teximage-01.c
+++ b/tests/texturing/rg-teximage-01.c
@@ -99,5 +99,5 @@ piglit_init(int argc, char **argv)
 	}
 
 	if (piglit_automatic)
-		piglit_report_result(pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE);
+		piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
 }
diff --git a/tests/texturing/rg-teximage-02.c b/tests/texturing/rg-teximage-02.c
index 5958cfbd5..86a93cb77 100644
--- a/tests/texturing/rg-teximage-02.c
+++ b/tests/texturing/rg-teximage-02.c
@@ -99,5 +99,5 @@ piglit_init(int argc, char **argv)
 	}
 
 	if (piglit_automatic)
-		piglit_report_result(pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE);
+		piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
 }
diff --git a/tests/texturing/rg-teximage-common.c b/tests/texturing/rg-teximage-common.c
index 080808432..910ae943a 100644
--- a/tests/texturing/rg-teximage-common.c
+++ b/tests/texturing/rg-teximage-common.c
@@ -63,7 +63,7 @@ piglit_display(void)
 	}
 
 	glutSwapBuffers();
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 
diff --git a/tests/texturing/rgtc-teximage-01.c b/tests/texturing/rgtc-teximage-01.c
index 510ee0967..fbb524f48 100644
--- a/tests/texturing/rgtc-teximage-01.c
+++ b/tests/texturing/rgtc-teximage-01.c
@@ -100,5 +100,5 @@ piglit_init(int argc, char **argv)
 	}
 
 	if (piglit_automatic)
-		piglit_report_result(pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE);
+		piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
 }
diff --git a/tests/texturing/rgtc-teximage-02.c b/tests/texturing/rgtc-teximage-02.c
index d54e43067..47780c374 100644
--- a/tests/texturing/rgtc-teximage-02.c
+++ b/tests/texturing/rgtc-teximage-02.c
@@ -100,5 +100,5 @@ piglit_init(int argc, char **argv)
 	}
 
 	if (piglit_automatic)
-		piglit_report_result(pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE);
+		piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
 }
diff --git a/tests/texturing/s3tc-teximage.c b/tests/texturing/s3tc-teximage.c
index 8fa3fd33d..53cf1d227 100644
--- a/tests/texturing/s3tc-teximage.c
+++ b/tests/texturing/s3tc-teximage.c
@@ -133,7 +133,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/texturing/s3tc-texsubimage.c b/tests/texturing/s3tc-texsubimage.c
index 3b2237517..466bce37c 100644
--- a/tests/texturing/s3tc-texsubimage.c
+++ b/tests/texturing/s3tc-texsubimage.c
@@ -210,7 +210,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/texturing/streaming-texture-leak.c b/tests/texturing/streaming-texture-leak.c
index 3003dfb64..cfef9cc0d 100644
--- a/tests/texturing/streaming-texture-leak.c
+++ b/tests/texturing/streaming-texture-leak.c
@@ -75,7 +75,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/texturing/tex-border-1.c b/tests/texturing/tex-border-1.c
index 9c2d3dc7d..badc9c5a6 100644
--- a/tests/texturing/tex-border-1.c
+++ b/tests/texturing/tex-border-1.c
@@ -92,7 +92,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/texturing/tex-miplevel-selection.c b/tests/texturing/tex-miplevel-selection.c
index a7ff93882..1a580a7d1 100644
--- a/tests/texturing/tex-miplevel-selection.c
+++ b/tests/texturing/tex-miplevel-selection.c
@@ -284,5 +284,5 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/texturing/tex-skipped-unit.c b/tests/texturing/tex-skipped-unit.c
index 7af8fbc60..6c964aa33 100644
--- a/tests/texturing/tex-skipped-unit.c
+++ b/tests/texturing/tex-skipped-unit.c
@@ -123,7 +123,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 void
diff --git a/tests/texturing/tex-srgb.c b/tests/texturing/tex-srgb.c
index 049d85bba..1f5350837 100644
--- a/tests/texturing/tex-srgb.c
+++ b/tests/texturing/tex-srgb.c
@@ -149,7 +149,7 @@ piglit_display(void)
 	GLboolean pass = GL_TRUE;
 
 	pass = srgb_tex_test(0);
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 
diff --git a/tests/texturing/tex-swizzle.c b/tests/texturing/tex-swizzle.c
index 63dd79cc7..01211fac5 100644
--- a/tests/texturing/tex-swizzle.c
+++ b/tests/texturing/tex-swizzle.c
@@ -218,7 +218,7 @@ piglit_display(void)
 	glFinish();
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 //probing is done left-to-right, bottom-to-top, by column
diff --git a/tests/texturing/tex3d-maxsize.c b/tests/texturing/tex3d-maxsize.c
index f0c263592..4d10d0918 100644
--- a/tests/texturing/tex3d-maxsize.c
+++ b/tests/texturing/tex3d-maxsize.c
@@ -99,7 +99,7 @@ piglit_display(void)
 	glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
 	glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
 	if (glGetError())
-		return PIGLIT_FAILURE;
+		return PIGLIT_FAIL;
 
 	glTexImage3D(GL_TEXTURE_3D, 0, GL_RGBA8, maxsize, maxsize, maxsize, 0,
 		     GL_RGBA, GL_UNSIGNED_BYTE, NULL);
@@ -126,7 +126,7 @@ piglit_display(void)
 		err = glGetError();
 
 		if (err == GL_OUT_OF_MEMORY)
-			return PIGLIT_SUCCESS;
+			return PIGLIT_PASS;
 	}
 	else {
 		/* the max 3D texture size actually worked */
@@ -136,7 +136,7 @@ piglit_display(void)
 	if (err != GL_NO_ERROR) {
 		printf("%s: unexpected glTexImage3D error: 0x%x\n",
 		       TestName, err);
-		return PIGLIT_FAILURE;
+		return PIGLIT_FAIL;
 	}
 
 	if (0)
@@ -189,7 +189,7 @@ piglit_display(void)
 		       width, height, depth);
 	}
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 
diff --git a/tests/texturing/tex3d-npot.c b/tests/texturing/tex3d-npot.c
index 369b7ad1c..b5b67a3ac 100644
--- a/tests/texturing/tex3d-npot.c
+++ b/tests/texturing/tex3d-npot.c
@@ -188,7 +188,7 @@ static void test_simple(int w, int h, int d, GLenum format)
     if (!success) {
         fprintf(stderr, "Failure with texture size %ix%ix%i, format = %s\n",
             w, h, d, formatname(format));
-        piglit_report_result(PIGLIT_FAILURE);
+        piglit_report_result(PIGLIT_FAIL);
     }
 }
 
@@ -214,7 +214,7 @@ piglit_display(void)
         }
     }
 
-    return PIGLIT_SUCCESS;
+    return PIGLIT_PASS;
 }
 
 
diff --git a/tests/texturing/tex3d.c b/tests/texturing/tex3d.c
index d1544950a..5246b3fa0 100644
--- a/tests/texturing/tex3d.c
+++ b/tests/texturing/tex3d.c
@@ -189,7 +189,7 @@ static void test_simple(int w, int h, int d, GLenum format)
 	if (!success) {
 		fprintf(stderr, "Failure with texture size %ix%ix%i, format = %s\n",
 			w, h, d, formatname(format));
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 }
 
@@ -209,7 +209,7 @@ piglit_display(void)
 		}
 	}
 
-	return PIGLIT_SUCCESS;
+	return PIGLIT_PASS;
 }
 
 
diff --git a/tests/texturing/texdepth.c b/tests/texturing/texdepth.c
index 06608be0e..bc13ba351 100644
--- a/tests/texturing/texdepth.c
+++ b/tests/texturing/texdepth.c
@@ -329,7 +329,7 @@ piglit_display(void)
 			}
 		}
 
-		return succ ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+		return succ ? PIGLIT_PASS : PIGLIT_FAIL;
 	}
 
 	glClearColor(0.5, 0.5, 0.0, 0.6);
@@ -339,7 +339,7 @@ piglit_display(void)
 
 	glutSwapBuffers();
 
-	return PIGLIT_SUCCESS;
+	return PIGLIT_PASS;
 }
 
 static void Reshape(int width, int height)
diff --git a/tests/texturing/teximage-errors.c b/tests/texturing/teximage-errors.c
index cb1e4cc18..4a0aac7e3 100644
--- a/tests/texturing/teximage-errors.c
+++ b/tests/texturing/teximage-errors.c
@@ -173,12 +173,12 @@ enum piglit_result
 piglit_display(void)
 {
    if (!test_targets())
-      return PIGLIT_FAILURE;
+      return PIGLIT_FAIL;
 
    if (!test_pos_and_sizes())
-      return PIGLIT_FAILURE;
+      return PIGLIT_FAIL;
 
-   return PIGLIT_SUCCESS;
+   return PIGLIT_PASS;
 }
 
 
diff --git a/tests/texturing/texrect-many.c b/tests/texturing/texrect-many.c
index 6873d6934..d3bf445b9 100644
--- a/tests/texturing/texrect-many.c
+++ b/tests/texturing/texrect-many.c
@@ -97,7 +97,7 @@ piglit_display(void)
 	DoFrame();
 	pass = DoTest();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 static void Reshape(int width, int height)
diff --git a/tests/texturing/texredefine.c b/tests/texturing/texredefine.c
index 63f3d1003..2f0676cac 100644
--- a/tests/texturing/texredefine.c
+++ b/tests/texturing/texredefine.c
@@ -196,7 +196,7 @@ piglit_display(void)
 	glDisable(GL_TEXTURE_2D);
 	glutSwapBuffers();
 
-	return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 
diff --git a/tests/texturing/texture-al.c b/tests/texturing/texture-al.c
index b5554f973..22ec60909 100644
--- a/tests/texturing/texture-al.c
+++ b/tests/texturing/texture-al.c
@@ -235,9 +235,9 @@ enum piglit_result
 piglit_display(void)
 {
    if (test_teximage_formats() && test_drawpixels_formats())
-      return PIGLIT_SUCCESS;
+      return PIGLIT_PASS;
    else
-      return PIGLIT_FAILURE;
+      return PIGLIT_FAIL;
 }
 
 
diff --git a/tests/texturing/texture-integer.c b/tests/texturing/texture-integer.c
index 345d3b01b..360120341 100644
--- a/tests/texturing/texture-integer.c
+++ b/tests/texturing/texture-integer.c
@@ -565,18 +565,18 @@ enum piglit_result
 piglit_display(void)
 {
    if (!test_general_formats())
-      return PIGLIT_FAILURE;
+      return PIGLIT_FAIL;
 
    if (!test_specific_formats())
-      return PIGLIT_FAILURE;
+      return PIGLIT_FAIL;
 
    if (!test_errors())
-      return PIGLIT_FAILURE;
+      return PIGLIT_FAIL;
 
    if (!test_limits())
-      return PIGLIT_FAILURE;
+      return PIGLIT_FAIL;
 
-   return PIGLIT_SUCCESS;
+   return PIGLIT_PASS;
 }
 
 
diff --git a/tests/texturing/texture-rg.c b/tests/texturing/texture-rg.c
index 7ba371ede..fd0646935 100644
--- a/tests/texturing/texture-rg.c
+++ b/tests/texturing/texture-rg.c
@@ -287,9 +287,9 @@ enum piglit_result
 piglit_display(void)
 {
    if (test_teximage_formats() && test_drawpixels_formats())
-      return PIGLIT_SUCCESS;
+      return PIGLIT_PASS;
    else
-      return PIGLIT_FAILURE;
+      return PIGLIT_FAIL;
 }
 
 
diff --git a/tests/texturing/texwrap.c b/tests/texturing/texwrap.c
index e8e2244bc..e5c33a46a 100644
--- a/tests/texturing/texwrap.c
+++ b/tests/texturing/texwrap.c
@@ -833,7 +833,7 @@ enum piglit_result piglit_display()
     }
     assert(glGetError() == 0);
 
-    return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE;
+    return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 static void key_func(unsigned char key, int x, int y)
diff --git a/tests/util/piglit-glx-util.c b/tests/util/piglit-glx-util.c
index 5257956d2..f99be4a7e 100644
--- a/tests/util/piglit-glx-util.c
+++ b/tests/util/piglit-glx-util.c
@@ -48,7 +48,7 @@ piglit_get_glx_visual(Display *dpy)
 	if (visinfo == NULL) {
 		fprintf(stderr,
 			"Couldn't get an RGBA, double-buffered visual\n");
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 		exit(1);
 	}
 
@@ -69,7 +69,7 @@ piglit_get_glx_context_share(Display *dpy, XVisualInfo *visinfo, GLXContext shar
 	ctx = glXCreateContext(dpy, visinfo, share, True);
 	if (ctx == None) {
 		fprintf(stderr, "glXCreateContext failed\n");
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	return ctx;
@@ -223,7 +223,7 @@ piglit_glx_iterate_visuals(enum piglit_result (*draw)(Display *dpy,
 	Display *dpy = XOpenDisplay(NULL);
 	if (!dpy) {
 		fprintf(stderr, "couldn't open display\n");
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 	screen = DefaultScreen(dpy);
 
diff --git a/tests/util/piglit-util-gl.c b/tests/util/piglit-util-gl.c
index 1508ed90f..77a9cc4ba 100644
--- a/tests/util/piglit-util-gl.c
+++ b/tests/util/piglit-util-gl.c
@@ -554,11 +554,11 @@ GLuint piglit_compile_program(GLenum target, const char* text)
 			fprintf(stderr, "%c", text[errorPos+a]);
 		}
 		fprintf(stderr, "\nin program:\n%s", text);
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 	if (!glIsProgramARB(program)) {
 		fprintf(stderr, "glIsProgramARB failed\n");
-		piglit_report_result(PIGLIT_FAILURE);
+		piglit_report_result(PIGLIT_FAIL);
 	}
 
 	return program;
diff --git a/tests/util/piglit-util.c b/tests/util/piglit-util.c
index 6227dd395..d4845f092 100644
--- a/tests/util/piglit-util.c
+++ b/tests/util/piglit-util.c
@@ -230,7 +230,7 @@ piglit_report_result(enum piglit_result result)
 {
 	fflush(stderr);
 
-	if (result == PIGLIT_SUCCESS) {
+	if (result == PIGLIT_PASS) {
 		printf("PIGLIT: {'result': 'pass' }\n");
 		fflush(stdout);
 		exit(0);
diff --git a/tests/util/piglit-util.h b/tests/util/piglit-util.h
index b691041d3..d33915a05 100644
--- a/tests/util/piglit-util.h
+++ b/tests/util/piglit-util.h
@@ -66,8 +66,6 @@ enum piglit_result {
 	PIGLIT_SKIP,
 	PIGLIT_WARN
 };
-#define PIGLIT_SUCCESS PIGLIT_PASS
-#define PIGLIT_FAILURE PIGLIT_FAIL
 
 #include "piglit-framework.h"