summaryrefslogtreecommitdiff
path: root/test/multi-page.c
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@behdad.org>2006-07-11 22:19:39 -0400
committerBehdad Esfahbod <behdad@behdad.org>2006-07-11 22:19:39 -0400
commit973d3a3d1466830dcaa94e9fe39fa6fdf510fbbc (patch)
tree80eb49f8c4f0bf09eb83517e42533cca45dae5d6 /test/multi-page.c
parent94bdbc15f79308269f1bcd74b3d8899f8458babc (diff)
downloadcairo-973d3a3d1466830dcaa94e9fe39fa6fdf510fbbc.tar.gz
More test suite infrastructure improvements:
- Remove cairo_test_expect_failure. cairo-test.c now checks env var CAIRO_XFAIL_TESTS to see if the running test is expected to fail. The reason for expected failure is appended to the test description. - Test description is written out. - Failed/crashed tests also write a line out to stderr (in red), so one can now redirect stdout to /dev/null to only see failures. - cairo_test() has been changed to not take the draw function anymore, instead, draw function is now part of the test struct. - "make check" doesn't allow limiting backends to test using env var anymore. To limit backends to test, one should use the TARGETS variable on the make command line. - "make check-valgrind" now writes its log to valgrind-log instead of valgrind.log, to not interfere with test log file processing.
Diffstat (limited to 'test/multi-page.c')
-rw-r--r--test/multi-page.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/test/multi-page.c b/test/multi-page.c
index f6780b493..05230c795 100644
--- a/test/multi-page.c
+++ b/test/multi-page.c
@@ -53,7 +53,7 @@
#define HEIGHT_IN_POINTS (HEIGHT_IN_INCHES * 72.0)
static void
-draw (cairo_t *cr, double width, double height, double smile_ratio)
+draw_smiley (cairo_t *cr, double width, double height, double smile_ratio)
{
#define STROKE_WIDTH .04
double size;
@@ -112,8 +112,8 @@ draw_some_pages (cairo_surface_t *surface)
#define NUM_FRAMES 5
for (i=0; i < NUM_FRAMES; i++) {
- draw (cr, WIDTH_IN_POINTS, HEIGHT_IN_POINTS,
- (double) i / (NUM_FRAMES - 1));
+ draw_smiley (cr, WIDTH_IN_POINTS, HEIGHT_IN_POINTS,
+ (double) i / (NUM_FRAMES - 1));
/* Duplicate the last frame onto another page. (This is just a
* way to sneak cairo_copy_page into the test).
@@ -134,7 +134,7 @@ main (void)
cairo_status_t status;
char *filename;
- printf("\n");
+ cairo_test_init ("multi-page");
#if CAIRO_HAS_PS_SURFACE
filename = "multi-page.ps";