[cairo] [PATCH 03/12] test: Re-enable pass-through

[Andrea Canciani]

The pass-through test was not updated to the current test conventions
and was not enabled in the Makefiles.
---
 test/Makefile.sources |    1 +
 test/pass-through.c   |   20 ++++++--------------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/test/Makefile.sources b/test/Makefile.sources
index d6f82a8..8acc266 100644
--- a/test/Makefile.sources
+++ b/test/Makefile.sources
@@ -228,6 +228,7 @@ test_sources = \
 	paint-with-alpha.c				\
 	partial-clip-text.c				\
 	partial-coverage.c				\
+	pass-through.c					\
 	path-append.c					\
 	path-stroke-twice.c				\
 	path-precision.c				\
diff --git a/test/pass-through.c b/test/pass-through.c
index 96f91ba..17a38db 100644
--- a/test/pass-through.c
+++ b/test/pass-through.c
@@ -25,15 +25,6 @@
 
 #include "cairo-test.h"
 
-static cairo_test_draw_function_t draw;
-
-static const cairo_test_t test = {
-    "pass-through",
-    "Tests pixel values",
-    16, 256,
-    draw
-};
-
 static cairo_test_status_t
 draw (cairo_t *cr, int width, int height)
 {
@@ -92,8 +83,9 @@ draw (cairo_t *cr, int width, int height)
     return CAIRO_TEST_SUCCESS;
 }
 
-int
-main (void)
-{
-    return cairo_test (&test);
-}
+CAIRO_TEST (pass_through,
+	    "tests pixel values",
+	    "color", /* keywords */
+	    NULL, /* requirements */
+	    16, 256,
+	    NULL, draw)
-- 
1.7.5.4