Split out the list of tests to separate tests.* files

1 files changed, 3 insertions, 39 deletions

diff --git a/src/caskbench.cpp b/src/caskbench.cpp
index 3809839..aadb475 100644
--- a/src/caskbench.cpp
+++ b/src/caskbench.cpp
@@ -18,6 +18,7 @@
 #include <SkCanvas.h>
 
 #include "caskbench.h"
+#include "tests.h"
 
 typedef struct _caskbench_options {
     int dry_run;
@@ -29,14 +30,6 @@ typedef struct _caskbench_options {
     int version;
 } caskbench_options_t;
 
-typedef struct _caskbench_perf_test {
-    const char *name;
-    int (*setup)(caskbench_context_t*);
-    void (*teardown)(void);
-    int (*test_case)(caskbench_context_t*);
-    void (*write_image)(const char *, caskbench_context_t*);
-} caskbench_perf_test_t;
-
 typedef struct _caskbench_result {
     const char *test_case_name;
     int size;
@@ -92,35 +85,6 @@ write_image_file_skia (const char *fname, caskbench_context_t *context)
 }
 
 
-caskbench_perf_test_t perf_tests[] = {
-    {"cairo-fill",   ca_setup_fill,   ca_teardown_fill,   ca_test_fill,   write_image_file_cairo},
-    {"skia-fill",    sk_setup_fill,   sk_teardown_fill,   sk_test_fill,   write_image_file_skia },
-
-    {"cairo-image",  ca_setup_image,  ca_teardown_image,  ca_test_image,   write_image_file_cairo},
-    {"skia-image",   sk_setup_image,  sk_teardown_image,  sk_test_image,   write_image_file_skia },
-
-    {"cairo-mask",   ca_setup_mask,   ca_teardown_mask,   ca_test_mask,   write_image_file_cairo},
-    {"skia-mask",    sk_setup_mask,   sk_teardown_mask,   sk_test_mask,   write_image_file_skia },
-
-    {"cairo-paint",  ca_setup_paint,  ca_teardown_paint,  ca_test_paint,   write_image_file_cairo},
-    {"skia-paint",   sk_setup_paint,  sk_teardown_paint,  sk_test_paint,   write_image_file_skia },
-
-    {"cairo-stroke", ca_setup_stroke, ca_teardown_stroke, ca_test_stroke,   write_image_file_cairo},
-    {"skia-stroke",  sk_setup_stroke, sk_teardown_stroke, sk_test_stroke,   write_image_file_skia },
-
-    {"cairo-rectangles", ca_setup_rectangles, ca_teardown_rectangles, ca_test_rectangles,   write_image_file_cairo},
-    {"skia-rectangles",  sk_setup_rectangles, sk_teardown_rectangles, sk_test_rectangles,   write_image_file_skia },
-
-    {"cairo-roundrect", ca_setup_roundrect, ca_teardown_roundrect, ca_test_roundrect,       write_image_file_cairo},
-    {"skia-roundrect",  sk_setup_roundrect, sk_teardown_roundrect, sk_test_roundrect,       write_image_file_skia },
-
-    {"cairo-bubbles", ca_setup_bubbles, ca_teardown_bubbles, ca_test_bubbles,               write_image_file_cairo},
-    {"skia-bubbles",  sk_setup_bubbles, sk_teardown_bubbles, sk_test_bubbles,               write_image_file_skia },
-
-    {"cairo-multishape", ca_setup_multishape, ca_teardown_multishape, ca_test_multishape,   write_image_file_cairo},
-    {"skia-multishape",  sk_setup_multishape, sk_teardown_multishape, sk_test_multishape,   write_image_file_skia },
-};
-
 typedef enum {
     CASKBENCH_STATUS_PASS,
     CASKBENCH_STATUS_FAIL,
@@ -277,7 +241,7 @@ main (int argc, char *argv[])
         fp = fopen(opt.output_file, "w");
         fprintf(fp, "[\n");
     }
-    for (c=0; c<NUM_ELEM(perf_tests); c++) {
+    for (c=0; c<num_perf_tests; c++) {
         caskbench_context_t context;
         caskbench_result_t result;
         SkPaint skia_paint;
@@ -402,7 +366,7 @@ main (int argc, char *argv[])
             fprintf(fp, "       \"average run time (s)\": %f,\n", result.avg_run_time);
             fprintf(fp, "   }");
 
-            if (c != NUM_ELEM(perf_tests)-1)
+            if (c != num_perf_tests-1)
                 fprintf(fp, ",");
             fprintf(fp, "\n");
         }