* Makefile: Add the multiple-clip-rectangles test.

	* multiple-clip-rectangles.c: (test), (main): Make this
	a real test case.

	* setup.h: Ditch this, it just makes the tests less
	self-contained.

	* tools.c: Put the USE_REALTIME_PRIORITY toggle here.

	* add.c: (test), (main):
	* curves.c: (test), (main):
	* downsample-bilinear.c: (test), (main):
	* downsample-nearest.c: (test), (main):
	* gradients-linear.c: (test), (main):
	* lines.c: (test), (main):
	* over-clipped.c: (test), (main):
	* over.c: (test), (main):
	* textpath.c: (test), (main):
	* texturedtext.c: (test), (main):
	* upsample-bilinear.c: (test), (main):
	* upsample-nearest.c: (test), (main):  Make all of the tests
	more independent by dropping setup.h.

1 files changed, 6 insertions, 6 deletions

diff --git a/over-clipped.c b/over-clipped.c
index f17c084..e3500f3 100644
--- a/over-clipped.c
+++ b/over-clipped.c
@@ -7,10 +7,10 @@
 #include <unistd.h>
 #include <cairo.h>
 #include "tools.h"
-#include "setup.h"
 
-static int width = 640;
-static int height = 480;
+#define NUM_RUNS 64
+#define WIDTH 640
+#define HEIGHT 480
 
 #define rdtscll(val) __asm__ __volatile__("rdtsc" : "=A" (val))
 
@@ -26,7 +26,7 @@ static int test (cairo_surface_t *surface, const char *png_filename)
 
     cairo_set_source_rgba (cr, 0, 0, 0, 0);
     cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
-    cairo_rectangle (cr, 0, 0, width, height);
+    cairo_rectangle (cr, 0, 0, WIDTH, HEIGHT);
     cairo_fill (cr);
 
     pattern = cairo_pattern_create_for_surface (image);
@@ -38,7 +38,7 @@ static int test (cairo_surface_t *surface, const char *png_filename)
 
     rdtscll (before);
     cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
-    cairo_rectangle (cr, 0, 0, width, height);
+    cairo_rectangle (cr, 0, 0, WIDTH, HEIGHT);
     cairo_fill (cr);
     rdtscll (after);
 
@@ -61,7 +61,7 @@ int main( int argc, char **argv )
     cairo_surface_t *surface;
     int i;
 
-    surface = output_create_surface (argv [0], width, height);
+    surface = output_create_surface (argv [0], WIDTH, HEIGHT);
 
     for (i = 0; i < sizeof (filenames) / sizeof (const char *); i++) {
         char input_filename [1024];