Rename PIGLIT_SUCCESS and PIGLIT_FAILURE to PIGLIT_PASS and PIGLIT_FAIL, resp.

21 files changed, 74 insertions, 75 deletions

diff --git a/tests/glx/glx-destroycontext-1.c b/tests/glx/glx-destroycontext-1.c
index 2342b0f3..8beb1fbe 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 5e18f748..8da12e91 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 d4787680..d9c45c89 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 b352bae3..896db171 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 8114540e..7bb0ae00 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 099615ee..c80776ae 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 e03dcede..8050c04e 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 aa5b5a13..63264613 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 ae3276cd..819f5db2 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 c1f55408..bb6c2686 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 21182712..299f261a 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 8e9417a1..d01c8e93 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 0cf5cf1f..963a6c88 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 0c688e68..70436cea 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 438039dc..0c2fec63 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 8f95f38e..7ea3f610 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 db6d3bdc..bed19c26 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 2e245ac5..3d5e6c7f 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 228a6d31..122c7dcb 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 dfc3d67a..45a79638 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 88288a15..673ba394 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;
 }