Make room for skia tests to live alongside the cairo tests

7 files changed, 35 insertions, 35 deletions

diff --git a/src/fill.cpp b/src/cairo-tests/fill.cpp
index c3c81b2..d3a6bef 100644
--- a/src/fill.cpp
+++ b/src/cairo-tests/fill.cpp
@@ -5,19 +5,19 @@
 #include "caskbench.h"
 
 int
-setup_fill(cairo_t *cr)
+ca_setup_fill(cairo_t *cr)
 {
   cairo_arc (cr, 40, 40, 30, 0, 2*M_PI);
   return 1;
 }
 
 void
-teardown_fill(void)
+ca_teardown_fill(void)
 {
 }
 
 int
-test_fill(cairo_t *cr)
+ca_test_fill(cairo_t *cr)
 {
   randomize_color (cr);
   cairo_fill_preserve (cr);
diff --git a/src/image.cpp b/src/cairo-tests/image.cpp
index c9b9c1c..eb76734 100644
--- a/src/image.cpp
+++ b/src/cairo-tests/image.cpp
@@ -7,7 +7,7 @@
 static cairo_surface_t *image;
 
 int
-setup_image(cairo_t *cr)
+ca_setup_image(cairo_t *cr)
 {
   image = cairo_image_surface_create_from_png ("../data/romedalen.png");
   cairo_set_source_surface (cr, image, 0, 0);
@@ -15,13 +15,13 @@ setup_image(cairo_t *cr)
 }
 
 void
-teardown_image(void)
+ca_teardown_image(void)
 {
   cairo_surface_destroy (image);
 }
 
 int
-test_image(cairo_t *cr)
+ca_test_image(cairo_t *cr)
 {
   cairo_paint (cr);
   return 1;
diff --git a/src/mask.cpp b/src/cairo-tests/mask.cpp
index 9c49fb5..fd28445 100644
--- a/src/mask.cpp
+++ b/src/cairo-tests/mask.cpp
@@ -7,20 +7,20 @@
 static cairo_pattern_t *mask;
 
 int
-setup_mask(cairo_t *cr)
+ca_setup_mask(cairo_t *cr)
 {
   mask = cairo_pattern_create_rgba (0, 0, 0, 0.5);
   return 1;
 }
 
 void
-teardown_mask(void)
+ca_teardown_mask(void)
 {
   cairo_pattern_destroy (mask);
 }
 
 int
-test_mask(cairo_t *cr)
+ca_test_mask(cairo_t *cr)
 {
   cairo_mask (cr, mask);
   return 1;
diff --git a/src/paint.cpp b/src/cairo-tests/paint.cpp
index 8236129..5665cdf 100644
--- a/src/paint.cpp
+++ b/src/cairo-tests/paint.cpp
@@ -5,18 +5,18 @@
 #include "caskbench.h"
 
 int
-setup_paint(cairo_t *cr)
+ca_setup_paint(cairo_t *cr)
 {
   return 1;
 }
 
 void
-teardown_paint()
+ca_teardown_paint()
 {
 }
 
 int
-test_paint(cairo_t *cr)
+ca_test_paint(cairo_t *cr)
 {
   randomize_color (cr);
   cairo_paint (cr);
diff --git a/src/stroke.cpp b/src/cairo-tests/stroke.cpp
index 7e83195..858f755 100644
--- a/src/stroke.cpp
+++ b/src/cairo-tests/stroke.cpp
@@ -5,18 +5,18 @@
 #include "caskbench.h"
 
 int
-setup_stroke(cairo_t *cr)
+ca_setup_stroke(cairo_t *cr)
 {
   return 1;
 }
 
 void
-teardown_stroke(void)
+ca_teardown_stroke(void)
 {
 }
 
 int
-test_stroke(cairo_t *cr)
+ca_test_stroke(cairo_t *cr)
 {
   int i, x, w, prev_w;
   x = 0;
diff --git a/src/caskbench.cpp b/src/caskbench.cpp
index 54783f0..67523e1 100644
--- a/src/caskbench.cpp
+++ b/src/caskbench.cpp
@@ -29,11 +29,11 @@ typedef struct _caskbench_result {
 } caskbench_result_t;
 
 caskbench_perf_test_t perf_tests[] = {
-  {"fill", setup_fill,   teardown_fill,   test_fill},
-  {"image", setup_image,  teardown_image,  test_image},
-  {"mask", setup_mask,   teardown_mask,   test_mask},
-  {"paint", setup_paint,  teardown_paint,  test_paint},
-  {"stroke", setup_stroke, teardown_stroke, test_stroke},
+  {"fill",   ca_setup_fill,   ca_teardown_fill,   ca_test_fill},
+  {"image",  ca_setup_image,  ca_teardown_image,  ca_test_image},
+  {"mask",   ca_setup_mask,   ca_teardown_mask,   ca_test_mask},
+  {"paint",  ca_setup_paint,  ca_teardown_paint,  ca_test_paint},
+  {"stroke", ca_setup_stroke, ca_teardown_stroke, ca_test_stroke},
 };
 #define NUM_CASES (5)
 
diff --git a/src/caskbench.h b/src/caskbench.h
index 5906747..54bcf51 100644
--- a/src/caskbench.h
+++ b/src/caskbench.h
@@ -21,24 +21,24 @@ void   display_results_json(int iterations, int status);
 void   randomize_color(cairo_t *cr);
 
 // Tests
-int setup_fill(cairo_t *cr);
-void teardown_fill();
-int test_fill(cairo_t *cr);
+int  ca_setup_fill(cairo_t *cr);
+void ca_teardown_fill();
+int  ca_test_fill(cairo_t *cr);
 
-int setup_image(cairo_t *cr);
-void teardown_image();
-int test_image(cairo_t *cr);
+int  ca_setup_image(cairo_t *cr);
+void ca_teardown_image();
+int  ca_test_image(cairo_t *cr);
 
-int setup_mask(cairo_t *cr);
-void teardown_mask();
-int test_mask(cairo_t *cr);
+int  ca_setup_mask(cairo_t *cr);
+void ca_teardown_mask();
+int  ca_test_mask(cairo_t *cr);
 
-int setup_paint(cairo_t *cr);
-void teardown_paint();
-int test_paint(cairo_t *cr);
+int  ca_setup_paint(cairo_t *cr);
+void ca_teardown_paint();
+int  ca_test_paint(cairo_t *cr);
 
-int setup_stroke(cairo_t *cr);
-void teardown_stroke();
-int test_stroke(cairo_t *cr);
+int  ca_setup_stroke(cairo_t *cr);
+void ca_teardown_stroke();
+int  ca_test_stroke(cairo_t *cr);
 
 #endif // __CASKBENCH_H__