diff options
382 files changed, 438 insertions, 303 deletions
diff --git a/test/alpha-similar.c b/test/alpha-similar.c index 29c3aebb..a9411d11 100644 --- a/test/alpha-similar.c +++ b/test/alpha-similar.c @@ -63,7 +63,7 @@ draw (cairo_t *cr, int width, int height) CAIRO_TEST (alpha_similar, "Tests creation of similar alpha surfaces" "\nApplication of a pure-alpha similar source is inconsistent across backends.", - "XFAIL=ps,pdf,svg alpha, similar", /* keywords */ + "alpha, similar", /* keywords */ NULL, /* requirements */ 10, 10, NULL, draw) diff --git a/test/alpha-similar.pdf.argb32.xfail.png b/test/alpha-similar.pdf.argb32.xfail.png Binary files differnew file mode 100644 index 00000000..75aa6005 --- /dev/null +++ b/test/alpha-similar.pdf.argb32.xfail.png diff --git a/test/alpha-similar.pdf.rgb24.xfail.png b/test/alpha-similar.pdf.rgb24.xfail.png Binary files differnew file mode 100644 index 00000000..86366d26 --- /dev/null +++ b/test/alpha-similar.pdf.rgb24.xfail.png diff --git a/test/alpha-similar.ps.argb32.xfail.png b/test/alpha-similar.ps.argb32.xfail.png Binary files differnew file mode 100644 index 00000000..75aa6005 --- /dev/null +++ b/test/alpha-similar.ps.argb32.xfail.png diff --git a/test/alpha-similar.ps.rgb24.xfail.png b/test/alpha-similar.ps.rgb24.xfail.png Binary files differnew file mode 100644 index 00000000..15a6aa11 --- /dev/null +++ b/test/alpha-similar.ps.rgb24.xfail.png diff --git a/test/alpha-similar.svg.argb32.xfail.png b/test/alpha-similar.svg.argb32.xfail.png Binary files differnew file mode 100644 index 00000000..2ade632d --- /dev/null +++ b/test/alpha-similar.svg.argb32.xfail.png diff --git a/test/alpha-similar.svg.rgb24.xfail.png b/test/alpha-similar.svg.rgb24.xfail.png Binary files differnew file mode 100644 index 00000000..c2368985 --- /dev/null +++ b/test/alpha-similar.svg.rgb24.xfail.png diff --git a/test/big-line.c b/test/big-line.c index 3ee6f43e..105e7ee0 100644 --- a/test/big-line.c +++ b/test/big-line.c @@ -56,7 +56,7 @@ draw (cairo_t *cr, int width, int height) CAIRO_TEST (big_line, "Test drawing of simple lines with positive and negative coordinates > 2^16\n" "This currently fails because of 16-bit limitations in pixman.", - "XFAIL line", /* keywords */ + "line", /* keywords */ NULL, /* requirements */ 100, 100, NULL, draw) diff --git a/test/big-line.ps.argb32.ref.png b/test/big-line.ps.argb32.ref.png Binary files differnew file mode 100644 index 00000000..60e73213 --- /dev/null +++ b/test/big-line.ps.argb32.ref.png diff --git a/test/big-line.ps.rgb24.ref.png b/test/big-line.ps.rgb24.ref.png Binary files differnew file mode 100644 index 00000000..8be5f9f5 --- /dev/null +++ b/test/big-line.ps.rgb24.ref.png diff --git a/test/big-line.ps2.ref.png b/test/big-line.ps2.ref.png Binary files differdeleted file mode 100644 index 2a4f57c9..00000000 --- a/test/big-line.ps2.ref.png +++ /dev/null diff --git a/test/big-line.ps2.rgb24.ref.png b/test/big-line.ps2.rgb24.ref.png Binary files differdeleted file mode 100644 index d3d2356c..00000000 --- a/test/big-line.ps2.rgb24.ref.png +++ /dev/null diff --git a/test/big-line.ps3.ref.png b/test/big-line.ps3.ref.png Binary files differdeleted file mode 100644 index 2a4f57c9..00000000 --- a/test/big-line.ps3.ref.png +++ /dev/null diff --git a/test/big-line.ps3.rgb24.ref.png b/test/big-line.ps3.rgb24.ref.png Binary files differdeleted file mode 100644 index d3d2356c..00000000 --- a/test/big-line.ps3.rgb24.ref.png +++ /dev/null diff --git a/test/big-line.ref.png b/test/big-line.ref.png Binary files differdeleted file mode 100644 index 7bfb379c..00000000 --- a/test/big-line.ref.png +++ /dev/null diff --git a/test/big-line.rgb24.ref.png b/test/big-line.rgb24.ref.png Binary files differdeleted file mode 100644 index f1fc49d6..00000000 --- a/test/big-line.rgb24.ref.png +++ /dev/null diff --git a/test/big-trap.c b/test/big-trap.c index 38f2adbf..507e0e5e 100644 --- a/test/big-trap.c +++ b/test/big-trap.c @@ -61,6 +61,11 @@ static cairo_test_status_t draw (cairo_t *cr, int width, int height) { + cairo_set_source_rgb (cr, 1,1,1); + cairo_paint (cr); + + cairo_set_source_rgb (cr, 0,0,0); + /* Note that without the clip, this doesn't crash... */ cairo_new_path (cr); cairo_rectangle (cr, 0, 0, width, height); @@ -80,7 +85,7 @@ draw (cairo_t *cr, int width, int height) CAIRO_TEST (big_trap, "Test oversize trapezoid with a clip region" "\nTest needs to be adjusted to trigger the original bug", - "XFAIL trap", /* keywords */ + "trap", /* keywords */ NULL, /* requirements */ 100, 100, NULL, draw) diff --git a/test/cairo-test-runner.c b/test/cairo-test-runner.c index 2eb2986e..ff90f71b 100644 --- a/test/cairo-test-runner.c +++ b/test/cairo-test-runner.c @@ -66,7 +66,6 @@ typedef struct _cairo_test_runner { cairo_bool_t passed; int num_passed; - int num_xpassed; int num_skipped; int num_failed; int num_xfailed; @@ -74,11 +73,9 @@ typedef struct _cairo_test_runner { cairo_test_list_t **crashes_per_target; cairo_test_list_t **fails_per_target; - cairo_test_list_t **xpasses_per_target; int *num_failed_per_target; int *num_crashed_per_target; - int *num_xpassed_per_target; cairo_bool_t foreground; cairo_bool_t list_only; @@ -342,14 +339,10 @@ _runner_init (cairo_test_runner_t *runner) runner->passed = TRUE; - runner->xpasses_per_target = xcalloc (sizeof (cairo_test_list_t *), - runner->base.num_targets); runner->fails_per_target = xcalloc (sizeof (cairo_test_list_t *), runner->base.num_targets); runner->crashes_per_target = xcalloc (sizeof (cairo_test_list_t *), runner->base.num_targets); - runner->num_xpassed_per_target = xcalloc (sizeof (int), - runner->base.num_targets); runner->num_failed_per_target = xcalloc (sizeof (int), runner->base.num_targets); runner->num_crashed_per_target = xcalloc (sizeof (int), @@ -373,9 +366,8 @@ static void _runner_print_summary (cairo_test_runner_t *runner) { _log (&runner->base, - "%d Passed [%d unexpectedly], %d Failed [%d crashed, %d expected], %d Skipped\n", - runner->num_passed + runner->num_xpassed, - runner->num_xpassed, + "%d Passed, %d Failed [%d crashed, %d expected], %d Skipped\n", + runner->num_passed, runner->num_failed + runner->num_crashed + runner->num_xfailed, runner->num_crashed, @@ -427,23 +419,6 @@ _runner_print_details (cairo_test_runner_t *runner) } _log (&runner->base, "\n"); } - - if (runner->num_xpassed_per_target[n]) { - _log (&runner->base, "%s (%s): %d unexpectedly passed -", - target->name, - cairo_boilerplate_content_name (target->content), - runner->num_xpassed_per_target[n]); - - for (list = runner->xpasses_per_target[n]; - list != NULL; - list = list->next) - { - char *name = cairo_test_get_name (list->test); - _log (&runner->base, " %s", name); - free (name); - } - _log (&runner->base, "\n"); - } } } @@ -469,21 +444,18 @@ _runner_fini (cairo_test_runner_t *runner) for (n = 0; n < runner->base.num_targets; n++) { _list_free (runner->crashes_per_target[n]); _list_free (runner->fails_per_target[n]); - _list_free (runner->xpasses_per_target[n]); } free (runner->crashes_per_target); free (runner->fails_per_target); - free (runner->xpasses_per_target); free (runner->num_crashed_per_target); free (runner->num_failed_per_target); - free (runner->num_xpassed_per_target); cairo_test_fini (&runner->base); return runner->num_failed + runner->num_crashed ? CAIRO_TEST_FAILURE : - runner->num_passed + runner->num_xpassed + runner->num_xfailed ? + runner->num_passed + runner->num_xfailed ? CAIRO_TEST_SUCCESS : CAIRO_TEST_UNTESTED; } @@ -632,9 +604,8 @@ main (int argc, char **argv) for (list = tests; list != NULL; list = list->next) { cairo_test_context_t ctx; - cairo_test_status_t status, expectation; - cairo_bool_t failed = FALSE, crashed = FALSE, skipped = TRUE; - const char *XFAIL = NULL; + cairo_test_status_t status; + cairo_bool_t failed = FALSE, xfailed = FALSE, crashed = FALSE, skipped = TRUE; char *name = cairo_test_get_name (list->test); int i; @@ -657,7 +628,7 @@ main (int argc, char **argv) found = TRUE; } - /* keyword match */ + /* XXX keyword match */ if (keywords != NULL && strstr (keywords, match) != NULL) { found = ! invert; break; @@ -715,20 +686,6 @@ main (int argc, char **argv) goto TEST_NEXT; } - /* check for a failing test */ - expectation = CAIRO_TEST_SUCCESS; - if (list->test->keywords != NULL && - (XFAIL = strstr (list->test->keywords, "XFAIL")) != NULL) - { - if (XFAIL[5] == '=') { - /* backend specific expected failure */ - XFAIL += 5; - } else { - XFAIL = NULL; - expectation = CAIRO_TEST_FAILURE; - } - } - _cairo_test_context_init_for_test (&ctx, &runner.base, list->test); memset (target_status, 0, sizeof (cairo_test_status_t) * ctx.num_targets); @@ -739,10 +696,14 @@ main (int argc, char **argv) case CAIRO_TEST_SUCCESS: skipped = FALSE; break; - case CAIRO_TEST_NO_MEMORY: + case CAIRO_TEST_XFAILURE: + xfailed = TRUE; + goto TEST_DONE; + case CAIRO_TEST_NEW: case CAIRO_TEST_FAILURE: failed = TRUE; goto TEST_DONE; + case CAIRO_TEST_NO_MEMORY: case CAIRO_TEST_CRASHED: failed = TRUE; goto TEST_DONE; @@ -757,35 +718,13 @@ main (int argc, char **argv) for (n = 0; n < ctx.num_targets; n++) { const cairo_boilerplate_target_t *target; cairo_bool_t target_failed = FALSE, + target_xfailed = FALSE, target_crashed = FALSE, target_skipped = TRUE; int has_similar; target = ctx.targets_to_test[n]; - if (XFAIL != NULL) { - const char *target_XFAIL, *base_XFAIL = NULL; - - if (((target_XFAIL = strstr (XFAIL, target->name)) != NULL || - (base_XFAIL = target_XFAIL = strstr (XFAIL, target->basename)) != NULL) && - target_XFAIL < strpbrk (XFAIL, " \t;:") && - target_XFAIL[-1] != '!') - { - ctx.expectation = CAIRO_TEST_FAILURE; - - if (base_XFAIL != NULL) { - unsigned slen; - - slen = strpbrk (base_XFAIL, " \t;:,") - base_XFAIL; - if (slen != strlen (target->basename)) - ctx.expectation = CAIRO_TEST_SUCCESS; - } - } - else - ctx.expectation = CAIRO_TEST_SUCCESS; - } else - ctx.expectation = expectation; - has_similar = runner.full_test ? cairo_test_target_has_similar (&ctx, target) : 0; @@ -800,7 +739,11 @@ main (int argc, char **argv) case CAIRO_TEST_SUCCESS: target_skipped = FALSE; break; + case CAIRO_TEST_XFAILURE: + target_xfailed = TRUE; + break; case CAIRO_TEST_NO_MEMORY: + case CAIRO_TEST_NEW: case CAIRO_TEST_FAILURE: target_failed = TRUE; break; @@ -820,26 +763,19 @@ main (int argc, char **argv) list->test); crashed = TRUE; } else if (target_failed) { - if (ctx.expectation == CAIRO_TEST_SUCCESS) { - target_status[n] = CAIRO_TEST_FAILURE; - runner.num_failed_per_target[n]++; - runner.fails_per_target[n] = _list_prepend (runner.fails_per_target[n], - list->test); - } else - target_status[n] = CAIRO_TEST_SUCCESS; + target_status[n] = CAIRO_TEST_FAILURE; + runner.num_failed_per_target[n]++; + runner.fails_per_target[n] = _list_prepend (runner.fails_per_target[n], + list->test); failed = TRUE; + } else if (target_xfailed) { + target_status[n] = CAIRO_TEST_XFAILURE; + xfailed = TRUE; } else if (target_skipped) { target_status[n] = CAIRO_TEST_UNTESTED; } else { target_status[n] = CAIRO_TEST_SUCCESS; - /* An unexpected pass should also be flagged */ - if (ctx.expectation != CAIRO_TEST_SUCCESS) { - target_status[n] = CAIRO_TEST_FAILURE; - runner.num_xpassed_per_target[n]++; - runner.xpasses_per_target[n] = _list_prepend (runner.xpasses_per_target[n], - list->test); - } skipped = FALSE; } } @@ -866,44 +802,32 @@ main (int argc, char **argv) runner.num_crashed++; runner.passed = FALSE; } else if (failed) { - if (expectation == CAIRO_TEST_SUCCESS) { - len = 0; - for (n = 0 ; n < runner.base.num_targets; n++) { - if (target_status[n] == CAIRO_TEST_FAILURE) { - if (strstr (targets, - runner.base.targets_to_test[n]->name) == NULL) - { - len += snprintf (targets + len, - sizeof (targets) - len, - "%s, ", - runner.base.targets_to_test[n]->name); - } + len = 0; + for (n = 0 ; n < runner.base.num_targets; n++) { + if (target_status[n] == CAIRO_TEST_FAILURE) { + if (strstr (targets, + runner.base.targets_to_test[n]->name) == NULL) + { + len += snprintf (targets + len, + sizeof (targets) - len, + "%s, ", + runner.base.targets_to_test[n]->name); } } - if (len == 0) { - _log (&runner.base, "%s: XFAIL\n", name); - runner.num_xfailed++; - } else { - targets[len-2] = '\0'; - _log (&runner.base, "%s: FAIL (%s)\n", name, targets); - runner.num_failed++; - runner.passed = FALSE; - } - } else { - _log (&runner.base, "%s: XFAIL\n", name); - runner.num_xfailed++; } + targets[len-2] = '\0'; + _log (&runner.base, "%s: FAIL (%s)\n", name, targets); + runner.num_failed++; + runner.passed = FALSE; + } else if (xfailed) { + _log (&runner.base, "%s: XFAIL\n", name); + runner.num_xfailed++; } else if (skipped) { _log (&runner.base, "%s: UNTESTED\n", name); runner.num_skipped++; } else { - if (expectation == CAIRO_TEST_SUCCESS) { - _log (&runner.base, "%s: PASS\n", name); - runner.num_passed++; - } else { - _log (&runner.base, "%s: XPASS\n", name); - runner.num_xpassed++; - } + _log (&runner.base, "%s: PASS\n", name); + runner.num_passed++; } fflush (runner.base.log_file); @@ -921,7 +845,6 @@ main (int argc, char **argv) for (n = 0 ; n < runner.base.num_targets; n++) { runner.crashes_per_target[n] = _list_reverse (runner.crashes_per_target[n]); runner.fails_per_target[n] = _list_reverse (runner.fails_per_target[n]); - runner.xpasses_per_target[n] = _list_reverse (runner.xpasses_per_target[n]); } _runner_print_results (&runner); diff --git a/test/cairo-test.c b/test/cairo-test.c index 3e2dc124..26e7a150 100644 --- a/test/cairo-test.c +++ b/test/cairo-test.c @@ -86,6 +86,10 @@ #define TRUE !FALSE #endif +#ifndef ARRAY_SIZE +#define ARRAY_SIZE(A) (sizeof(A) / sizeof (A[0])) +#endif + static const cairo_user_data_key_t _cairo_test_context_key; static void @@ -95,12 +99,6 @@ static const char *fail_face = "", *xfail_face="", *normal_face = ""; static cairo_bool_t print_fail_on_stdout; static int cairo_test_timeout = 60; -#define CAIRO_TEST_LOG_SUFFIX ".log" -#define CAIRO_TEST_PNG_SUFFIX ".out.png" -#define CAIRO_TEST_REF_SUFFIX ".ref.png" -#define CAIRO_TEST_DIFF_SUFFIX ".diff.png" -#define CAIRO_TEST_OUTPUT_DIR "output" - #define NUM_DEVICE_OFFSETS 2 static char * @@ -127,8 +125,7 @@ static void _cairo_test_init (cairo_test_context_t *ctx, const cairo_test_context_t *parent, const cairo_test_t *test, - const char *test_name, - cairo_test_status_t expectation) + const char *test_name) { char *log_name; @@ -140,7 +137,6 @@ _cairo_test_init (cairo_test_context_t *ctx, ctx->test = test; ctx->test_name = _cairo_test_fixup_name (test_name); - ctx->expectation = expectation; ctx->malloc_failure = 0; #if HAVE_MEMFAULT @@ -212,14 +208,14 @@ _cairo_test_context_init_for_test (cairo_test_context_t *ctx, const cairo_test_context_t *parent, const cairo_test_t *test) { - _cairo_test_init (ctx, parent, test, test->name, CAIRO_TEST_SUCCESS); + _cairo_test_init (ctx, parent, test, test->name); } void cairo_test_init (cairo_test_context_t *ctx, const char *test_name) { - _cairo_test_init (ctx, NULL, NULL, test_name, CAIRO_TEST_SUCCESS); + _cairo_test_init (ctx, NULL, NULL, test_name); } static void @@ -329,21 +325,24 @@ _xunlink (const cairo_test_context_t *ctx, const char *pathname) } char * -cairo_test_reference_image_filename (const cairo_test_context_t *ctx, - const char *base_name, - const char *test_name, - const char *target_name, - const char *base_target_name, - const char *format) +cairo_test_reference_filename (const cairo_test_context_t *ctx, + const char *base_name, + const char *test_name, + const char *target_name, + const char *base_target_name, + const char *format, + const char *suffix, + const char *extension) { char *ref_name = NULL; /* First look for a previous build for comparison. */ if (ctx->refdir != NULL) { - xasprintf (&ref_name, "%s/%s%s", + xasprintf (&ref_name, "%s/%s%s%s", ctx->refdir, base_name, - CAIRO_TEST_PNG_SUFFIX); + suffix, + extension); if (access (ref_name, F_OK) != 0) free (ref_name); else @@ -351,66 +350,72 @@ cairo_test_reference_image_filename (const cairo_test_context_t *ctx, } /* Next look for a target/format-specific reference image. */ - xasprintf (&ref_name, "%s/%s.%s.%s%s", + xasprintf (&ref_name, "%s/%s.%s.%s%s%s", ctx->srcdir, test_name, target_name, format, - CAIRO_TEST_REF_SUFFIX); + suffix, + extension); if (access (ref_name, F_OK) != 0) free (ref_name); else goto done; /* Next, look for target-specific reference image. */ - xasprintf (&ref_name, "%s/%s.%s%s", + xasprintf (&ref_name, "%s/%s.%s%s%s", ctx->srcdir, test_name, target_name, - CAIRO_TEST_REF_SUFFIX); + suffix, + extension); if (access (ref_name, F_OK) != 0) free (ref_name); else goto done; /* Next look for a base/format-specific reference image. */ - xasprintf (&ref_name, "%s/%s.%s.%s%s", + xasprintf (&ref_name, "%s/%s.%s.%s%s%s", ctx->srcdir, test_name, base_target_name, format, - CAIRO_TEST_REF_SUFFIX); + suffix, + extension); if (access (ref_name, F_OK) != 0) free (ref_name); else goto done; /* Next, look for base-specific reference image. */ - xasprintf (&ref_name, "%s/%s.%s%s", + xasprintf (&ref_name, "%s/%s.%s%s%s", ctx->srcdir, test_name, base_target_name, - CAIRO_TEST_REF_SUFFIX); + suffix, + extension); if (access (ref_name, F_OK) != 0) free (ref_name); else goto done; /* Next, look for format-specific reference image. */ - xasprintf (&ref_name, "%s/%s.%s%s", + xasprintf (&ref_name, "%s/%s.%s%s%s", ctx->srcdir, test_name, format, - CAIRO_TEST_REF_SUFFIX); + suffix, + extension); if (access (ref_name, F_OK) != 0) free (ref_name); else goto done; /* Finally, look for the standard reference image. */ - xasprintf (&ref_name, "%s/%s%s", ctx->srcdir, + xasprintf (&ref_name, "%s/%s%s%s", ctx->srcdir, test_name, - CAIRO_TEST_REF_SUFFIX); + suffix, + extension); if (access (ref_name, F_OK) != 0) free (ref_name); else @@ -546,22 +551,31 @@ cairo_test_get_reference_image (cairo_test_context_t *ctx, static cairo_bool_t cairo_test_file_is_older (const char *filename, - const char *ref_filename) + char **ref_filenames, + int num_ref_filenames) { #if HAVE_SYS_STAT_H - struct stat st, ref; + struct stat st; if (stat (filename, &st) < 0) return FALSE; - if (stat (ref_filename, &ref) < 0) - return TRUE; + while (num_ref_filenames--) { + struct stat ref; + char *ref_filename = ref_filenames++; - return st.st_mtime < ref.st_mtime; -#else - /* XXX */ - return FALSE; + if (ref_filename == NULL) + continue; + + if (stat (ref_filename++, &ref) < 0) + continue; + + if (st.st_mtime <= ref.st_mtime) + return TRUE; + } #endif + + return FALSE; } static cairo_bool_t @@ -571,6 +585,9 @@ cairo_test_files_equal (const char *test_filename, FILE *test, *pass; int t, p; + if (test_filename == NULL || pass_filename == NULL) + return FALSE; + test = fopen (test_filename, "rb"); if (test == NULL) return FALSE; @@ -659,7 +676,11 @@ cairo_test_for_target (cairo_test_context_t *ctx, const char *empty_str = ""; char *offset_str, *thread_str; char *base_name, *base_path; - char *png_path, *ref_path, *diff_path; + char *out_png_path; + char *ref_path = NULL, *ref_png_path; + char *new_path = NULL, *new_png_path; + char *xfail_path = NULL, *xfail_png_path; + char *diff_png_path; char *test_filename = NULL, *pass_filename = NULL, *fail_filename = NULL; cairo_test_status_t ret; cairo_content_t expected_content; @@ -700,18 +721,64 @@ cairo_test_for_target (cairo_test_context_t *ctx, free (thread_str); - ref_path = cairo_test_reference_image_filename (ctx, + ref_png_path = cairo_test_reference_filename (ctx, + base_name, + ctx->test_name, + target->name, + target->basename, + format, + CAIRO_TEST_REF_SUFFIX, + CAIRO_TEST_PNG_EXTENSION); + new_png_path = cairo_test_reference_filename (ctx, + base_name, + ctx->test_name, + target->name, + target->basename, + format, + CAIRO_TEST_NEW_SUFFIX, + CAIRO_TEST_PNG_EXTENSION); + xfail_png_path = cairo_test_reference_filename (ctx, base_name, ctx->test_name, target->name, target->basename, - format); + format, + CAIRO_TEST_XFAIL_SUFFIX, + CAIRO_TEST_PNG_EXTENSION); + + if (target->file_extension != NULL) { + ref_path = cairo_test_reference_filename (ctx, + base_name, + ctx->test_name, + target->name, + target->basename, + format, + CAIRO_TEST_REF_SUFFIX, + target->file_extension); + new_path = cairo_test_reference_filename (ctx, + base_name, + ctx->test_name, + target->name, + target->basename, + format, + CAIRO_TEST_NEW_SUFFIX, + target->file_extension); + xfail_path = cairo_test_reference_filename (ctx, + base_name, + ctx->test_name, + target->name, + target->basename, + format, + CAIRO_TEST_XFAIL_SUFFIX, + target->file_extension); + } + have_output_dir = _cairo_test_mkdir (CAIRO_TEST_OUTPUT_DIR); xasprintf (&base_path, "%s/%s", have_output_dir ? CAIRO_TEST_OUTPUT_DIR : ".", base_name); - xasprintf (&png_path, "%s" CAIRO_TEST_PNG_SUFFIX, base_path); - xasprintf (&diff_path, "%s" CAIRO_TEST_DIFF_SUFFIX, base_path); + xasprintf (&out_png_path, "%s" CAIRO_TEST_OUT_PNG, base_path); + xasprintf (&diff_png_path, "%s" CAIRO_TEST_DIFF_PNG, base_path); if (ctx->test->requirements != NULL) { const char *required; @@ -973,16 +1040,16 @@ REPEAT: } } - if (ref_path == NULL) { + if (ref_png_path == NULL) { cairo_test_log (ctx, "Error: Cannot find reference image for %s\n", base_name); /* we may be running this test to generate reference images */ - _xunlink (ctx, png_path); + _xunlink (ctx, out_png_path); test_image = target->get_image_surface (surface, 0, ctx->test->width, ctx->test->height); - diff_status = cairo_surface_write_to_png (test_image, png_path); + diff_status = cairo_surface_write_to_png (test_image, out_png_path); if (diff_status) { cairo_test_log (ctx, "Error: Failed to write output image: %s\n", @@ -991,11 +1058,20 @@ REPEAT: have_output = TRUE; cairo_surface_destroy (test_image); - ret = CAIRO_TEST_FAILURE; + ret = CAIRO_TEST_XFAILURE; goto UNWIND_CAIRO; } if (target->file_extension != NULL) { /* compare vector surfaces */ + char *filenames[] = { + ref_png_path, + ref_path, + new_png_path, + new_path, + xfail_png_path, + xfail_path, + }; + xasprintf (&test_filename, "%s.out%s", base_path, target->file_extension); xasprintf (&pass_filename, "%s.pass%s", @@ -1003,10 +1079,37 @@ REPEAT: xasprintf (&fail_filename, "%s.fail%s", base_path, target->file_extension); - if (cairo_test_file_is_older (pass_filename, ref_path)) + if (cairo_test_file_is_older (pass_filename, + filenames, + ARRAY_SIZE (filenames))) + { _xunlink (ctx, pass_filename); - if (cairo_test_file_is_older (fail_filename, ref_path)) + } + if (cairo_test_file_is_older (fail_filename, + filenames, + ARRAY_SIZE (filenames))) + { _xunlink (ctx, fail_filename); + } + + if (cairo_test_files_equal (out_png_path, ref_path)) { + cairo_test_log (ctx, "Vector surface matches reference.\n"); + have_output = FALSE; + ret = CAIRO_TEST_SUCCESS; + goto UNWIND_CAIRO; + } + if (cairo_test_files_equal (out_png_path, new_path)) { + cairo_test_log (ctx, "Vector surface matches current failure.\n"); + have_output = FALSE; + ret = CAIRO_TEST_NEW; + goto UNWIND_CAIRO; + } + if (cairo_test_files_equal (out_png_path, xfail_path)) { + cairo_test_log (ctx, "Vector surface matches known failure.\n"); + have_output = FALSE; + ret = CAIRO_TEST_XFAILURE; + goto UNWIND_CAIRO; + } if (cairo_test_files_equal (test_filename, pass_filename)) { /* identical output as last known PASS */ @@ -1036,8 +1139,8 @@ REPEAT: goto UNWIND_CAIRO; } - _xunlink (ctx, png_path); - diff_status = cairo_surface_write_to_png (test_image, png_path); + _xunlink (ctx, out_png_path); + diff_status = cairo_surface_write_to_png (test_image, out_png_path); if (diff_status) { cairo_test_log (ctx, "Error: Failed to write output image: %s\n", cairo_status_to_string (diff_status)); @@ -1049,47 +1152,86 @@ REPEAT: /* binary compare png files (no decompression) */ if (target->file_extension == NULL) { - xasprintf (&test_filename, "%s", png_path); + char *filenames[] = { + ref_png_path, + new_png_path, + xfail_png_path, + }; + + xasprintf (&test_filename, "%s", out_png_path); xasprintf (&pass_filename, "%s.pass.png", base_path); xasprintf (&fail_filename, "%s.fail.png", base_path); + if (cairo_test_file_is_older (pass_filename, + filenames, + ARRAY_SIZE (filenames))) + { + _xunlink (ctx, pass_filename); + } + if (cairo_test_file_is_older (fail_filename, + filenames, + ARRAY_SIZE (filenames))) + { + _xunlink (ctx, fail_filename); + } + if (cairo_test_files_equal (test_filename, pass_filename)) { - /* identical output as last known PASS, pass */ cairo_test_log (ctx, "PNG file exactly matches last pass.\n"); cairo_surface_destroy (test_image); ret = CAIRO_TEST_SUCCESS; goto UNWIND_CAIRO; } - if (cairo_test_files_equal (png_path, ref_path)) { - /* identical output as reference image */ + if (cairo_test_files_equal (out_png_path, ref_png_path)) { cairo_test_log (ctx, "PNG file exactly reference image.\n"); cairo_surface_destroy (test_image); ret = CAIRO_TEST_SUCCESS; goto UNWIND_CAIRO; } - + if (cairo_test_files_equal (out_png_path, new_png_path)) { + cairo_test_log (ctx, "PNG file exactly current failure image.\n"); + cairo_surface_destroy (test_image); + ret = CAIRO_TEST_NEW; + goto UNWIND_CAIRO; + } + if (cairo_test_files_equal (out_png_path, xfail_png_path)) { + cairo_test_log (ctx, "PNG file exactly known failure image.\n"); + cairo_surface_destroy (test_image); + ret = CAIRO_TEST_XFAILURE; + goto UNWIND_CAIRO; + } if (cairo_test_files_equal (test_filename, fail_filename)) { cairo_test_log (ctx, "PNG file exactly matches last fail.\n"); - /* identical output as last known FAIL, fail */ have_result = TRUE; /* presume these were kept around as well */ cairo_surface_destroy (test_image); ret = CAIRO_TEST_FAILURE; goto UNWIND_CAIRO; } } else { - if (cairo_test_files_equal (png_path, ref_path)) { + if (cairo_test_files_equal (out_png_path, ref_png_path)) { cairo_test_log (ctx, "PNG file exactly matches reference image.\n"); cairo_surface_destroy (test_image); ret = CAIRO_TEST_SUCCESS; goto UNWIND_CAIRO; } + if (cairo_test_files_equal (out_png_path, xfail_png_path)) { + cairo_test_log (ctx, "PNG file exactly matches current failure image.\n"); + cairo_surface_destroy (test_image); + ret = CAIRO_TEST_NEW; + goto UNWIND_CAIRO; + } + if (cairo_test_files_equal (out_png_path, xfail_png_path)) { + cairo_test_log (ctx, "PNG file exactly matches known failure image.\n"); + cairo_surface_destroy (test_image); + ret = CAIRO_TEST_XFAILURE; + goto UNWIND_CAIRO; + } } - ref_image = cairo_test_get_reference_image (ctx, ref_path, + ref_image = cairo_test_get_reference_image (ctx, ref_png_path, target->content == CAIRO_TEST_CONTENT_COLOR_ALPHA_FLATTENED); if (cairo_surface_status (ref_image)) { cairo_test_log (ctx, "Error: Cannot open reference image for %s: %s\n", - ref_path, + ref_png_path, cairo_status_to_string (cairo_surface_status (ref_image))); cairo_surface_destroy (ref_image); cairo_surface_destroy (test_image); @@ -1105,7 +1247,7 @@ REPEAT: test_image, ref_image, diff_image, &result); - _xunlink (ctx, diff_path); + _xunlink (ctx, diff_png_path); if (diff_status) { cairo_test_log (ctx, "Error: Failed to compare images: %s\n", cairo_status_to_string (diff_status)); @@ -1116,7 +1258,7 @@ REPEAT: { ret = CAIRO_TEST_FAILURE; - diff_status = cairo_surface_write_to_png (diff_image, diff_path); + diff_status = cairo_surface_write_to_png (diff_image, diff_png_path); if (diff_status) { cairo_test_log (ctx, "Error: Failed to write differences image: %s\n", cairo_status_to_string (diff_status)); @@ -1147,7 +1289,7 @@ UNWIND_CAIRO: } #if HAVE_MEMFAULT - if (ret == CAIRO_TEST_FAILURE && ctx->expectation != CAIRO_TEST_FAILURE) + if (ret == CAIRO_TEST_FAILURE) MEMFAULT_PRINT_FAULTS (); #endif cairo_destroy (cr); @@ -1166,11 +1308,8 @@ UNWIND_SURFACE: #endif if (MEMFAULT_COUNT_LEAKS () > 0) { - if (ret != CAIRO_TEST_FAILURE || - ctx->expectation == CAIRO_TEST_FAILURE) - { + if (ret != CAIRO_TEST_FAILURE) MEMFAULT_PRINT_FAULTS (); - } MEMFAULT_PRINT_LEAKS (); } } @@ -1181,22 +1320,32 @@ UNWIND_SURFACE: if (ctx->thread == 0) { if (have_output) - cairo_test_log (ctx, "OUTPUT: %s\n", png_path); + cairo_test_log (ctx, "OUTPUT: %s\n", out_png_path); if (have_result) { cairo_test_log (ctx, "REFERENCE: %s\nDIFFERENCE: %s\n", - ref_path, diff_path); + ref_png_path, diff_png_path); } } UNWIND_STRINGS: - if (png_path) - free (png_path); + if (out_png_path) + free (out_png_path); + if (ref_png_path) + free (ref_png_path); if (ref_path) free (ref_path); - if (diff_path) - free (diff_path); + if (new_png_path) + free (new_png_path); + if (new_path) + free (new_path); + if (xfail_png_path) + free (xfail_png_path); + if (xfail_path) + free (xfail_path); + if (diff_png_path) + free (diff_png_path); if (base_path) free (base_path); if (base_name) @@ -1303,10 +1452,13 @@ _cairo_test_context_run_for_target (cairo_test_context_t *ctx, printf ("PASS\n"); cairo_test_log (ctx, "PASS\n"); break; + case CAIRO_TEST_UNTESTED: printf ("UNTESTED\n"); cairo_test_log (ctx, "UNTESTED\n"); break; + + default: case CAIRO_TEST_CRASHED: if (print_fail_on_stdout && ctx->thread == 0) { printf ("!!!CRASHED!!!\n"); @@ -1321,36 +1473,51 @@ _cairo_test_context_run_for_target (cairo_test_context_t *ctx, cairo_boilerplate_content_name (target->content), dev_offset, similar ? " (similar)" : "", fail_face, normal_face); break; - default: + + case CAIRO_TEST_XFAILURE: + if (print_fail_on_stdout && ctx->thread == 0) { + printf ("XFAIL\n"); + } else { + /* eat the test name */ + printf ("\r"); + fflush (stdout); + } + fprintf (stderr, "%s.%s.%s [%d]%s:\t%sXFAIL%s\n", + ctx->test_name, target->name, + cairo_boilerplate_content_name (target->content), dev_offset, similar ? " (similar)" : "", + xfail_face, normal_face); + cairo_test_log (ctx, "XFAIL\n"); + break; + + case CAIRO_TEST_NEW: + if (print_fail_on_stdout && ctx->thread == 0) { + printf ("NEW\n"); + } else { + /* eat the test name */ + printf ("\r"); + fflush (stdout); + } + fprintf (stderr, "%s.%s.%s [%d]%s:\t%sNEW%s\n", + ctx->test_name, target->name, + cairo_boilerplate_content_name (target->content), dev_offset, similar ? " (similar)" : "", + fail_face, normal_face); + cairo_test_log (ctx, "NEW\n"); + break; + case CAIRO_TEST_NO_MEMORY: case CAIRO_TEST_FAILURE: - if (ctx->expectation == CAIRO_TEST_FAILURE) { - if (print_fail_on_stdout && ctx->thread == 0) { - printf ("XFAIL\n"); - } else { - /* eat the test name */ - printf ("\r"); - fflush (stdout); - } - fprintf (stderr, "%s.%s.%s [%d]%s:\t%sXFAIL%s\n", - ctx->test_name, target->name, - cairo_boilerplate_content_name (target->content), dev_offset, similar ? " (similar)" : "", - xfail_face, normal_face); - cairo_test_log (ctx, "XFAIL\n"); + if (print_fail_on_stdout && ctx->thread == 0) { + printf ("FAIL\n"); } else { - if (print_fail_on_stdout && ctx->thread == 0) { - printf ("FAIL\n"); - } else { - /* eat the test name */ - printf ("\r"); - fflush (stdout); - } - fprintf (stderr, "%s.%s.%s [%d]%s:\t%sFAIL%s\n", - ctx->test_name, target->name, - cairo_boilerplate_content_name (target->content), dev_offset, similar ? " (similar)" : "", - fail_face, normal_face); - cairo_test_log (ctx, "FAIL\n"); + /* eat the test name */ + printf ("\r"); + fflush (stdout); } + fprintf (stderr, "%s.%s.%s [%d]%s:\t%sFAIL%s\n", + ctx->test_name, target->name, + cairo_boilerplate_content_name (target->content), dev_offset, similar ? " (similar)" : "", + fail_face, normal_face); + cairo_test_log (ctx, "FAIL\n"); break; } fflush (stdout); @@ -1370,17 +1537,19 @@ _cairo_test_context_run_for_target (cairo_test_context_t *ctx, case CAIRO_TEST_UNTESTED: printf ("UNTESTED\n"); break; + default: case CAIRO_TEST_CRASHED: printf ("!!!CRASHED!!!\n"); break; - default: + case CAIRO_TEST_XFAILURE: + printf ("XFAIL\n"); + break; + case CAIRO_TEST_NEW: + printf ("NEW\n"); + break; case CAIRO_TEST_NO_MEMORY: case CAIRO_TEST_FAILURE: - if (ctx->expectation == CAIRO_TEST_FAILURE) { - printf ("XFAIL\n"); - } else { - printf ("FAIL\n"); - } + printf ("FAIL\n"); break; } @@ -1473,19 +1642,15 @@ cairo_test_run_threaded (void *closure) static cairo_test_status_t -cairo_test_expecting (const cairo_test_t *test, - cairo_test_status_t expectation) +cairo_test_expecting (const cairo_test_t *test) { cairo_test_context_t ctx; cairo_test_status_t ret = CAIRO_TEST_SUCCESS; size_t num_threads; - _cairo_test_init (&ctx, NULL, test, test->name, expectation); + _cairo_test_init (&ctx, NULL, test, test->name); printf ("%s\n", test->description); - if (expectation == CAIRO_TEST_FAILURE) - printf ("Expecting failure\n"); - #if HAVE_PTHREAD_H num_threads = 0; if (getenv ("CAIRO_TEST_NUM_THREADS")) @@ -1517,20 +1682,6 @@ cairo_test_expecting (const cairo_test_t *test, if (ret != CAIRO_TEST_SUCCESS) printf ("Check %s%s out for more information.\n", ctx.test_name, CAIRO_TEST_LOG_SUFFIX); - /* if the set of targets to test was limited using CAIRO_TEST_TARGET, we - * behave slightly differently, to ensure that limiting the targets does - * not increase the number of tests failing. */ - if (ctx.limited_targets) { - /* if all passed, but expecting failure, return failure to not - * trigger an XPASS failure */ - if (expectation == CAIRO_TEST_FAILURE && ret == CAIRO_TEST_SUCCESS) { - printf ("All tested backends passed, but tested targets are manually limited\n" - "and the test suite expects this test to fail for at least one target.\n" - "Intentionally failing the test, to not fail the suite.\n"); - ret = CAIRO_TEST_FAILURE; - } - } - cairo_test_fini (&ctx); return ret; @@ -1545,7 +1696,7 @@ cairo_test (const cairo_test_t *test) _CrtSetReportFile(_CRT_ERROR, _CRTDBG_FILE_STDERR); #endif - return cairo_test_expecting (test, CAIRO_TEST_SUCCESS); + return cairo_test_expecting (test); } const cairo_test_context_t * diff --git a/test/cairo-test.h b/test/cairo-test.h index db02eef2..bf10eb70 100644 --- a/test/cairo-test.h +++ b/test/cairo-test.h @@ -79,10 +79,51 @@ cairo_test_NaN (void) #endif } +#define CAIRO_TEST_OUTPUT_DIR "output" + +#define CAIRO_TEST_LOG_SUFFIX ".log" + +/* What is a fail and what isn't? + * When running the test suite we want to detect unexpected output. This + * can be caused by a change we have made to cairo itself, or a change + * in our environment. To capture this we classify the expected output into 3 + * classes: + * + * REF -- Perfect output. + * Might be different for each backend, due to slight implementation + * differences. + * + * NEW -- A new failure. We have uncovered a bug within cairo and have + * recorded the current failure (along with the expected output + * if possible!) so we can detect any changes in our attempt to + * fix the bug. + * + * XFAIL -- An external failure. We believe the cairo output is perfect, + * but an external renderer is causing gross failure. + * (We also use this to capture current WONTFIX issues within cairo, + * such as overflow in internal coordinates, so as not to distract + * us when regression testing.) + * + * If no REF is given for a test, then it is assumed to be XFAIL. + */ +#define CAIRO_TEST_REF_SUFFIX ".ref" +#define CAIRO_TEST_XFAIL_SUFFIX ".xfail" +#define CAIRO_TEST_NEW_SUFFIX ".new" + +#define CAIRO_TEST_OUT_SUFFIX ".out" +#define CAIRO_TEST_DIFF_SUFFIX ".diff" + +#define CAIRO_TEST_PNG_EXTENSION ".png" +#define CAIRO_TEST_OUT_PNG CAIRO_TEST_OUT_SUFFIX CAIRO_TEST_PNG_EXTENSION +#define CAIRO_TEST_REF_PNG CAIRO_TEST_REF_SUFFIX CAIRO_TEST_PNG_EXTENSION +#define CAIRO_TEST_DIFF_PNG CAIRO_TEST_DIFF_SUFFIX CAIRO_TEST_PNG_EXTENSION + typedef enum cairo_test_status { CAIRO_TEST_SUCCESS = 0, CAIRO_TEST_NO_MEMORY, CAIRO_TEST_FAILURE, + CAIRO_TEST_NEW, + CAIRO_TEST_XFAILURE, CAIRO_TEST_CRASHED, CAIRO_TEST_UNTESTED = 77 /* match automake's skipped exit status */ } cairo_test_status_t; @@ -161,7 +202,6 @@ cairo_test_register (const cairo_test_t *test); struct _cairo_test_context { const cairo_test_t *test; const char *test_name; - cairo_test_status_t expectation; FILE *log_file; const char *srcdir; /* directory containing sources and input data */ @@ -234,12 +274,14 @@ cairo_test_status_from_status (const cairo_test_context_t *ctx, cairo_status_t status); char * -cairo_test_reference_image_filename (const cairo_test_context_t *ctx, - const char *base_name, - const char *test_name, - const char *target_name, - const char *base_target_name, - const char *format); +cairo_test_reference_filename (const cairo_test_context_t *ctx, + const char *base_name, + const char *test_name, + const char *target_name, + const char *base_target_name, + const char *format, + const char *suffix, + const char *extension); cairo_surface_t * cairo_test_get_reference_image (cairo_test_context_t *ctx, diff --git a/test/caps-joins-alpha.svg11.ref.png b/test/caps-joins-alpha.svg11.ref.png Binary files differdeleted file mode 100644 index 24689364..00000000 --- a/test/caps-joins-alpha.svg11.ref.png +++ /dev/null diff --git a/test/caps-joins-alpha.svg12.ref.png b/test/caps-joins-alpha.svg12.ref.png Binary files differdeleted file mode 100644 index 24689364..00000000 --- a/test/caps-joins-alpha.svg12.ref.png +++ /dev/null diff --git a/test/clip-fill-rule.test-fallback.rgb24.ref.png b/test/clip-fill-rule.test-fallback.rgb24.ref.png Binary files differdeleted file mode 100644 index d21472dc..00000000 --- a/test/clip-fill-rule.test-fallback.rgb24.ref.png +++ /dev/null diff --git a/test/clip-nesting.test-fallback.rgb24.ref.png b/test/clip-nesting.test-fallback.rgb24.ref.png Binary files differdeleted file mode 100644 index d087ab6c..00000000 --- a/test/clip-nesting.test-fallback.rgb24.ref.png +++ /dev/null diff --git a/test/clip-operator.c b/test/clip-operator.c index d9ffcd2a..a6562a88 100644 --- a/test/clip-operator.c +++ b/test/clip-operator.c @@ -182,7 +182,7 @@ draw (cairo_t *cr, int width, int height) CAIRO_TEST (clip_operator, "Surface clipping with different operators", - "XFAIL=svg12 clip", /* keywords */ + "clip", /* keywords */ NULL, /* requirements */ IMAGE_WIDTH, IMAGE_HEIGHT, NULL, draw) diff --git a/test/clip-operator.pdf.argb32.ref.png b/test/clip-operator.pdf.argb32.ref.png Binary files differdeleted file mode 100644 index 318873ab..00000000 --- a/test/clip-operator.pdf.argb32.ref.png +++ /dev/null diff --git a/test/clip-operator.pdf.argb32.xfail.png b/test/clip-operator.pdf.argb32.xfail.png Binary files differnew file mode 100644 index 00000000..c0a4078c --- /dev/null +++ b/test/clip-operator.pdf.argb32.xfail.png diff --git a/test/clip-operator.pdf.rgb24.ref.png b/test/clip-operator.pdf.rgb24.ref.png Binary files differdeleted file mode 100644 index 6590dd88..00000000 --- a/test/clip-operator.pdf.rgb24.ref.png +++ /dev/null diff --git a/test/clip-operator.pdf.rgb24.xfail.png b/test/clip-operator.pdf.rgb24.xfail.png Binary files differnew file mode 100644 index 00000000..01329b55 --- /dev/null +++ b/test/clip-operator.pdf.rgb24.xfail.png diff --git a/test/clip-operator.svg12.argb32.xfail.png b/test/clip-operator.svg12.argb32.xfail.png Binary files differnew file mode 100644 index 00000000..1c21d15f --- /dev/null +++ b/test/clip-operator.svg12.argb32.xfail.png diff --git a/test/clip-operator.svg12.rgb24.xfail.png b/test/clip-operator.svg12.rgb24.xfail.png Binary files differnew file mode 100644 index 00000000..f79de48e --- /dev/null +++ b/test/clip-operator.svg12.rgb24.xfail.png diff --git a/test/clip-operator.test-fallback.argb32.ref.png b/test/clip-operator.test-fallback.argb32.ref.png Binary files differdeleted file mode 100644 index f53e4921..00000000 --- a/test/clip-operator.test-fallback.argb32.ref.png +++ /dev/null diff --git a/test/clip-operator.test-fallback.rgb24.ref.png b/test/clip-operator.test-fallback.rgb24.ref.png Binary files differdeleted file mode 100644 index 7579ae69..00000000 --- a/test/clip-operator.test-fallback.rgb24.ref.png +++ /dev/null diff --git a/test/clip-twice.test-fallback.argb32.ref.png b/test/clip-twice.test-fallback.argb32.ref.png Binary files differdeleted file mode 100644 index ba621807..00000000 --- a/test/clip-twice.test-fallback.argb32.ref.png +++ /dev/null diff --git a/test/clip-twice.test-fallback.rgb24.ref.png b/test/clip-twice.test-fallback.rgb24.ref.png Binary files differdeleted file mode 100644 index 9cbdc4d4..00000000 --- a/test/clip-twice.test-fallback.rgb24.ref.png +++ /dev/null diff --git a/test/composite-integer-translate-source.c b/test/composite-integer-translate-source.c index 9b6b7490..a05133c6 100644 --- a/test/composite-integer-translate-source.c +++ b/test/composite-integer-translate-source.c @@ -58,7 +58,7 @@ draw (cairo_t *cr, int width, int height) CAIRO_TEST (composite_integer_translate_source, "Test simple compositing: integer-translation 32->32 SOURCE", - "XFAIL=svg12 composite", /* keywords */ + "composite", /* keywords */ NULL, /* requirements */ SIZE, SIZE, NULL, draw) diff --git a/test/degenerate-arc.test-fallback.argb32.ref.png b/test/degenerate-arc.test-fallback.argb32.ref.png Binary files differdeleted file mode 100644 index 73d41afa..00000000 --- a/test/degenerate-arc.test-fallback.argb32.ref.png +++ /dev/null diff --git a/test/degenerate-arc.test-fallback.rgb24.ref.png b/test/degenerate-arc.test-fallback.rgb24.ref.png Binary files differdeleted file mode 100644 index 73d41afa..00000000 --- a/test/degenerate-arc.test-fallback.rgb24.ref.png +++ /dev/null diff --git a/test/degenerate-dash.c b/test/degenerate-dash.c index 4bc0a424..961eeb5b 100644 --- a/test/degenerate-dash.c +++ b/test/degenerate-dash.c @@ -83,7 +83,7 @@ draw (cairo_t *cr, int width, int height) CAIRO_TEST (degenerate_dash, "Tests the behaviour of dashed segments that end on a off-on transition", - "XFAIL=ps dash, degenerate", /* keywords */ + "dash, degenerate", /* keywords */ NULL, /* requirementts */ 210 + 2*PAD, 210 + 2*PAD, NULL, draw) diff --git a/test/degenerate-dash.ps.xfail.png b/test/degenerate-dash.ps.xfail.png Binary files differnew file mode 100644 index 00000000..6d3737ff --- /dev/null +++ b/test/degenerate-dash.ps.xfail.png diff --git a/test/degenerate-path.c b/test/degenerate-path.c index b4c30ee3..97cf7b28 100644 --- a/test/degenerate-path.c +++ b/test/degenerate-path.c @@ -112,7 +112,7 @@ draw (cairo_t *cr, int width, int height) CAIRO_TEST (degenerate_path, "Tests the behaviour of degenerate paths with different cap types", - "XFAIL=ps degenerate", /* keywords */ + "degenerate", /* keywords */ NULL, /* requirements */ 3*(PAD+LINE_WIDTH+PAD), 8*(LINE_WIDTH+PAD) + PAD, NULL, draw) diff --git a/test/degenerate-path.ps.argb32.xfail.png b/test/degenerate-path.ps.argb32.xfail.png Binary files differnew file mode 100644 index 00000000..9bcf2720 --- /dev/null +++ b/test/degenerate-path.ps.argb32.xfail.png diff --git a/test/degenerate-path.ps.rgb24.xfail.png b/test/degenerate-path.ps.rgb24.xfail.png Binary files differnew file mode 100644 index 00000000..00cca924 --- /dev/null +++ b/test/degenerate-path.ps.rgb24.xfail.png diff --git a/test/degenerate-path.ps2.argb32.ref.png b/test/degenerate-path.ps2.argb32.ref.png Binary files differdeleted file mode 100644 index 85b9d4ba..00000000 --- a/test/degenerate-path.ps2.argb32.ref.png +++ /dev/null diff --git a/test/degenerate-path.ps2.rgb24.ref.png b/test/degenerate-path.ps2.rgb24.ref.png Binary files differdeleted file mode 100644 index 99e6c661..00000000 --- a/test/degenerate-path.ps2.rgb24.ref.png +++ /dev/null diff --git a/test/degenerate-path.ps3.argb32.ref.png b/test/degenerate-path.ps3.argb32.ref.png Binary files differdeleted file mode 100644 index 85b9d4ba..00000000 --- a/test/degenerate-path.ps3.argb32.ref.png +++ /dev/null diff --git a/test/degenerate-path.ps3.rgb24.ref.png b/test/degenerate-path.ps3.rgb24.ref.png Binary files differdeleted file mode 100644 index 99e6c661..00000000 --- a/test/degenerate-path.ps3.rgb24.ref.png +++ /dev/null diff --git a/test/device-offset-scale.c b/test/device-offset-scale.c index 11e68f93..3df3d38f 100644 --- a/test/device-offset-scale.c +++ b/test/device-offset-scale.c @@ -67,7 +67,7 @@ draw (cairo_t *cr, int width, int height) CAIRO_TEST (device_offset_scale, "Test that the device-offset transform is transformed by the ctm.", - "XFAIL=svg device-offset", /* keywords */ + "device-offset", /* keywords */ NULL, /* requirements */ WIDTH, HEIGHT, NULL, draw) diff --git a/test/device-offset-scale.svg.xfail.png b/test/device-offset-scale.svg.xfail.png Binary files differnew file mode 100644 index 00000000..58a82d69 --- /dev/null +++ b/test/device-offset-scale.svg.xfail.png diff --git a/test/extend-pad-border.c b/test/extend-pad-border.c index 79a81fcf..de8105cf 100644 --- a/test/extend-pad-border.c +++ b/test/extend-pad-border.c @@ -89,7 +89,7 @@ draw (cairo_t *cr, int width, int height) CAIRO_TEST (extend_pad_border, "Test CAIRO_EXTEND_PAD for surface patterns", - "XFAIL=!image,pdf,ps,svg extend", /* keywords */ + "extend", /* keywords */ NULL, /* requirements */ SIZE, SIZE, NULL, draw) diff --git a/test/extend-pad-border.ps.ref.png b/test/extend-pad-border.ps.ref.png Binary files differnew file mode 100644 index 00000000..b1f4c406 --- /dev/null +++ b/test/extend-pad-border.ps.ref.png diff --git a/test/extend-pad-border.svg.xfail.png b/test/extend-pad-border.svg.xfail.png Binary files differnew file mode 100644 index 00000000..0fde36d9 --- /dev/null +++ b/test/extend-pad-border.svg.xfail.png diff --git a/test/extend-pad-similar.svg.xfail.png b/test/extend-pad-similar.svg.xfail.png Binary files differnew file mode 100644 index 00000000..a2cf3530 --- /dev/null +++ b/test/extend-pad-similar.svg.xfail.png diff --git a/test/extend-pad.svg.xfail.png b/test/extend-pad.svg.xfail.png Binary files differnew file mode 100644 index 00000000..a2cf3530 --- /dev/null +++ b/test/extend-pad.svg.xfail.png diff --git a/test/fallback-resolution.c b/test/fallback-resolution.c index f5fcf07b..1ffacb1b 100644 --- a/test/fallback-resolution.c +++ b/test/fallback-resolution.c @@ -190,12 +190,14 @@ check_result (cairo_test_context_t *ctx, } format = cairo_boilerplate_content_name (target->content); - ref_name = cairo_test_reference_image_filename (ctx, - base_name, - test_name, - target->name, - target->basename, - format); + ref_name = cairo_test_reference_filename (ctx, + base_name, + test_name, + target->name, + target->basename, + format, + CAIRO_TEST_REF_SUFFIX, + CAIRO_TEST_PNG_EXTENSION); if (ref_name == NULL) { cairo_test_log (ctx, "Error: Cannot find reference image for %s\n", base_name); diff --git a/test/fill-alpha-pattern.pdf.argb32.ref.png b/test/fill-alpha-pattern.pdf.argb32.ref.png Binary files differdeleted file mode 100644 index d7a7ebe5..00000000 --- a/test/fill-alpha-pattern.pdf.argb32.ref.png +++ /dev/null diff --git a/test/fill-alpha-pattern.pdf.rgb24.ref.png b/test/fill-alpha-pattern.pdf.rgb24.ref.png Binary files differdeleted file mode 100644 index ef9049e2..00000000 --- a/test/fill-alpha-pattern.pdf.rgb24.ref.png +++ /dev/null diff --git a/test/fill-alpha-pattern.test-fallback.argb32.ref.png b/test/fill-alpha-pattern.test-fallback.argb32.ref.png Binary files differdeleted file mode 100644 index 4dafb835..00000000 --- a/test/fill-alpha-pattern.test-fallback.argb32.ref.png +++ /dev/null diff --git a/test/fill-alpha-pattern.test-fallback.rgb24.ref.png b/test/fill-alpha-pattern.test-fallback.rgb24.ref.png Binary files differdeleted file mode 100644 index 4dafb835..00000000 --- a/test/fill-alpha-pattern.test-fallback.rgb24.ref.png +++ /dev/null diff --git a/test/fill-alpha.test-fallback.argb32.ref.png b/test/fill-alpha.test-fallback.argb32.ref.png Binary files differdeleted file mode 100644 index 85df9198..00000000 --- a/test/fill-alpha.test-fallback.argb32.ref.png +++ /dev/null diff --git a/test/fill-alpha.test-fallback.rgb24.ref.png b/test/fill-alpha.test-fallback.rgb24.ref.png Binary files differdeleted file mode 100644 index 85df9198..00000000 --- a/test/fill-alpha.test-fallback.rgb24.ref.png +++ /dev/null diff --git a/test/fill-and-stroke-alpha-add.c b/test/fill-and-stroke-alpha-add.c index b953b761..55cd4c6a 100644 --- a/test/fill-and-stroke-alpha-add.c +++ b/test/fill-and-stroke-alpha-add.c @@ -101,7 +101,7 @@ draw (cairo_t *cr, int width, int height) CAIRO_TEST (fill_and_stroke_alpha_add, "Use a group to fill/stroke a path (each with different alpha) using DEST_OUT and ADD to combine", - "XFAIL=svg12 fill-and-stroke, fill, stroke", /* keywords */ + "fill-and-stroke, fill, stroke", /* keywords */ NULL, /* requirements */ 2 * SIZE + 4 * PAD, SIZE + 2 * PAD, NULL, draw) diff --git a/test/fill-and-stroke-alpha-add.svg12.xfail.png b/test/fill-and-stroke-alpha-add.svg12.xfail.png Binary files differnew file mode 100644 index 00000000..32962f7a --- /dev/null +++ b/test/fill-and-stroke-alpha-add.svg12.xfail.png diff --git a/test/fill-degenerate-sort-order.c b/test/fill-degenerate-sort-order.c index 7dc409d5..d9348104 100644 --- a/test/fill-degenerate-sort-order.c +++ b/test/fill-degenerate-sort-order.c @@ -71,7 +71,7 @@ draw (cairo_t *cr, int width, int height) CAIRO_TEST (fill_degenerate_sort_order, "Tests the tessellator's event comparator with degenerate input", - "XFAIL=ps degenerate, fill", /* keywords */ + "degenerate, fill", /* keywords */ NULL, /* requirements */ 190, 120, NULL, draw) diff --git a/test/fill-degenerate-sort-order.ps.argb32.xfail.png b/test/fill-degenerate-sort-order.ps.argb32.xfail.png Binary files differnew file mode 100644 index 00000000..2d6af6ff --- /dev/null +++ b/test/fill-degenerate-sort-order.ps.argb32.xfail.png diff --git a/test/fill-degenerate-sort-order.ps.rgb24.xfail.png b/test/fill-degenerate-sort-order.ps.rgb24.xfail.png Binary files differnew file mode 100644 index 00000000..963fe0be --- /dev/null +++ b/test/fill-degenerate-sort-order.ps.rgb24.xfail.png diff --git a/test/fill-degenerate-sort-order.test-fallback.argb32.ref.png b/test/fill-degenerate-sort-order.test-fallback.argb32.ref.png Binary files differdeleted file mode 100644 index 8cf567dd..00000000 --- a/test/fill-degenerate-sort-order.test-fallback.argb32.ref.png +++ /dev/null diff --git a/test/fill-degenerate-sort-order.test-fallback.rgb24.ref.png b/test/fill-degenerate-sort-order.test-fallback.rgb24.ref.png Binary files differdeleted file mode 100644 index da5aa50a..00000000 --- a/test/fill-degenerate-sort-order.test-fallback.rgb24.ref.png +++ /dev/null diff --git a/test/fill-image.xlib.ref.png b/test/fill-image.xlib.ref.png Binary files differnew file mode 100644 index 00000000..b07fc14a --- /dev/null +++ b/test/fill-image.xlib.ref.png diff --git a/test/fill-rule.test-fallback.argb32.ref.png b/test/fill-rule.test-fallback.argb32.ref.png Binary files differdeleted file mode 100644 index e2e10d4a..00000000 --- a/test/fill-rule.test-fallback.argb32.ref.png +++ /dev/null diff --git a/test/fill-rule.test-fallback.rgb24.ref.png b/test/fill-rule.test-fallback.rgb24.ref.png Binary files differdeleted file mode 100644 index 49fb39c7..00000000 --- a/test/fill-rule.test-fallback.rgb24.ref.png +++ /dev/null diff --git a/test/filter-bilinear-extents.pdf.ref.png b/test/filter-bilinear-extents.pdf.ref.png Binary files differdeleted file mode 100644 index 014b7152..00000000 --- a/test/filter-bilinear-extents.pdf.ref.png +++ /dev/null diff --git a/test/filter-bilinear-extents.pdf.xfail.png b/test/filter-bilinear-extents.pdf.xfail.png Binary files differnew file mode 100644 index 00000000..e6c4bb46 --- /dev/null +++ b/test/filter-bilinear-extents.pdf.xfail.png diff --git a/test/filter-nearest-offset.pdf.ref.png b/test/filter-nearest-offset.pdf.ref.png Binary files differdeleted file mode 100644 index e19eb4f3..00000000 --- a/test/filter-nearest-offset.pdf.ref.png +++ /dev/null diff --git a/test/filter-nearest-offset.pdf.xfail.png b/test/filter-nearest-offset.pdf.xfail.png Binary files differnew file mode 100644 index 00000000..4d436aa1 --- /dev/null +++ b/test/filter-nearest-offset.pdf.xfail.png diff --git a/test/filter-nearest-offset.svg.xfail.png b/test/filter-nearest-offset.svg.xfail.png Binary files differnew file mode 100644 index 00000000..a46dc76d --- /dev/null +++ b/test/filter-nearest-offset.svg.xfail.png diff --git a/test/filter-nearest-offset.svg11.ref.png b/test/filter-nearest-offset.svg11.ref.png Binary files differdeleted file mode 100644 index df468f4b..00000000 --- a/test/filter-nearest-offset.svg11.ref.png +++ /dev/null diff --git a/test/filter-nearest-offset.svg12.ref.png b/test/filter-nearest-offset.svg12.ref.png Binary files differdeleted file mode 100644 index df468f4b..00000000 --- a/test/filter-nearest-offset.svg12.ref.png +++ /dev/null diff --git a/test/filter-nearest-transformed.pdf.ref.png b/test/filter-nearest-transformed.pdf.ref.png Binary files differdeleted file mode 100644 index 12d714ee..00000000 --- a/test/filter-nearest-transformed.pdf.ref.png +++ /dev/null diff --git a/test/filter-nearest-transformed.pdf.xfail.png b/test/filter-nearest-transformed.pdf.xfail.png Binary files differnew file mode 100644 index 00000000..5ad98a75 --- /dev/null +++ b/test/filter-nearest-transformed.pdf.xfail.png diff --git a/test/filter-nearest-transformed.svg.xfail.png b/test/filter-nearest-transformed.svg.xfail.png Binary files differnew file mode 100644 index 00000000..e6bbe28e --- /dev/null +++ b/test/filter-nearest-transformed.svg.xfail.png diff --git a/test/filter-nearest-transformed.svg11.ref.png b/test/filter-nearest-transformed.svg11.ref.png Binary files differdeleted file mode 100644 index 4f18c0d6..00000000 --- a/test/filter-nearest-transformed.svg11.ref.png +++ /dev/null diff --git a/test/filter-nearest-transformed.svg12.ref.png b/test/filter-nearest-transformed.svg12.ref.png Binary files differdeleted file mode 100644 index 4f18c0d6..00000000 --- a/test/filter-nearest-transformed.svg12.ref.png +++ /dev/null diff --git a/test/finer-grained-fallbacks.c b/test/finer-grained-fallbacks.c index cd81e968..fa16f72f 100644 --- a/test/finer-grained-fallbacks.c +++ b/test/finer-grained-fallbacks.c @@ -174,7 +174,7 @@ draw (cairo_t *cr, int width, int height) CAIRO_TEST (finer_grained_fallbacks, "Test that multiple PS/PDF fallback images in various locations are correct", - "XFAIL=svg12 fallbacks", /* keywords */ + "fallbacks", /* keywords */ NULL, /* requirements */ WIDTH, HEIGHT, NULL, draw) diff --git a/test/finer-grained-fallbacks.svg12.argb32.ref.png b/test/finer-grained-fallbacks.svg12.argb32.ref.png Binary files differnew file mode 100644 index 00000000..5aaf86b2 --- /dev/null +++ b/test/finer-grained-fallbacks.svg12.argb32.ref.png diff --git a/test/finer-grained-fallbacks.svg12.rgb24.ref.png b/test/finer-grained-fallbacks.svg12.rgb24.ref.png Binary files differnew file mode 100644 index 00000000..ad55366d --- /dev/null +++ b/test/finer-grained-fallbacks.svg12.rgb24.ref.png diff --git a/test/finer-grained-fallbacks.test-fallback.argb32.ref.png b/test/finer-grained-fallbacks.test-fallback.argb32.ref.png Binary files differdeleted file mode 100644 index c7eb113d..00000000 --- a/test/finer-grained-fallbacks.test-fallback.argb32.ref.png +++ /dev/null diff --git a/test/finer-grained-fallbacks.test-fallback.rgb24.ref.png b/test/finer-grained-fallbacks.test-fallback.rgb24.ref.png Binary files differdeleted file mode 100644 index ff75c6dd..00000000 --- a/test/finer-grained-fallbacks.test-fallback.rgb24.ref.png +++ /dev/null diff --git a/test/font-matrix-translation.svg.ref.png b/test/font-matrix-translation.svg.ref.png Binary files differnew file mode 100644 index 00000000..e35f9bea --- /dev/null +++ b/test/font-matrix-translation.svg.ref.png diff --git a/test/font-matrix-translation.svg11.argb32.ref.png b/test/font-matrix-translation.svg11.argb32.ref.png Binary files differdeleted file mode 100644 index 441f6e3b..00000000 --- a/test/font-matrix-translation.svg11.argb32.ref.png +++ /dev/null diff --git a/test/font-matrix-translation.svg11.ref.png b/test/font-matrix-translation.svg11.ref.png Binary files differdeleted file mode 100644 index 92ad17b2..00000000 --- a/test/font-matrix-translation.svg11.ref.png +++ /dev/null diff --git a/test/font-matrix-translation.svg11.rgb24.ref.png b/test/font-matrix-translation.svg11.rgb24.ref.png Binary files differdeleted file mode 100644 index 441f6e3b..00000000 --- a/test/font-matrix-translation.svg11.rgb24.ref.png +++ /dev/null diff --git a/test/font-matrix-translation.svg12.argb32.ref.png b/test/font-matrix-translation.svg12.argb32.ref.png Binary files differdeleted file mode 100644 index 441f6e3b..00000000 --- a/test/font-matrix-translation.svg12.argb32.ref.png +++ /dev/null diff --git a/test/font-matrix-translation.svg12.ref.png b/test/font-matrix-translation.svg12.ref.png Binary files differdeleted file mode 100644 index 92ad17b2..00000000 --- a/test/font-matrix-translation.svg12.ref.png +++ /dev/null diff --git a/test/font-matrix-translation.svg12.rgb24.ref.png b/test/font-matrix-translation.svg12.rgb24.ref.png Binary files differdeleted file mode 100644 index 441f6e3b..00000000 --- a/test/font-matrix-translation.svg12.rgb24.ref.png +++ /dev/null diff --git a/test/ft-show-glyphs-positioning.svg.ref.png b/test/ft-show-glyphs-positioning.svg.ref.png Binary files differnew file mode 100644 index 00000000..04fe674d --- /dev/null +++ b/test/ft-show-glyphs-positioning.svg.ref.png diff --git a/test/ft-show-glyphs-positioning.svg11.ref.png b/test/ft-show-glyphs-positioning.svg11.ref.png Binary files differdeleted file mode 100644 index 43b83cbe..00000000 --- a/test/ft-show-glyphs-positioning.svg11.ref.png +++ /dev/null diff --git a/test/ft-show-glyphs-positioning.svg12.ref.png b/test/ft-show-glyphs-positioning.svg12.ref.png Binary files differdeleted file mode 100644 index 43b83cbe..00000000 --- a/test/ft-show-glyphs-positioning.svg12.ref.png +++ /dev/null diff --git a/test/ft-show-glyphs-table.svg.ref.png b/test/ft-show-glyphs-table.svg.ref.png Binary files differnew file mode 100644 index 00000000..e0654b7a --- /dev/null +++ b/test/ft-show-glyphs-table.svg.ref.png diff --git a/test/ft-show-glyphs-table.svg11.argb32.ref.png b/test/ft-show-glyphs-table.svg11.argb32.ref.png Binary files differdeleted file mode 100644 index 0c6e1c0b..00000000 --- a/test/ft-show-glyphs-table.svg11.argb32.ref.png +++ /dev/null diff --git a/test/ft-show-glyphs-table.svg11.rgb24.ref.png b/test/ft-show-glyphs-table.svg11.rgb24.ref.png Binary files differdeleted file mode 100644 index 0c6e1c0b..00000000 --- a/test/ft-show-glyphs-table.svg11.rgb24.ref.png +++ /dev/null diff --git a/test/ft-show-glyphs-table.svg12.argb32.ref.png b/test/ft-show-glyphs-table.svg12.argb32.ref.png Binary files differdeleted file mode 100644 index 0c6e1c0b..00000000 --- a/test/ft-show-glyphs-table.svg12.argb32.ref.png +++ /dev/null diff --git a/test/ft-show-glyphs-table.svg12.rgb24.ref.png b/test/ft-show-glyphs-table.svg12.rgb24.ref.png Binary files differdeleted file mode 100644 index 0c6e1c0b..00000000 --- a/test/ft-show-glyphs-table.svg12.rgb24.ref.png +++ /dev/null diff --git a/test/ft-text-vertical-layout-type1.svg.ref.png b/test/ft-text-vertical-layout-type1.svg.ref.png Binary files differnew file mode 100644 index 00000000..0be400c1 --- /dev/null +++ b/test/ft-text-vertical-layout-type1.svg.ref.png diff --git a/test/ft-text-vertical-layout-type1.svg11.argb32.ref.png b/test/ft-text-vertical-layout-type1.svg11.argb32.ref.png Binary files differdeleted file mode 100644 index 2de3f5be..00000000 --- a/test/ft-text-vertical-layout-type1.svg11.argb32.ref.png +++ /dev/null diff --git a/test/ft-text-vertical-layout-type1.svg11.ref.png b/test/ft-text-vertical-layout-type1.svg11.ref.png Binary files differdeleted file mode 100644 index 4ad4268b..00000000 --- a/test/ft-text-vertical-layout-type1.svg11.ref.png +++ /dev/null diff --git a/test/ft-text-vertical-layout-type1.svg11.rgb24.ref.png b/test/ft-text-vertical-layout-type1.svg11.rgb24.ref.png Binary files differdeleted file mode 100644 index 2de3f5be..00000000 --- a/test/ft-text-vertical-layout-type1.svg11.rgb24.ref.png +++ /dev/null diff --git a/test/ft-text-vertical-layout-type1.svg12.argb32.ref.png b/test/ft-text-vertical-layout-type1.svg12.argb32.ref.png Binary files differdeleted file mode 100644 index 2de3f5be..00000000 --- a/test/ft-text-vertical-layout-type1.svg12.argb32.ref.png +++ /dev/null diff --git a/test/ft-text-vertical-layout-type1.svg12.ref.png b/test/ft-text-vertical-layout-type1.svg12.ref.png Binary files differdeleted file mode 100644 index 4ad4268b..00000000 --- a/test/ft-text-vertical-layout-type1.svg12.ref.png +++ /dev/null diff --git a/test/ft-text-vertical-layout-type1.svg12.rgb24.ref.png b/test/ft-text-vertical-layout-type1.svg12.rgb24.ref.png Binary files differdeleted file mode 100644 index 2de3f5be..00000000 --- a/test/ft-text-vertical-layout-type1.svg12.rgb24.ref.png +++ /dev/null diff --git a/test/ft-text-vertical-layout-type1.test-fallback.argb32.ref.png b/test/ft-text-vertical-layout-type1.test-fallback.argb32.ref.png Binary files differdeleted file mode 100644 index 9eba6bb0..00000000 --- a/test/ft-text-vertical-layout-type1.test-fallback.argb32.ref.png +++ /dev/null diff --git a/test/ft-text-vertical-layout-type1.test-fallback.rgb24.ref.png b/test/ft-text-vertical-layout-type1.test-fallback.rgb24.ref.png Binary files differdeleted file mode 100644 index 9eba6bb0..00000000 --- a/test/ft-text-vertical-layout-type1.test-fallback.rgb24.ref.png +++ /dev/null diff --git a/test/ft-text-vertical-layout-type3.svg.ref.png b/test/ft-text-vertical-layout-type3.svg.ref.png Binary files differnew file mode 100644 index 00000000..cddb955a --- /dev/null +++ b/test/ft-text-vertical-layout-type3.svg.ref.png diff --git a/test/ft-text-vertical-layout-type3.svg11.argb32.ref.png b/test/ft-text-vertical-layout-type3.svg11.argb32.ref.png Binary files differdeleted file mode 100644 index cfe92681..00000000 --- a/test/ft-text-vertical-layout-type3.svg11.argb32.ref.png +++ /dev/null diff --git a/test/ft-text-vertical-layout-type3.svg11.ref.png b/test/ft-text-vertical-layout-type3.svg11.ref.png Binary files differdeleted file mode 100644 index 7aa322db..00000000 --- a/test/ft-text-vertical-layout-type3.svg11.ref.png +++ /dev/null diff --git a/test/ft-text-vertical-layout-type3.svg11.rgb24.ref.png b/test/ft-text-vertical-layout-type3.svg11.rgb24.ref.png Binary files differdeleted file mode 100644 index cfe92681..00000000 --- a/test/ft-text-vertical-layout-type3.svg11.rgb24.ref.png +++ /dev/null diff --git a/test/ft-text-vertical-layout-type3.svg12.argb32.ref.png b/test/ft-text-vertical-layout-type3.svg12.argb32.ref.png Binary files differdeleted file mode 100644 index cfe92681..00000000 --- a/test/ft-text-vertical-layout-type3.svg12.argb32.ref.png +++ /dev/null diff --git a/test/ft-text-vertical-layout-type3.svg12.ref.png b/test/ft-text-vertical-layout-type3.svg12.ref.png Binary files differdeleted file mode 100644 index 7aa322db..00000000 --- a/test/ft-text-vertical-layout-type3.svg12.ref.png +++ /dev/null diff --git a/test/ft-text-vertical-layout-type3.svg12.rgb24.ref.png b/test/ft-text-vertical-layout-type3.svg12.rgb24.ref.png Binary files differdeleted file mode 100644 index cfe92681..00000000 --- a/test/ft-text-vertical-layout-type3.svg12.rgb24.ref.png +++ /dev/null diff --git a/test/ft-text-vertical-layout-type3.test-fallback.argb32.ref.png b/test/ft-text-vertical-layout-type3.test-fallback.argb32.ref.png Binary files differdeleted file mode 100644 index e57c0831..00000000 --- a/test/ft-text-vertical-layout-type3.test-fallback.argb32.ref.png +++ /dev/null diff --git a/test/ft-text-vertical-layout-type3.test-fallback.rgb24.ref.png b/test/ft-text-vertical-layout-type3.test-fallback.rgb24.ref.png Binary files differdeleted file mode 100644 index e57c0831..00000000 --- a/test/ft-text-vertical-layout-type3.test-fallback.rgb24.ref.png +++ /dev/null diff --git a/test/gradient-alpha.pdf.argb32.ref.png b/test/gradient-alpha.pdf.argb32.ref.png Binary files differdeleted file mode 100644 index bf9c69ab..00000000 --- a/test/gradient-alpha.pdf.argb32.ref.png +++ /dev/null diff --git a/test/gradient-alpha.pdf.rgb24.ref.png b/test/gradient-alpha.pdf.rgb24.ref.png Binary files differdeleted file mode 100644 index 79852738..00000000 --- a/test/gradient-alpha.pdf.rgb24.ref.png +++ /dev/null diff --git a/test/gradient-constant-alpha.pdf.argb32.ref.png b/test/gradient-constant-alpha.pdf.argb32.ref.png Binary files differdeleted file mode 100644 index 056fcb2d..00000000 --- a/test/gradient-constant-alpha.pdf.argb32.ref.png +++ /dev/null diff --git a/test/gradient-constant-alpha.pdf.rgb24.ref.png b/test/gradient-constant-alpha.pdf.rgb24.ref.png Binary files differdeleted file mode 100644 index 60c02630..00000000 --- a/test/gradient-constant-alpha.pdf.rgb24.ref.png +++ /dev/null diff --git a/test/group-unaligned.pdf.new.png b/test/group-unaligned.pdf.new.png Binary files differnew file mode 100644 index 00000000..beb0ae2d --- /dev/null +++ b/test/group-unaligned.pdf.new.png diff --git a/test/group-unaligned.pdf.ref.png b/test/group-unaligned.pdf.ref.png Binary files differdeleted file mode 100644 index 0eb39c0e..00000000 --- a/test/group-unaligned.pdf.ref.png +++ /dev/null diff --git a/test/group-unaligned.svg.argb32.ref.png b/test/group-unaligned.svg.argb32.ref.png Binary files differdeleted file mode 100644 index 91535f97..00000000 --- a/test/group-unaligned.svg.argb32.ref.png +++ /dev/null diff --git a/test/group-unaligned.svg.argb32.xfail.png b/test/group-unaligned.svg.argb32.xfail.png Binary files differnew file mode 100644 index 00000000..38550376 --- /dev/null +++ b/test/group-unaligned.svg.argb32.xfail.png diff --git a/test/group-unaligned.svg.rgb24.ref.png b/test/group-unaligned.svg.rgb24.ref.png Binary files differdeleted file mode 100644 index 42558a6e..00000000 --- a/test/group-unaligned.svg.rgb24.ref.png +++ /dev/null diff --git a/test/group-unaligned.svg.rgb24.xfail.png b/test/group-unaligned.svg.rgb24.xfail.png Binary files differnew file mode 100644 index 00000000..c0f18619 --- /dev/null +++ b/test/group-unaligned.svg.rgb24.xfail.png diff --git a/test/huge-linear.c b/test/huge-linear.c index 304cac42..e57d2997 100644 --- a/test/huge-linear.c +++ b/test/huge-linear.c @@ -61,7 +61,7 @@ draw (cairo_t *cr, int width, int height) CAIRO_TEST (huge_linear, "Test huge linear patterns", - "XFAIL=pdf gradient, linear", /* keywords */ + "gradient, linear", /* keywords */ NULL, /* requirements */ 600, 350, NULL, draw) diff --git a/test/huge-linear.pdf.ref.png b/test/huge-linear.pdf.ref.png Binary files differnew file mode 100644 index 00000000..cf1f8fcb --- /dev/null +++ b/test/huge-linear.pdf.ref.png diff --git a/test/huge-radial.c b/test/huge-radial.c index 0e5aca16..73562445 100644 --- a/test/huge-radial.c +++ b/test/huge-radial.c @@ -63,7 +63,7 @@ draw (cairo_t *cr, int width, int height) CAIRO_TEST (huge_radial, "Test huge radial patterns", - "XFAIL=pdf gradient, radial", /* keywords */ + "gradient, radial", /* keywords */ NULL, /* requirements */ 600, 350, NULL, draw) diff --git a/test/huge-radial.pdf.argb32.ref.png b/test/huge-radial.pdf.argb32.ref.png Binary files differnew file mode 100644 index 00000000..aa710ec2 --- /dev/null +++ b/test/huge-radial.pdf.argb32.ref.png diff --git a/test/huge-radial.pdf.rgb24.ref.png b/test/huge-radial.pdf.rgb24.ref.png Binary files differnew file mode 100644 index 00000000..8cebd807 --- /dev/null +++ b/test/huge-radial.pdf.rgb24.ref.png diff --git a/test/large-source-roi.c b/test/large-source-roi.c index 226d97f6..8709e4b4 100644 --- a/test/large-source-roi.c +++ b/test/large-source-roi.c @@ -70,7 +70,7 @@ draw (cairo_t *cr, int width, int height) CAIRO_TEST (large_source_roi, "Uses a all of a large source image.", - "XFAIL stress, source", /* keywords */ + "stress, source", /* keywords */ NULL, /* requirements */ 20, 20, NULL, draw) diff --git a/test/large-source-roi.ref.png b/test/large-source-roi.ref.png Binary files differdeleted file mode 100644 index 7192a6e9..00000000 --- a/test/large-source-roi.ref.png +++ /dev/null diff --git a/test/linear-gradient.pdf.ref.png b/test/linear-gradient.pdf.ref.png Binary files differdeleted file mode 100644 index b221a95f..00000000 --- a/test/linear-gradient.pdf.ref.png +++ /dev/null diff --git a/test/linear-gradient.svg11.argb32.ref.png b/test/linear-gradient.svg11.argb32.ref.png Binary files differdeleted file mode 100644 index ea0e7238..00000000 --- a/test/linear-gradient.svg11.argb32.ref.png +++ /dev/null diff --git a/test/linear-gradient.svg11.ref.png b/test/linear-gradient.svg11.ref.png Binary files differdeleted file mode 100644 index 4ed4bfa8..00000000 --- a/test/linear-gradient.svg11.ref.png +++ /dev/null diff --git a/test/linear-gradient.svg11.rgb24.ref.png b/test/linear-gradient.svg11.rgb24.ref.png Binary files differdeleted file mode 100644 index ea0e7238..00000000 --- a/test/linear-gradient.svg11.rgb24.ref.png +++ /dev/null diff --git a/test/linear-gradient.svg12.argb32.ref.png b/test/linear-gradient.svg12.argb32.ref.png Binary files differdeleted file mode 100644 index ea0e7238..00000000 --- a/test/linear-gradient.svg12.argb32.ref.png +++ /dev/null diff --git a/test/linear-gradient.svg12.ref.png b/test/linear-gradient.svg12.ref.png Binary files differdeleted file mode 100644 index 4ed4bfa8..00000000 --- a/test/linear-gradient.svg12.ref.png +++ /dev/null diff --git a/test/linear-gradient.svg12.rgb24.ref.png b/test/linear-gradient.svg12.rgb24.ref.png Binary files differdeleted file mode 100644 index ea0e7238..00000000 --- a/test/linear-gradient.svg12.rgb24.ref.png +++ /dev/null diff --git a/test/linear-gradient.test-fallback.argb32.ref.png b/test/linear-gradient.test-fallback.argb32.ref.png Binary files differdeleted file mode 100644 index 8202880e..00000000 --- a/test/linear-gradient.test-fallback.argb32.ref.png +++ /dev/null diff --git a/test/linear-gradient.test-fallback.rgb24.ref.png b/test/linear-gradient.test-fallback.rgb24.ref.png Binary files differdeleted file mode 100644 index 8202880e..00000000 --- a/test/linear-gradient.test-fallback.rgb24.ref.png +++ /dev/null diff --git a/test/long-lines.c b/test/long-lines.c index c3e6dd69..79fc98fb 100644 --- a/test/long-lines.c +++ b/test/long-lines.c @@ -77,7 +77,7 @@ draw (cairo_t *cr, int width, int height) CAIRO_TEST (long_lines, "Test long lines" "\nLong lines are not drawn due to the limitations of the internal 16.16 fixed-point coordinates", - "XFAIL stroke, stress", /* keywords */ + "stroke, stress", /* keywords */ NULL, /* requirements */ SIZE * (LINE_NBR + 1), SIZE * (LINE_NBR + 1), NULL, draw) diff --git a/test/long-lines.ref.png b/test/long-lines.ref.png Binary files differdeleted file mode 100644 index 6119204c..00000000 --- a/test/long-lines.ref.png +++ /dev/null diff --git a/test/make-html.pl b/test/make-html.pl index e9c84a16..9c0626dd 100755 --- a/test/make-html.pl +++ b/test/make-html.pl @@ -81,7 +81,7 @@ foreach (<@files>) { $tests->{$1}->{$2}->{$3}->{$4}->{$5}->{'ref'} = $ref_path; $tests->{$1}->{$2}->{$3}->{$4}->{$5}->{'result'} = $6; - $teststats->{$2} = {"PASS" => 0, "FAIL" => 0, "XFAIL" => 0, "UNTESTED" => 0, "CRASHED" =>0} + $teststats->{$2} = {"PASS" => 0, "FAIL" => 0, "NEW" => 0, "XFAIL" => 0, "UNTESTED" => 0, "CRASHED" =>0} unless $teststats->{$2}; ($teststats->{$2}->{$6})++; @@ -160,6 +160,7 @@ printl '<title>Cairo Test Results</title>'; printl '<style type="text/css">'; printl 'a img { border: solid 1px #FFF; }'; printl '.PASS { background-color: #0B0; min-width: 1em; }'; +printl '.NEW { background-color: #B70; }'; printl '.FAIL { background-color: #B00; }'; printl '.XFAIL { background-color: #BB0; }'; printl '.UNTESTED { background-color: #555; }'; @@ -189,7 +190,11 @@ print '<tr><td></td>'; foreach my $target (@targets) { print '<td>'; print '<span class="PASSstr">', $teststats->{$target}->{"PASS"}, '</span>/'; - print '<span class="FAILstr">', $teststats->{$target}->{"FAIL"} + $teststats->{$target}->{"CRASHED"}, '</span>/'; + print '<span class="FAILstr">', + $teststats->{$target}->{"FAIL"} + + $teststats->{$target}->{"NEW"} + + $teststats->{$target}->{"CRASHED"}, + '</span>/'; print '<span class="XFAILstr">', $teststats->{$target}->{"XFAIL"}, '</span>/'; print '<span class="UNTESTEDstr">', $teststats->{$target}->{"UNTESTED"}, '</span>'; print '</td>'; @@ -245,6 +250,10 @@ foreach my $test (sort(keys %$tests)) { $testline .= " "; $testline .= img_for($testfiles{'ref'},1); } + } elsif ($testres->{'result'} eq "NEW") { + if ($config_show_fail || $config_show_all) { + $testline .= img_for($testfiles{'new'},1); + } } elsif ($testres->{'result'} eq "CRASHED") { $testline .= "!!!CRASHED!!!"; } elsif ($testres->{'result'} eq "XFAIL") { diff --git a/test/mask-alpha.svg.rgb24.xfail.png b/test/mask-alpha.svg.rgb24.xfail.png Binary files differnew file mode 100644 index 00000000..15ebf755 --- /dev/null +++ b/test/mask-alpha.svg.rgb24.xfail.png diff --git a/test/mask-alpha.svg11.argb32.ref.png b/test/mask-alpha.svg11.argb32.ref.png Binary files differdeleted file mode 100644 index fa9e82d1..00000000 --- a/test/mask-alpha.svg11.argb32.ref.png +++ /dev/null diff --git a/test/mask-alpha.svg11.rgb24.ref.png b/test/mask-alpha.svg11.rgb24.ref.png Binary files differdeleted file mode 100644 index 167eab48..00000000 --- a/test/mask-alpha.svg11.rgb24.ref.png +++ /dev/null diff --git a/test/mask-alpha.svg12.argb32.ref.png b/test/mask-alpha.svg12.argb32.ref.png Binary files differdeleted file mode 100644 index fa9e82d1..00000000 --- a/test/mask-alpha.svg12.argb32.ref.png +++ /dev/null diff --git a/test/mask-alpha.svg12.rgb24.ref.png b/test/mask-alpha.svg12.rgb24.ref.png Binary files differdeleted file mode 100644 index 167eab48..00000000 --- a/test/mask-alpha.svg12.rgb24.ref.png +++ /dev/null diff --git a/test/mask-alpha.test-fallback.argb32.ref.png b/test/mask-alpha.test-fallback.argb32.ref.png Binary files differdeleted file mode 100644 index a0b9017e..00000000 --- a/test/mask-alpha.test-fallback.argb32.ref.png +++ /dev/null diff --git a/test/mask-ctm.svg11.argb32.ref.png b/test/mask-ctm.svg11.argb32.ref.png Binary files differdeleted file mode 100644 index 049d5f0d..00000000 --- a/test/mask-ctm.svg11.argb32.ref.png +++ /dev/null diff --git a/test/mask-ctm.svg12.argb32.ref.png b/test/mask-ctm.svg12.argb32.ref.png Binary files differdeleted file mode 100644 index 049d5f0d..00000000 --- a/test/mask-ctm.svg12.argb32.ref.png +++ /dev/null diff --git a/test/mask-glyphs.c b/test/mask-glyphs.c index 045dcaf8..213722d0 100644 --- a/test/mask-glyphs.c +++ b/test/mask-glyphs.c @@ -169,7 +169,7 @@ draw (cairo_t *cr, int width, int height) CAIRO_TEST (mask_glyphs, "Creates a mask using a distorted array of overlapping glyphs", - "XFAIL=svg,pdf mask, glyphs", /* keywords */ + "mask, glyphs", /* keywords */ NULL, /* requirements */ WIDTH, HEIGHT, NULL, draw) diff --git a/test/mask-glyphs.pdf.ref.png b/test/mask-glyphs.pdf.ref.png Binary files differnew file mode 100644 index 00000000..673ef92d --- /dev/null +++ b/test/mask-glyphs.pdf.ref.png diff --git a/test/mask-glyphs.svg.ref.png b/test/mask-glyphs.svg.ref.png Binary files differnew file mode 100644 index 00000000..e99c3ccb --- /dev/null +++ b/test/mask-glyphs.svg.ref.png diff --git a/test/mask-surface-ctm.svg11.argb32.ref.png b/test/mask-surface-ctm.svg11.argb32.ref.png Binary files differdeleted file mode 100644 index 049d5f0d..00000000 --- a/test/mask-surface-ctm.svg11.argb32.ref.png +++ /dev/null diff --git a/test/mask-surface-ctm.svg12.argb32.ref.png b/test/mask-surface-ctm.svg12.argb32.ref.png Binary files differdeleted file mode 100644 index 049d5f0d..00000000 --- a/test/mask-surface-ctm.svg12.argb32.ref.png +++ /dev/null diff --git a/test/mask-transformed-similar.svg.ref.png b/test/mask-transformed-similar.svg.ref.png Binary files differnew file mode 100644 index 00000000..a5b9b00b --- /dev/null +++ b/test/mask-transformed-similar.svg.ref.png diff --git a/test/mask-transformed-similar.svg11.ref.png b/test/mask-transformed-similar.svg11.ref.png Binary files differdeleted file mode 100644 index b4344cd1..00000000 --- a/test/mask-transformed-similar.svg11.ref.png +++ /dev/null diff --git a/test/mask-transformed-similar.svg12.ref.png b/test/mask-transformed-similar.svg12.ref.png Binary files differdeleted file mode 100644 index b4344cd1..00000000 --- a/test/mask-transformed-similar.svg12.ref.png +++ /dev/null diff --git a/test/mask.pdf.argb32.ref.png b/test/mask.pdf.argb32.ref.png Binary files differdeleted file mode 100644 index 30feceaf..00000000 --- a/test/mask.pdf.argb32.ref.png +++ /dev/null diff --git a/test/mask.pdf.argb32.xfail.png b/test/mask.pdf.argb32.xfail.png Binary files differnew file mode 100644 index 00000000..227d312a --- /dev/null +++ b/test/mask.pdf.argb32.xfail.png diff --git a/test/mask.pdf.rgb24.ref.png b/test/mask.pdf.rgb24.ref.png Binary files differdeleted file mode 100644 index 95a49b79..00000000 --- a/test/mask.pdf.rgb24.ref.png +++ /dev/null diff --git a/test/mask.pdf.rgb24.xfail.png b/test/mask.pdf.rgb24.xfail.png Binary files differnew file mode 100644 index 00000000..bb8e99d0 --- /dev/null +++ b/test/mask.pdf.rgb24.xfail.png diff --git a/test/mask.svg.argb32.xfail.png b/test/mask.svg.argb32.xfail.png Binary files differnew file mode 100644 index 00000000..30c8db0c --- /dev/null +++ b/test/mask.svg.argb32.xfail.png diff --git a/test/mask.svg.rgb24.xfail.png b/test/mask.svg.rgb24.xfail.png Binary files differnew file mode 100644 index 00000000..0203b52c --- /dev/null +++ b/test/mask.svg.rgb24.xfail.png diff --git a/test/mask.svg11.argb32.ref.png b/test/mask.svg11.argb32.ref.png Binary files differdeleted file mode 100644 index 3ce4d53f..00000000 --- a/test/mask.svg11.argb32.ref.png +++ /dev/null diff --git a/test/mask.svg11.rgb24.ref.png b/test/mask.svg11.rgb24.ref.png Binary files differdeleted file mode 100644 index 94e38009..00000000 --- a/test/mask.svg11.rgb24.ref.png +++ /dev/null diff --git a/test/mask.svg12.argb32.ref.png b/test/mask.svg12.argb32.ref.png Binary files differdeleted file mode 100644 index 3ce4d53f..00000000 --- a/test/mask.svg12.argb32.ref.png +++ /dev/null diff --git a/test/mask.svg12.rgb24.ref.png b/test/mask.svg12.rgb24.ref.png Binary files differdeleted file mode 100644 index 94e38009..00000000 --- a/test/mask.svg12.rgb24.ref.png +++ /dev/null diff --git a/test/mask.test-fallback.argb32.ref.png b/test/mask.test-fallback.argb32.ref.png Binary files differdeleted file mode 100644 index bba0f9f3..00000000 --- a/test/mask.test-fallback.argb32.ref.png +++ /dev/null diff --git a/test/mask.test-fallback.rgb24.ref.png b/test/mask.test-fallback.rgb24.ref.png Binary files differdeleted file mode 100644 index 49a5b364..00000000 --- a/test/mask.test-fallback.rgb24.ref.png +++ /dev/null diff --git a/test/meta-surface-pattern.pdf.argb32.ref.png b/test/meta-surface-pattern.pdf.argb32.ref.png Binary files differnew file mode 100644 index 00000000..7e3435b6 --- /dev/null +++ b/test/meta-surface-pattern.pdf.argb32.ref.png diff --git a/test/meta-surface-pattern.pdf.ref.png b/test/meta-surface-pattern.pdf.ref.png Binary files differdeleted file mode 100644 index 2e561b2b..00000000 --- a/test/meta-surface-pattern.pdf.ref.png +++ /dev/null diff --git a/test/meta-surface-pattern.pdf.rgb24.ref.png b/test/meta-surface-pattern.pdf.rgb24.ref.png Binary files differnew file mode 100644 index 00000000..9fef6feb --- /dev/null +++ b/test/meta-surface-pattern.pdf.rgb24.ref.png diff --git a/test/meta-surface-pattern.svg.argb32.ref.png b/test/meta-surface-pattern.svg.argb32.ref.png Binary files differnew file mode 100644 index 00000000..86f6b612 --- /dev/null +++ b/test/meta-surface-pattern.svg.argb32.ref.png diff --git a/test/meta-surface-pattern.svg.rgb24.ref.png b/test/meta-surface-pattern.svg.rgb24.ref.png Binary files differnew file mode 100644 index 00000000..bbd89363 --- /dev/null +++ b/test/meta-surface-pattern.svg.rgb24.ref.png diff --git a/test/meta-surface-pattern.svg11.argb32.ref.png b/test/meta-surface-pattern.svg11.argb32.ref.png Binary files differdeleted file mode 100644 index 99695748..00000000 --- a/test/meta-surface-pattern.svg11.argb32.ref.png +++ /dev/null diff --git a/test/meta-surface-pattern.svg11.rgb24.ref.png b/test/meta-surface-pattern.svg11.rgb24.ref.png Binary files differdeleted file mode 100644 index dea9b9b5..00000000 --- a/test/meta-surface-pattern.svg11.rgb24.ref.png +++ /dev/null diff --git a/test/meta-surface-pattern.svg12.argb32.ref.png b/test/meta-surface-pattern.svg12.argb32.ref.png Binary files differdeleted file mode 100644 index 99695748..00000000 --- a/test/meta-surface-pattern.svg12.argb32.ref.png +++ /dev/null diff --git a/test/meta-surface-pattern.svg12.rgb24.ref.png b/test/meta-surface-pattern.svg12.rgb24.ref.png Binary files differdeleted file mode 100644 index dea9b9b5..00000000 --- a/test/meta-surface-pattern.svg12.rgb24.ref.png +++ /dev/null diff --git a/test/operator-alpha.c b/test/operator-alpha.c index 473ef20c..1ce4ecdf 100644 --- a/test/operator-alpha.c +++ b/test/operator-alpha.c @@ -59,7 +59,7 @@ draw (cairo_t *cr, int width, int height) CAIRO_TEST (operator_alpha, "Tests using set_operator() with an non-opaque source", - "XFAIL=svg12 operator, alpha", /* keywords */ + "operator, alpha", /* keywords */ NULL, /* requirements */ (SIZE+PAD) * N_OPERATORS + PAD, SIZE + 2*PAD, NULL, draw) diff --git a/test/operator-alpha.svg12.argb32.xfail.png b/test/operator-alpha.svg12.argb32.xfail.png Binary files differnew file mode 100644 index 00000000..e821d206 --- /dev/null +++ b/test/operator-alpha.svg12.argb32.xfail.png diff --git a/test/operator-alpha.svg12.rgb24.xfail.png b/test/operator-alpha.svg12.rgb24.xfail.png Binary files differnew file mode 100644 index 00000000..42d9ddee --- /dev/null +++ b/test/operator-alpha.svg12.rgb24.xfail.png diff --git a/test/operator-clear.c b/test/operator-clear.c index 7ce85356..b294dc02 100644 --- a/test/operator-clear.c +++ b/test/operator-clear.c @@ -191,7 +191,7 @@ draw (cairo_t *cr, int width, int height) CAIRO_TEST (operator_clear, "Test of CAIRO_OPERATOR_CLEAR", - "XFAIL=svg12 operator", /* keywords */ + "operator", /* keywords */ NULL, /* requirements */ IMAGE_WIDTH, IMAGE_HEIGHT, NULL, draw) diff --git a/test/operator-clear.pdf.argb32.ref.png b/test/operator-clear.pdf.argb32.ref.png Binary files differdeleted file mode 100644 index 258c61c9..00000000 --- a/test/operator-clear.pdf.argb32.ref.png +++ /dev/null diff --git a/test/operator-clear.pdf.rgb24.ref.png b/test/operator-clear.pdf.rgb24.ref.png Binary files differdeleted file mode 100644 index 55b44ad6..00000000 --- a/test/operator-clear.pdf.rgb24.ref.png +++ /dev/null diff --git a/test/operator-clear.svg12.argb32.xfail.png b/test/operator-clear.svg12.argb32.xfail.png Binary files differnew file mode 100644 index 00000000..7dfbd28f --- /dev/null +++ b/test/operator-clear.svg12.argb32.xfail.png diff --git a/test/operator-clear.svg12.rgb24.xfail.png b/test/operator-clear.svg12.rgb24.xfail.png Binary files differnew file mode 100644 index 00000000..c561bc36 --- /dev/null +++ b/test/operator-clear.svg12.rgb24.xfail.png diff --git a/test/operator-clear.xlib.ref.png b/test/operator-clear.xlib.ref.png Binary files differnew file mode 100644 index 00000000..d9a59b15 --- /dev/null +++ b/test/operator-clear.xlib.ref.png diff --git a/test/operator-source.c b/test/operator-source.c index ee115d0a..8d773076 100644 --- a/test/operator-source.c +++ b/test/operator-source.c @@ -228,7 +228,7 @@ draw (cairo_t *cr, int width, int height) CAIRO_TEST (operator_source, "Test of CAIRO_OPERATOR_SOURCE", - "XFAIL=svg12 operator", /* keywords */ + "operator", /* keywords */ NULL, /* requirements */ IMAGE_WIDTH, IMAGE_HEIGHT, NULL, draw) diff --git a/test/operator-source.pdf.argb32.ref.png b/test/operator-source.pdf.argb32.ref.png Binary files differdeleted file mode 100644 index f42d5af4..00000000 --- a/test/operator-source.pdf.argb32.ref.png +++ /dev/null diff --git a/test/operator-source.pdf.rgb24.ref.png b/test/operator-source.pdf.rgb24.ref.png Binary files differdeleted file mode 100644 index 8269bc10..00000000 --- a/test/operator-source.pdf.rgb24.ref.png +++ /dev/null diff --git a/test/operator-source.pdf.rgb24.xfail.png b/test/operator-source.pdf.rgb24.xfail.png Binary files differnew file mode 100644 index 00000000..9482ed81 --- /dev/null +++ b/test/operator-source.pdf.rgb24.xfail.png diff --git a/test/operator-source.svg12.argb32.xfail.png b/test/operator-source.svg12.argb32.xfail.png Binary files differnew file mode 100644 index 00000000..722e5ac4 --- /dev/null +++ b/test/operator-source.svg12.argb32.xfail.png diff --git a/test/operator-source.svg12.rgb24.xfail.png b/test/operator-source.svg12.rgb24.xfail.png Binary files differnew file mode 100644 index 00000000..5f445fc5 --- /dev/null +++ b/test/operator-source.svg12.rgb24.xfail.png diff --git a/test/operator-source.test-fallback.argb32.ref.png b/test/operator-source.test-fallback.argb32.ref.png Binary files differdeleted file mode 100644 index 8aac39d1..00000000 --- a/test/operator-source.test-fallback.argb32.ref.png +++ /dev/null diff --git a/test/operator-source.test-fallback.rgb24.ref.png b/test/operator-source.test-fallback.rgb24.ref.png Binary files differdeleted file mode 100644 index ad37a60b..00000000 --- a/test/operator-source.test-fallback.rgb24.ref.png +++ /dev/null diff --git a/test/operator.c b/test/operator.c index 39596e1a..666fcafd 100644 --- a/test/operator.c +++ b/test/operator.c @@ -59,7 +59,7 @@ draw (cairo_t *cr, int width, int height) CAIRO_TEST (operator, "Tests using set_operator()", - "XFAIL=svg12 operator", /* keywords */ + "operator", /* keywords */ NULL, /* requirements */ (SIZE+PAD) * N_OPERATORS + PAD, SIZE + 2*PAD, NULL, draw) diff --git a/test/operator.svg12.argb32.xfail.png b/test/operator.svg12.argb32.xfail.png Binary files differnew file mode 100644 index 00000000..3996221e --- /dev/null +++ b/test/operator.svg12.argb32.xfail.png diff --git a/test/operator.svg12.rgb24.xfail.png b/test/operator.svg12.rgb24.xfail.png Binary files differnew file mode 100644 index 00000000..198d4b1c --- /dev/null +++ b/test/operator.svg12.rgb24.xfail.png diff --git a/test/over-above-source.c b/test/over-above-source.c index 1a47aae1..7191c8da 100644 --- a/test/over-above-source.c +++ b/test/over-above-source.c @@ -66,7 +66,7 @@ draw (cairo_t *cr, int width, int height) CAIRO_TEST (over_above_source, "A simple test drawing a circle with OVER after a triangle drawn with SOURCE", - "XFAIL=svg12 operator", /* keywords */ + "operator", /* keywords */ NULL, /* requirements */ WIDTH, HEIGHT, NULL, draw) diff --git a/test/over-above-source.svg12.rgb24.xfail.png b/test/over-above-source.svg12.rgb24.xfail.png Binary files differnew file mode 100644 index 00000000..b2939c24 --- /dev/null +++ b/test/over-above-source.svg12.rgb24.xfail.png diff --git a/test/over-above-source.test-fallback.argb32.ref.png b/test/over-above-source.test-fallback.argb32.ref.png Binary files differdeleted file mode 100644 index 8a0183a6..00000000 --- a/test/over-above-source.test-fallback.argb32.ref.png +++ /dev/null diff --git a/test/over-above-source.test-fallback.rgb24.ref.png b/test/over-above-source.test-fallback.rgb24.ref.png Binary files differdeleted file mode 100644 index 85c19971..00000000 --- a/test/over-above-source.test-fallback.rgb24.ref.png +++ /dev/null diff --git a/test/over-around-source.c b/test/over-around-source.c index 7ac68a10..531eda80 100644 --- a/test/over-around-source.c +++ b/test/over-around-source.c @@ -77,7 +77,7 @@ draw (cairo_t *cr, int width, int height) CAIRO_TEST (over_around_source, "A simple test drawing a triangle with SOURCE between two circles drawn with OVER", - "XFAIL=svg12 operator", /* keywords */ + "operator", /* keywords */ NULL, /* requirements */ WIDTH, HEIGHT, NULL, draw) diff --git a/test/over-around-source.svg12.argb32.xfail.png b/test/over-around-source.svg12.argb32.xfail.png Binary files differnew file mode 100644 index 00000000..bb29538d --- /dev/null +++ b/test/over-around-source.svg12.argb32.xfail.png diff --git a/test/over-around-source.svg12.rgb24.xfail.png b/test/over-around-source.svg12.rgb24.xfail.png Binary files differnew file mode 100644 index 00000000..bb29538d --- /dev/null +++ b/test/over-around-source.svg12.rgb24.xfail.png diff --git a/test/over-around-source.test-fallback.argb32.ref.png b/test/over-around-source.test-fallback.argb32.ref.png Binary files differdeleted file mode 100644 index fca75056..00000000 --- a/test/over-around-source.test-fallback.argb32.ref.png +++ /dev/null diff --git a/test/over-below-source.c b/test/over-below-source.c index 36dc9cc8..7fe5bd88 100644 --- a/test/over-below-source.c +++ b/test/over-below-source.c @@ -66,7 +66,7 @@ draw (cairo_t *cr, int width, int height) CAIRO_TEST (over_below_source, "A simple test drawing a circle with OVER before a triangle drawn with SOURCE", - "XFAIL=svg12 operator", /* keywords */ + "operator", /* keywords */ NULL, /* requirements */ WIDTH, HEIGHT, NULL, draw) diff --git a/test/over-below-source.svg12.argb32.xfail.png b/test/over-below-source.svg12.argb32.xfail.png Binary files differnew file mode 100644 index 00000000..c80705b7 --- /dev/null +++ b/test/over-below-source.svg12.argb32.xfail.png diff --git a/test/over-below-source.svg12.rgb24.xfail.png b/test/over-below-source.svg12.rgb24.xfail.png Binary files differnew file mode 100644 index 00000000..c80705b7 --- /dev/null +++ b/test/over-below-source.svg12.rgb24.xfail.png diff --git a/test/over-between-source.c b/test/over-between-source.c index e690cddc..ffb65720 100644 --- a/test/over-between-source.c +++ b/test/over-between-source.c @@ -77,7 +77,7 @@ draw (cairo_t *cr, int width, int height) CAIRO_TEST (over_between_source, "A simple test drawing a circle with OVER between two triangles drawn with SOURCE", - "XFAIL=12 operator", /* keywords */ + "operator", /* keywords */ NULL, /* requirements */ WIDTH, HEIGHT, NULL, draw) diff --git a/test/over-between-source.svg12.argb32.xfail.png b/test/over-between-source.svg12.argb32.xfail.png Binary files differnew file mode 100644 index 00000000..c80705b7 --- /dev/null +++ b/test/over-between-source.svg12.argb32.xfail.png diff --git a/test/over-between-source.svg12.rgb24.xfail.png b/test/over-between-source.svg12.rgb24.xfail.png Binary files differnew file mode 100644 index 00000000..c80705b7 --- /dev/null +++ b/test/over-between-source.svg12.rgb24.xfail.png diff --git a/test/over-between-source.test-fallback.argb32.ref.png b/test/over-between-source.test-fallback.argb32.ref.png Binary files differdeleted file mode 100644 index a8fe66a3..00000000 --- a/test/over-between-source.test-fallback.argb32.ref.png +++ /dev/null diff --git a/test/paint-source-alpha.c b/test/paint-source-alpha.c index ecddc480..09e82b0a 100644 --- a/test/paint-source-alpha.c +++ b/test/paint-source-alpha.c @@ -56,7 +56,7 @@ draw (cairo_t *cr, int width, int height) CAIRO_TEST (paint_source_alpha, "Simple test of cairo_paint with a source surface with non-opaque alpha", - "XFAIL=svg12 paint, alpha", /* keywords */ + "paint, alpha", /* keywords */ NULL, /* requirements */ 32, 32, NULL, draw) diff --git a/test/paint-source-alpha.svg.ref.png b/test/paint-source-alpha.svg.ref.png Binary files differnew file mode 100644 index 00000000..763bb592 --- /dev/null +++ b/test/paint-source-alpha.svg.ref.png diff --git a/test/paint-source-alpha.svg11.ref.png b/test/paint-source-alpha.svg11.ref.png Binary files differdeleted file mode 100644 index 8736d44a..00000000 --- a/test/paint-source-alpha.svg11.ref.png +++ /dev/null diff --git a/test/paint-source-alpha.svg12.ref.png b/test/paint-source-alpha.svg12.ref.png Binary files differdeleted file mode 100644 index 3b3a990c..00000000 --- a/test/paint-source-alpha.svg12.ref.png +++ /dev/null diff --git a/test/paint-with-alpha.svg.ref.png b/test/paint-with-alpha.svg.ref.png Binary files differnew file mode 100644 index 00000000..c0df8eb7 --- /dev/null +++ b/test/paint-with-alpha.svg.ref.png diff --git a/test/paint-with-alpha.svg11.ref.png b/test/paint-with-alpha.svg11.ref.png Binary files differdeleted file mode 100644 index 97a2100e..00000000 --- a/test/paint-with-alpha.svg11.ref.png +++ /dev/null diff --git a/test/paint-with-alpha.svg12.ref.png b/test/paint-with-alpha.svg12.ref.png Binary files differdeleted file mode 100644 index 97a2100e..00000000 --- a/test/paint-with-alpha.svg12.ref.png +++ /dev/null diff --git a/test/path-precision.c b/test/path-precision.c index b5371021..3261fb43 100644 --- a/test/path-precision.c +++ b/test/path-precision.c @@ -27,6 +27,9 @@ #include "cairo-test.h" +/* we know that this is an inherent limitation in cairo */ +#define FAIL CAIRO_TEST_XFAILURE + /* Test the idempotency of path construction and copying */ static cairo_test_status_t @@ -80,7 +83,7 @@ draw (cairo_t *cr, int width, int height) "Paths differ in header type after %d operations.\n" "Expected path operation %d, found %d.\n", n, src->header.type, dst->header.type); - result = CAIRO_TEST_FAILURE; + result = FAIL; break; } @@ -91,7 +94,7 @@ draw (cairo_t *cr, int width, int height) n, src[1].point.x, src[1].point.y, dst[1].point.x, dst[1].point.y); - result = CAIRO_TEST_FAILURE; + result = FAIL; break; } } @@ -102,7 +105,7 @@ draw (cairo_t *cr, int width, int height) CAIRO_TEST (path_precision, "Check that the path append/copy is idempotent.", - "XFAIL api", /* keywords */ + "api", /* keywords */ NULL, /* requirements */ 0, 0, NULL, draw) diff --git a/test/push-group.svg11.argb32.ref.png b/test/push-group.svg11.argb32.ref.png Binary files differdeleted file mode 100644 index d6958798..00000000 --- a/test/push-group.svg11.argb32.ref.png +++ /dev/null diff --git a/test/push-group.svg12.argb32.ref.png b/test/push-group.svg12.argb32.ref.png Binary files differdeleted file mode 100644 index d6958798..00000000 --- a/test/push-group.svg12.argb32.ref.png +++ /dev/null diff --git a/test/push-group.test-fallback.argb32.ref.png b/test/push-group.test-fallback.argb32.ref.png Binary files differdeleted file mode 100644 index 7c5905a6..00000000 --- a/test/push-group.test-fallback.argb32.ref.png +++ /dev/null diff --git a/test/push-group.test-fallback.rgb24.ref.png b/test/push-group.test-fallback.rgb24.ref.png Binary files differdeleted file mode 100644 index 4586d5c5..00000000 --- a/test/push-group.test-fallback.rgb24.ref.png +++ /dev/null diff --git a/test/radial-gradient.svg11.ref.png b/test/radial-gradient.svg11.ref.png Binary files differdeleted file mode 100644 index 7e047019..00000000 --- a/test/radial-gradient.svg11.ref.png +++ /dev/null diff --git a/test/radial-gradient.svg12.ref.png b/test/radial-gradient.svg12.ref.png Binary files differdeleted file mode 100644 index 7e047019..00000000 --- a/test/radial-gradient.svg12.ref.png +++ /dev/null diff --git a/test/random-intersections.test-fallback.argb32.ref.png b/test/random-intersections.test-fallback.argb32.ref.png Binary files differdeleted file mode 100644 index a35364d8..00000000 --- a/test/random-intersections.test-fallback.argb32.ref.png +++ /dev/null diff --git a/test/random-intersections.test-fallback.rgb24.ref.png b/test/random-intersections.test-fallback.rgb24.ref.png Binary files differdeleted file mode 100644 index a35364d8..00000000 --- a/test/random-intersections.test-fallback.rgb24.ref.png +++ /dev/null diff --git a/test/rotate-image-surface-paint.pdf.ref.png b/test/rotate-image-surface-paint.pdf.ref.png Binary files differdeleted file mode 100644 index d5a9db66..00000000 --- a/test/rotate-image-surface-paint.pdf.ref.png +++ /dev/null diff --git a/test/rotate-image-surface-paint.pdf.xfail.png b/test/rotate-image-surface-paint.pdf.xfail.png Binary files differnew file mode 100644 index 00000000..043732de --- /dev/null +++ b/test/rotate-image-surface-paint.pdf.xfail.png diff --git a/test/rotate-image-surface-paint.svg.ref.png b/test/rotate-image-surface-paint.svg.ref.png Binary files differnew file mode 100644 index 00000000..e0db2452 --- /dev/null +++ b/test/rotate-image-surface-paint.svg.ref.png diff --git a/test/rotate-image-surface-paint.svg11.ref.png b/test/rotate-image-surface-paint.svg11.ref.png Binary files differdeleted file mode 100644 index 5a75aef2..00000000 --- a/test/rotate-image-surface-paint.svg11.ref.png +++ /dev/null diff --git a/test/rotate-image-surface-paint.svg12.ref.png b/test/rotate-image-surface-paint.svg12.ref.png Binary files differdeleted file mode 100644 index 5a75aef2..00000000 --- a/test/rotate-image-surface-paint.svg12.ref.png +++ /dev/null diff --git a/test/scale-offset-image.c b/test/scale-offset-image.c index 4c6894ab..0eef22ed 100644 --- a/test/scale-offset-image.c +++ b/test/scale-offset-image.c @@ -135,7 +135,7 @@ draw (cairo_t *cr, int width, int height) CAIRO_TEST (scale_offset_image, "Tests drawing surfaces under various scales and transforms", - "XFAIL=!ps,image,xlib-fallback,script surface scale-offset", /* keywords */ + "surface scale-offset", /* keywords */ NULL, /* requirements */ 320, 320, NULL, draw) diff --git a/test/scale-offset-image.pdf.argb32.ref.png b/test/scale-offset-image.pdf.argb32.ref.png Binary files differnew file mode 100644 index 00000000..4c7fe283 --- /dev/null +++ b/test/scale-offset-image.pdf.argb32.ref.png diff --git a/test/scale-offset-image.pdf.rgb24.ref.png b/test/scale-offset-image.pdf.rgb24.ref.png Binary files differnew file mode 100644 index 00000000..12507d9c --- /dev/null +++ b/test/scale-offset-image.pdf.rgb24.ref.png diff --git a/test/scale-offset-image.xfail.png b/test/scale-offset-image.xfail.png Binary files differnew file mode 100644 index 00000000..3e0191a1 --- /dev/null +++ b/test/scale-offset-image.xfail.png diff --git a/test/scale-offset-image.xlib.xfail.png b/test/scale-offset-image.xlib.xfail.png Binary files differnew file mode 100644 index 00000000..efb00917 --- /dev/null +++ b/test/scale-offset-image.xlib.xfail.png diff --git a/test/scale-offset-similar.c b/test/scale-offset-similar.c index 5b92f1ac..daf7ffe2 100644 --- a/test/scale-offset-similar.c +++ b/test/scale-offset-similar.c @@ -136,7 +136,7 @@ draw (cairo_t *cr, int width, int height) CAIRO_TEST (scale_offset_similar, "Tests drawing surfaces under various scales and transforms", - "XFAIL=!ps,image,xlib-fallback,script surface scale-offset", /* keywords */ + "surface scale-offset", /* keywords */ NULL, /* requirements */ 320, 320, NULL, draw) diff --git a/test/scale-offset-similar.pdf.argb32.ref.png b/test/scale-offset-similar.pdf.argb32.ref.png Binary files differnew file mode 100644 index 00000000..7d0406d5 --- /dev/null +++ b/test/scale-offset-similar.pdf.argb32.ref.png diff --git a/test/scale-offset-similar.pdf.rgb24.ref.png b/test/scale-offset-similar.pdf.rgb24.ref.png Binary files differnew file mode 100644 index 00000000..7d0406d5 --- /dev/null +++ b/test/scale-offset-similar.pdf.rgb24.ref.png diff --git a/test/scale-offset-similar.xfail.png b/test/scale-offset-similar.xfail.png Binary files differnew file mode 100644 index 00000000..3e0191a1 --- /dev/null +++ b/test/scale-offset-similar.xfail.png diff --git a/test/scale-offset-similar.xlib.xfail.png b/test/scale-offset-similar.xlib.xfail.png Binary files differnew file mode 100644 index 00000000..d58aebab --- /dev/null +++ b/test/scale-offset-similar.xlib.xfail.png diff --git a/test/scale-source-surface-paint.svg11.argb32.ref.png b/test/scale-source-surface-paint.svg.argb32.xfail.png Binary files differindex ed946d4d..ed946d4d 100644 --- a/test/scale-source-surface-paint.svg11.argb32.ref.png +++ b/test/scale-source-surface-paint.svg.argb32.xfail.png diff --git a/test/scale-source-surface-paint.svg.rgb24.xfail.png b/test/scale-source-surface-paint.svg.rgb24.xfail.png Binary files differnew file mode 100644 index 00000000..7d065d40 --- /dev/null +++ b/test/scale-source-surface-paint.svg.rgb24.xfail.png diff --git a/test/scale-source-surface-paint.svg11.rgb24.ref.png b/test/scale-source-surface-paint.svg11.rgb24.ref.png Binary files differdeleted file mode 100644 index d424dce0..00000000 --- a/test/scale-source-surface-paint.svg11.rgb24.ref.png +++ /dev/null diff --git a/test/scale-source-surface-paint.svg12.argb32.ref.png b/test/scale-source-surface-paint.svg12.argb32.ref.png Binary files differdeleted file mode 100644 index ed946d4d..00000000 --- a/test/scale-source-surface-paint.svg12.argb32.ref.png +++ /dev/null diff --git a/test/scale-source-surface-paint.svg12.rgb24.ref.png b/test/scale-source-surface-paint.svg12.rgb24.ref.png Binary files differdeleted file mode 100644 index d424dce0..00000000 --- a/test/scale-source-surface-paint.svg12.rgb24.ref.png +++ /dev/null diff --git a/test/self-copy-overlap.c b/test/self-copy-overlap.c index d9e6caa3..2f49ab08 100644 --- a/test/self-copy-overlap.c +++ b/test/self-copy-overlap.c @@ -43,7 +43,7 @@ draw (cairo_t *cr, int width, int height) CAIRO_TEST (self_copy_overlap, "Tests painting to itself using itself as the source" "\nBackends treat this case inconsistently---vector backends are creating snapshots.", - "XFAIL=!image,test-meta,test-paginated,pdf,ps,svg self-copy", /* keywords */ + "self-copy", /* keywords */ NULL, /* requirements */ 200, 200, NULL, draw) diff --git a/test/self-copy-overlap.ref.png b/test/self-copy-overlap.ref.png Binary files differdeleted file mode 100644 index a70e819e..00000000 --- a/test/self-copy-overlap.ref.png +++ /dev/null diff --git a/test/self-copy-overlap.rgb24.ref.png b/test/self-copy-overlap.rgb24.ref.png Binary files differdeleted file mode 100644 index ec730f6f..00000000 --- a/test/self-copy-overlap.rgb24.ref.png +++ /dev/null diff --git a/test/self-intersecting.argb32.xfail.png b/test/self-intersecting.argb32.xfail.png Binary files differnew file mode 100644 index 00000000..bf08d03a --- /dev/null +++ b/test/self-intersecting.argb32.xfail.png diff --git a/test/self-intersecting.c b/test/self-intersecting.c index 23a06c73..6719e93f 100644 --- a/test/self-intersecting.c +++ b/test/self-intersecting.c @@ -78,7 +78,7 @@ draw (cairo_t *cr, int width, int height) CAIRO_TEST (self_intersecting, "Test strokes of self-intersecting paths" "\nSelf-intersecting strokes are wrong due to incremental trapezoidization.", - "XFAIL stroke, trap", /* keywords */ + "stroke, trap", /* keywords */ NULL, /* requirements */ 10, 20, NULL, draw) diff --git a/test/self-intersecting.pdf.argb32.xfail.png b/test/self-intersecting.pdf.argb32.xfail.png Binary files differnew file mode 100644 index 00000000..f29b0a69 --- /dev/null +++ b/test/self-intersecting.pdf.argb32.xfail.png diff --git a/test/self-intersecting.pdf.rgb24.xfail.png b/test/self-intersecting.pdf.rgb24.xfail.png Binary files differnew file mode 100644 index 00000000..c32df82c --- /dev/null +++ b/test/self-intersecting.pdf.rgb24.xfail.png diff --git a/test/self-intersecting.ps.argb32.xfail.png b/test/self-intersecting.ps.argb32.xfail.png Binary files differnew file mode 100644 index 00000000..84fde017 --- /dev/null +++ b/test/self-intersecting.ps.argb32.xfail.png diff --git a/test/self-intersecting.ps.rgb24.xfail.png b/test/self-intersecting.ps.rgb24.xfail.png Binary files differnew file mode 100644 index 00000000..c8136070 --- /dev/null +++ b/test/self-intersecting.ps.rgb24.xfail.png diff --git a/test/self-intersecting.rgb24.xfail.png b/test/self-intersecting.rgb24.xfail.png Binary files differnew file mode 100644 index 00000000..9529f098 --- /dev/null +++ b/test/self-intersecting.rgb24.xfail.png diff --git a/test/self-intersecting.xlib.argb32.xfail.png b/test/self-intersecting.xlib.argb32.xfail.png Binary files differnew file mode 100644 index 00000000..f644ed46 --- /dev/null +++ b/test/self-intersecting.xlib.argb32.xfail.png diff --git a/test/self-intersecting.xlib.rgb24.xfail.png b/test/self-intersecting.xlib.rgb24.xfail.png Binary files differnew file mode 100644 index 00000000..958215c2 --- /dev/null +++ b/test/self-intersecting.xlib.rgb24.xfail.png diff --git a/test/set-source.svg11.argb32.ref.png b/test/set-source.svg11.argb32.ref.png Binary files differdeleted file mode 100644 index 754f1c46..00000000 --- a/test/set-source.svg11.argb32.ref.png +++ /dev/null diff --git a/test/set-source.svg12.argb32.ref.png b/test/set-source.svg12.argb32.ref.png Binary files differdeleted file mode 100644 index 754f1c46..00000000 --- a/test/set-source.svg12.argb32.ref.png +++ /dev/null diff --git a/test/smask-fill.c b/test/smask-fill.c index 289335c3..cb386103 100644 --- a/test/smask-fill.c +++ b/test/smask-fill.c @@ -67,7 +67,7 @@ draw (cairo_t *cr, int width, int height) CAIRO_TEST (smask_fill, "Test the support of \"soft\" masks with fills", - "XFAIL=pdf smask, fill", /* keywords */ + "smask, fill", /* keywords */ NULL, /* requirements */ 60, 60, NULL, draw) diff --git a/test/smask-fill.svg.ref.png b/test/smask-fill.svg.ref.png Binary files differnew file mode 100644 index 00000000..824e8cff --- /dev/null +++ b/test/smask-fill.svg.ref.png diff --git a/test/smask-fill.svg11.argb32.ref.png b/test/smask-fill.svg11.argb32.ref.png Binary files differdeleted file mode 100644 index 57ae76e6..00000000 --- a/test/smask-fill.svg11.argb32.ref.png +++ /dev/null diff --git a/test/smask-fill.svg11.ref.png b/test/smask-fill.svg11.ref.png Binary files differdeleted file mode 100644 index 06ab12a6..00000000 --- a/test/smask-fill.svg11.ref.png +++ /dev/null diff --git a/test/smask-fill.svg11.rgb24.ref.png b/test/smask-fill.svg11.rgb24.ref.png Binary files differdeleted file mode 100644 index 57ae76e6..00000000 --- a/test/smask-fill.svg11.rgb24.ref.png +++ /dev/null diff --git a/test/smask-fill.svg12.argb32.ref.png b/test/smask-fill.svg12.argb32.ref.png Binary files differdeleted file mode 100644 index 57ae76e6..00000000 --- a/test/smask-fill.svg12.argb32.ref.png +++ /dev/null diff --git a/test/smask-fill.svg12.ref.png b/test/smask-fill.svg12.ref.png Binary files differdeleted file mode 100644 index 06ab12a6..00000000 --- a/test/smask-fill.svg12.ref.png +++ /dev/null diff --git a/test/smask-fill.svg12.rgb24.ref.png b/test/smask-fill.svg12.rgb24.ref.png Binary files differdeleted file mode 100644 index 57ae76e6..00000000 --- a/test/smask-fill.svg12.rgb24.ref.png +++ /dev/null diff --git a/test/smask-fill.test-fallback.argb32.ref.png b/test/smask-fill.test-fallback.argb32.ref.png Binary files differdeleted file mode 100644 index 3d375bba..00000000 --- a/test/smask-fill.test-fallback.argb32.ref.png +++ /dev/null diff --git a/test/smask-fill.test-fallback.rgb24.ref.png b/test/smask-fill.test-fallback.rgb24.ref.png Binary files differdeleted file mode 100644 index 3d375bba..00000000 --- a/test/smask-fill.test-fallback.rgb24.ref.png +++ /dev/null diff --git a/test/smask-image-mask.c b/test/smask-image-mask.c index b3bba602..14187217 100644 --- a/test/smask-image-mask.c +++ b/test/smask-image-mask.c @@ -77,7 +77,7 @@ draw (cairo_t *cr, int width, int height) CAIRO_TEST (smask_image_mask, "Test the support of \"soft\" masks with a secondary image mask", - "XFAIL=pdf smask, image", /* keywords */ + "smask, image", /* keywords */ NULL, /* requirements */ 60, 60, NULL, draw) diff --git a/test/smask-mask.c b/test/smask-mask.c index d52754c5..11cff82f 100644 --- a/test/smask-mask.c +++ b/test/smask-mask.c @@ -90,7 +90,7 @@ draw (cairo_t *cr, int width, int height) CAIRO_TEST (smask_mask, "Test the support of \"soft\" masks with a secondary mask", - "XFAIL=pdf smask, mask", /* keywords */ + "smask, mask", /* keywords */ NULL, /* requirements */ 60, 60, NULL, draw) diff --git a/test/smask-mask.pdf.xfail.png b/test/smask-mask.pdf.xfail.png Binary files differnew file mode 100644 index 00000000..dac68559 --- /dev/null +++ b/test/smask-mask.pdf.xfail.png diff --git a/test/smask-mask.svg.ref.png b/test/smask-mask.svg.ref.png Binary files differnew file mode 100644 index 00000000..ae46036f --- /dev/null +++ b/test/smask-mask.svg.ref.png diff --git a/test/smask-mask.svg11.ref.png b/test/smask-mask.svg11.ref.png Binary files differdeleted file mode 100644 index 0820cd18..00000000 --- a/test/smask-mask.svg11.ref.png +++ /dev/null diff --git a/test/smask-mask.svg12.ref.png b/test/smask-mask.svg12.ref.png Binary files differdeleted file mode 100644 index 0820cd18..00000000 --- a/test/smask-mask.svg12.ref.png +++ /dev/null diff --git a/test/smask-paint.c b/test/smask-paint.c index e1cdaf08..ee781caa 100644 --- a/test/smask-paint.c +++ b/test/smask-paint.c @@ -75,7 +75,7 @@ draw (cairo_t *cr, int width, int height) CAIRO_TEST (smask_paint, "Test the support of \"soft\" masks with paints", - "XFAIL=pdf smask, paint", /* keywords */ + "smask, paint", /* keywords */ NULL, /* requirements */ 60, 60, NULL, draw) diff --git a/test/smask-paint.pdf.xfail.png b/test/smask-paint.pdf.xfail.png Binary files differnew file mode 100644 index 00000000..db17590b --- /dev/null +++ b/test/smask-paint.pdf.xfail.png diff --git a/test/smask-paint.svg.ref.png b/test/smask-paint.svg.ref.png Binary files differnew file mode 100644 index 00000000..93a423fe --- /dev/null +++ b/test/smask-paint.svg.ref.png diff --git a/test/smask-paint.svg11.ref.png b/test/smask-paint.svg11.ref.png Binary files differdeleted file mode 100644 index 09c01deb..00000000 --- a/test/smask-paint.svg11.ref.png +++ /dev/null diff --git a/test/smask-paint.svg12.ref.png b/test/smask-paint.svg12.ref.png Binary files differdeleted file mode 100644 index 09c01deb..00000000 --- a/test/smask-paint.svg12.ref.png +++ /dev/null diff --git a/test/smask-stroke.c b/test/smask-stroke.c index c0fd90d6..2a8e7e89 100644 --- a/test/smask-stroke.c +++ b/test/smask-stroke.c @@ -67,7 +67,7 @@ draw (cairo_t *cr, int width, int height) CAIRO_TEST (smask_stroke, "Test the support of \"soft\" masks with strokes", - "XFAIL=pdf smask, stroke", /* keywords */ + "smask, stroke", /* keywords */ NULL, /* requirements */ 60, 60, NULL, draw) diff --git a/test/smask-stroke.pdf.xfail.png b/test/smask-stroke.pdf.xfail.png Binary files differnew file mode 100644 index 00000000..9a1a7713 --- /dev/null +++ b/test/smask-stroke.pdf.xfail.png diff --git a/test/smask-text.c b/test/smask-text.c index d0e60698..c00aca4a 100644 --- a/test/smask-text.c +++ b/test/smask-text.c @@ -77,7 +77,7 @@ draw (cairo_t *cr, int width, int height) CAIRO_TEST (smask_text, "Test the support of \"soft\" masks with text", - "XFAIL=pdf smask, text", /* keywords */ + "smask, text", /* keywords */ NULL, /* keywords */ 120, 60, NULL, draw) diff --git a/test/smask-text.pdf.ref.png b/test/smask-text.pdf.ref.png Binary files differnew file mode 100644 index 00000000..fa490562 --- /dev/null +++ b/test/smask-text.pdf.ref.png diff --git a/test/smask-text.ref.png b/test/smask-text.ref.png Binary files differindex f001859b..bb393b52 100644 --- a/test/smask-text.ref.png +++ b/test/smask-text.ref.png diff --git a/test/smask-text.svg.ref.png b/test/smask-text.svg.ref.png Binary files differnew file mode 100644 index 00000000..65f225ea --- /dev/null +++ b/test/smask-text.svg.ref.png diff --git a/test/smask-text.svg11.argb32.ref.png b/test/smask-text.svg11.argb32.ref.png Binary files differdeleted file mode 100644 index 5034526a..00000000 --- a/test/smask-text.svg11.argb32.ref.png +++ /dev/null diff --git a/test/smask-text.svg11.ref.png b/test/smask-text.svg11.ref.png Binary files differdeleted file mode 100644 index 2665370c..00000000 --- a/test/smask-text.svg11.ref.png +++ /dev/null diff --git a/test/smask-text.svg11.rgb24.ref.png b/test/smask-text.svg11.rgb24.ref.png Binary files differdeleted file mode 100644 index 5034526a..00000000 --- a/test/smask-text.svg11.rgb24.ref.png +++ /dev/null diff --git a/test/smask-text.svg12.argb32.ref.png b/test/smask-text.svg12.argb32.ref.png Binary files differdeleted file mode 100644 index 5034526a..00000000 --- a/test/smask-text.svg12.argb32.ref.png +++ /dev/null diff --git a/test/smask-text.svg12.ref.png b/test/smask-text.svg12.ref.png Binary files differdeleted file mode 100644 index 2665370c..00000000 --- a/test/smask-text.svg12.ref.png +++ /dev/null diff --git a/test/smask-text.svg12.rgb24.ref.png b/test/smask-text.svg12.rgb24.ref.png Binary files differdeleted file mode 100644 index 5034526a..00000000 --- a/test/smask-text.svg12.rgb24.ref.png +++ /dev/null diff --git a/test/smask.c b/test/smask.c index 1ff9f37c..d28caca2 100644 --- a/test/smask.c +++ b/test/smask.c @@ -115,7 +115,7 @@ draw (cairo_t *cr, int width, int height) CAIRO_TEST (smask, "Test the support of \"soft\" masks", - "XFAIL=pdf smask", /* keywords */ + "smask", /* keywords */ NULL, /* requirements */ 60, 60, NULL, draw) diff --git a/test/smask.pdf.xfail.png b/test/smask.pdf.xfail.png Binary files differnew file mode 100644 index 00000000..1405cc06 --- /dev/null +++ b/test/smask.pdf.xfail.png diff --git a/test/smask.ref.png b/test/smask.ref.png Binary files differindex 2d98e433..e1904548 100644 --- a/test/smask.ref.png +++ b/test/smask.ref.png diff --git a/test/smask.svg.ref.png b/test/smask.svg.ref.png Binary files differnew file mode 100644 index 00000000..b4ad5270 --- /dev/null +++ b/test/smask.svg.ref.png diff --git a/test/smask.svg11.ref.png b/test/smask.svg11.ref.png Binary files differdeleted file mode 100644 index f1885614..00000000 --- a/test/smask.svg11.ref.png +++ /dev/null diff --git a/test/smask.svg12.ref.png b/test/smask.svg12.ref.png Binary files differdeleted file mode 100644 index f1885614..00000000 --- a/test/smask.svg12.ref.png +++ /dev/null diff --git a/test/source-clip-scale.svg.ref.png b/test/source-clip-scale.svg.ref.png Binary files differnew file mode 100644 index 00000000..bbf7c9be --- /dev/null +++ b/test/source-clip-scale.svg.ref.png diff --git a/test/source-clip-scale.svg11.ref.png b/test/source-clip-scale.svg11.ref.png Binary files differdeleted file mode 100644 index 87c29174..00000000 --- a/test/source-clip-scale.svg11.ref.png +++ /dev/null diff --git a/test/source-clip-scale.svg12.ref.png b/test/source-clip-scale.svg12.ref.png Binary files differdeleted file mode 100644 index 87c29174..00000000 --- a/test/source-clip-scale.svg12.ref.png +++ /dev/null diff --git a/test/surface-pattern-big-scale-down.c b/test/surface-pattern-big-scale-down.c index 15cb3a2f..698accb6 100644 --- a/test/surface-pattern-big-scale-down.c +++ b/test/surface-pattern-big-scale-down.c @@ -119,7 +119,7 @@ draw (cairo_t *cr, int width, int height) CAIRO_TEST (surface_pattern_big_scale_down, "Test scaled-down transformed not-repeated surface patterns with large images and offsets", - "XFAIL transform", /* keywords */ + "transform", /* keywords */ NULL, /* requirements */ 512, 16, NULL, draw) diff --git a/test/surface-pattern-big-scale-down.ref.png b/test/surface-pattern-big-scale-down.ref.png Binary files differindex 7a8f513e..c0509907 100644 --- a/test/surface-pattern-big-scale-down.ref.png +++ b/test/surface-pattern-big-scale-down.ref.png diff --git a/test/surface-pattern-scale-down.pdf.argb32.ref.png b/test/surface-pattern-scale-down.pdf.argb32.ref.png Binary files differdeleted file mode 100644 index dc4b3a31..00000000 --- a/test/surface-pattern-scale-down.pdf.argb32.ref.png +++ /dev/null diff --git a/test/surface-pattern-scale-down.pdf.ref.png b/test/surface-pattern-scale-down.pdf.ref.png Binary files differnew file mode 100644 index 00000000..7874243c --- /dev/null +++ b/test/surface-pattern-scale-down.pdf.ref.png diff --git a/test/surface-pattern-scale-down.pdf.rgb24.ref.png b/test/surface-pattern-scale-down.pdf.rgb24.ref.png Binary files differdeleted file mode 100644 index dc4b3a31..00000000 --- a/test/surface-pattern-scale-down.pdf.rgb24.ref.png +++ /dev/null diff --git a/test/surface-pattern-scale-up.pdf.argb32.ref.png b/test/surface-pattern-scale-up.pdf.argb32.ref.png Binary files differdeleted file mode 100644 index c0a2896a..00000000 --- a/test/surface-pattern-scale-up.pdf.argb32.ref.png +++ /dev/null diff --git a/test/surface-pattern-scale-up.pdf.ref.png b/test/surface-pattern-scale-up.pdf.ref.png Binary files differnew file mode 100644 index 00000000..e7e7a81e --- /dev/null +++ b/test/surface-pattern-scale-up.pdf.ref.png diff --git a/test/surface-pattern-scale-up.pdf.rgb24.ref.png b/test/surface-pattern-scale-up.pdf.rgb24.ref.png Binary files differdeleted file mode 100644 index c0a2896a..00000000 --- a/test/surface-pattern-scale-up.pdf.rgb24.ref.png +++ /dev/null diff --git a/test/surface-pattern.pdf.ref.png b/test/surface-pattern.pdf.ref.png Binary files differdeleted file mode 100644 index c663aff5..00000000 --- a/test/surface-pattern.pdf.ref.png +++ /dev/null diff --git a/test/surface-pattern.pdf.xfail.png b/test/surface-pattern.pdf.xfail.png Binary files differnew file mode 100644 index 00000000..a43dc4d0 --- /dev/null +++ b/test/surface-pattern.pdf.xfail.png diff --git a/test/surface-pattern.ps.xfail.png b/test/surface-pattern.ps.xfail.png Binary files differnew file mode 100644 index 00000000..02fbde84 --- /dev/null +++ b/test/surface-pattern.ps.xfail.png diff --git a/test/surface-pattern.ps2.ref.png b/test/surface-pattern.ps2.ref.png Binary files differdeleted file mode 100644 index b5c7b915..00000000 --- a/test/surface-pattern.ps2.ref.png +++ /dev/null diff --git a/test/surface-pattern.ps3.ref.png b/test/surface-pattern.ps3.ref.png Binary files differdeleted file mode 100644 index b5c7b915..00000000 --- a/test/surface-pattern.ps3.ref.png +++ /dev/null diff --git a/test/surface-pattern.svg.ref.png b/test/surface-pattern.svg.xfail.png Binary files differindex cdbcf476..cdbcf476 100644 --- a/test/surface-pattern.svg.ref.png +++ b/test/surface-pattern.svg.xfail.png diff --git a/test/text-pattern.pdf.argb32.ref.png b/test/text-pattern.pdf.argb32.ref.png Binary files differdeleted file mode 100644 index 46a16960..00000000 --- a/test/text-pattern.pdf.argb32.ref.png +++ /dev/null diff --git a/test/text-pattern.pdf.argb32.xfail.png b/test/text-pattern.pdf.argb32.xfail.png Binary files differnew file mode 100644 index 00000000..227058ce --- /dev/null +++ b/test/text-pattern.pdf.argb32.xfail.png diff --git a/test/text-pattern.pdf.rgb24.ref.png b/test/text-pattern.pdf.rgb24.ref.png Binary files differdeleted file mode 100644 index fefa84bc..00000000 --- a/test/text-pattern.pdf.rgb24.ref.png +++ /dev/null diff --git a/test/text-pattern.pdf.rgb24.xfail.png b/test/text-pattern.pdf.rgb24.xfail.png Binary files differnew file mode 100644 index 00000000..a3a37205 --- /dev/null +++ b/test/text-pattern.pdf.rgb24.xfail.png diff --git a/test/text-pattern.svg.argb32.ref.png b/test/text-pattern.svg.argb32.ref.png Binary files differnew file mode 100644 index 00000000..f472858f --- /dev/null +++ b/test/text-pattern.svg.argb32.ref.png diff --git a/test/text-pattern.svg.rgb24.ref.png b/test/text-pattern.svg.rgb24.ref.png Binary files differnew file mode 100644 index 00000000..2b2064ec --- /dev/null +++ b/test/text-pattern.svg.rgb24.ref.png diff --git a/test/text-pattern.svg11.argb32.ref.png b/test/text-pattern.svg11.argb32.ref.png Binary files differdeleted file mode 100644 index 47ee89c2..00000000 --- a/test/text-pattern.svg11.argb32.ref.png +++ /dev/null diff --git a/test/text-pattern.svg11.rgb24.ref.png b/test/text-pattern.svg11.rgb24.ref.png Binary files differdeleted file mode 100644 index c1f76c23..00000000 --- a/test/text-pattern.svg11.rgb24.ref.png +++ /dev/null diff --git a/test/text-pattern.svg12.argb32.ref.png b/test/text-pattern.svg12.argb32.ref.png Binary files differdeleted file mode 100644 index 47ee89c2..00000000 --- a/test/text-pattern.svg12.argb32.ref.png +++ /dev/null diff --git a/test/text-pattern.svg12.rgb24.ref.png b/test/text-pattern.svg12.rgb24.ref.png Binary files differdeleted file mode 100644 index c1f76c23..00000000 --- a/test/text-pattern.svg12.rgb24.ref.png +++ /dev/null diff --git a/test/text-rotate.svg.ref.png b/test/text-rotate.svg.ref.png Binary files differnew file mode 100644 index 00000000..7ffd356b --- /dev/null +++ b/test/text-rotate.svg.ref.png diff --git a/test/text-rotate.svg11.argb32.ref.png b/test/text-rotate.svg11.argb32.ref.png Binary files differdeleted file mode 100644 index 4864046f..00000000 --- a/test/text-rotate.svg11.argb32.ref.png +++ /dev/null diff --git a/test/text-rotate.svg11.ref.png b/test/text-rotate.svg11.ref.png Binary files differdeleted file mode 100644 index 35fd019f..00000000 --- a/test/text-rotate.svg11.ref.png +++ /dev/null diff --git a/test/text-rotate.svg11.rgb24.ref.png b/test/text-rotate.svg11.rgb24.ref.png Binary files differdeleted file mode 100644 index 4864046f..00000000 --- a/test/text-rotate.svg11.rgb24.ref.png +++ /dev/null diff --git a/test/text-rotate.svg12.argb32.ref.png b/test/text-rotate.svg12.argb32.ref.png Binary files differdeleted file mode 100644 index 4864046f..00000000 --- a/test/text-rotate.svg12.argb32.ref.png +++ /dev/null diff --git a/test/text-rotate.svg12.ref.png b/test/text-rotate.svg12.ref.png Binary files differdeleted file mode 100644 index 35fd019f..00000000 --- a/test/text-rotate.svg12.ref.png +++ /dev/null diff --git a/test/text-rotate.svg12.rgb24.ref.png b/test/text-rotate.svg12.rgb24.ref.png Binary files differdeleted file mode 100644 index 4864046f..00000000 --- a/test/text-rotate.svg12.rgb24.ref.png +++ /dev/null diff --git a/test/text-transform.svg.ref.png b/test/text-transform.svg.ref.png Binary files differnew file mode 100644 index 00000000..1473a643 --- /dev/null +++ b/test/text-transform.svg.ref.png diff --git a/test/text-transform.svg11.argb32.ref.png b/test/text-transform.svg11.argb32.ref.png Binary files differdeleted file mode 100644 index 0c4e57cc..00000000 --- a/test/text-transform.svg11.argb32.ref.png +++ /dev/null diff --git a/test/text-transform.svg11.rgb24.ref.png b/test/text-transform.svg11.rgb24.ref.png Binary files differdeleted file mode 100644 index 0c4e57cc..00000000 --- a/test/text-transform.svg11.rgb24.ref.png +++ /dev/null diff --git a/test/text-transform.svg12.argb32.ref.png b/test/text-transform.svg12.argb32.ref.png Binary files differdeleted file mode 100644 index 0c4e57cc..00000000 --- a/test/text-transform.svg12.argb32.ref.png +++ /dev/null diff --git a/test/text-transform.svg12.rgb24.ref.png b/test/text-transform.svg12.rgb24.ref.png Binary files differdeleted file mode 100644 index 0c4e57cc..00000000 --- a/test/text-transform.svg12.rgb24.ref.png +++ /dev/null diff --git a/test/trap-clip.pdf.argb32.ref.png b/test/trap-clip.pdf.argb32.ref.png Binary files differdeleted file mode 100644 index 4697690b..00000000 --- a/test/trap-clip.pdf.argb32.ref.png +++ /dev/null diff --git a/test/trap-clip.pdf.rgb24.ref.png b/test/trap-clip.pdf.rgb24.ref.png Binary files differdeleted file mode 100644 index 6ddbfa7b..00000000 --- a/test/trap-clip.pdf.rgb24.ref.png +++ /dev/null diff --git a/test/trap-clip.test-fallback.argb32.ref.png b/test/trap-clip.test-fallback.argb32.ref.png Binary files differdeleted file mode 100644 index 319d8356..00000000 --- a/test/trap-clip.test-fallback.argb32.ref.png +++ /dev/null diff --git a/test/trap-clip.test-fallback.rgb24.ref.png b/test/trap-clip.test-fallback.rgb24.ref.png Binary files differdeleted file mode 100644 index 7ac5789b..00000000 --- a/test/trap-clip.test-fallback.rgb24.ref.png +++ /dev/null diff --git a/test/twin.svg.ref.png b/test/twin.svg.ref.png Binary files differindex b5d4a314..628a83c7 100644 --- a/test/twin.svg.ref.png +++ b/test/twin.svg.ref.png diff --git a/test/unbounded-operator.c b/test/unbounded-operator.c index f5e1faa4..af1442b9 100644 --- a/test/unbounded-operator.c +++ b/test/unbounded-operator.c @@ -180,7 +180,7 @@ draw (cairo_t *cr, int width, int height) CAIRO_TEST (unbounded_operator, "Operators with an effect for transparent source/mask", - "XFAIL=svg12 operator", /* keywords */ + "operator", /* keywords */ NULL, /* requirements */ IMAGE_WIDTH, IMAGE_HEIGHT, NULL, draw) diff --git a/test/unbounded-operator.svg12.argb32.xfail.png b/test/unbounded-operator.svg12.argb32.xfail.png Binary files differnew file mode 100644 index 00000000..45b173fa --- /dev/null +++ b/test/unbounded-operator.svg12.argb32.xfail.png diff --git a/test/unbounded-operator.svg12.rgb24.xfail.png b/test/unbounded-operator.svg12.rgb24.xfail.png Binary files differnew file mode 100644 index 00000000..c369fd26 --- /dev/null +++ b/test/unbounded-operator.svg12.rgb24.xfail.png diff --git a/test/unbounded-operator.test-fallback.rgb24.ref.png b/test/unbounded-operator.test-fallback.rgb24.ref.png Binary files differdeleted file mode 100644 index 07c7ecff..00000000 --- a/test/unbounded-operator.test-fallback.rgb24.ref.png +++ /dev/null diff --git a/test/user-font-mask.svg.ref.png b/test/user-font-mask.svg.ref.png Binary files differnew file mode 100644 index 00000000..1a8f2c8c --- /dev/null +++ b/test/user-font-mask.svg.ref.png diff --git a/test/user-font-mask.svg11.ref.png b/test/user-font-mask.svg11.ref.png Binary files differdeleted file mode 100644 index 55006bf7..00000000 --- a/test/user-font-mask.svg11.ref.png +++ /dev/null diff --git a/test/user-font-proxy.svg.ref.png b/test/user-font-proxy.svg.ref.png Binary files differnew file mode 100644 index 00000000..747750a5 --- /dev/null +++ b/test/user-font-proxy.svg.ref.png diff --git a/test/user-font-proxy.svg11.argb32.ref.png b/test/user-font-proxy.svg11.argb32.ref.png Binary files differdeleted file mode 100644 index d2a7812b..00000000 --- a/test/user-font-proxy.svg11.argb32.ref.png +++ /dev/null diff --git a/test/user-font-proxy.svg11.ref.png b/test/user-font-proxy.svg11.ref.png Binary files differdeleted file mode 100644 index e5e9e9a7..00000000 --- a/test/user-font-proxy.svg11.ref.png +++ /dev/null diff --git a/test/user-font-proxy.svg11.rgb24.ref.png b/test/user-font-proxy.svg11.rgb24.ref.png Binary files differdeleted file mode 100644 index d2a7812b..00000000 --- a/test/user-font-proxy.svg11.rgb24.ref.png +++ /dev/null diff --git a/test/user-font-proxy.svg12.argb32.ref.png b/test/user-font-proxy.svg12.argb32.ref.png Binary files differdeleted file mode 100644 index d2a7812b..00000000 --- a/test/user-font-proxy.svg12.argb32.ref.png +++ /dev/null diff --git a/test/user-font-proxy.svg12.ref.png b/test/user-font-proxy.svg12.ref.png Binary files differdeleted file mode 100644 index e5e9e9a7..00000000 --- a/test/user-font-proxy.svg12.ref.png +++ /dev/null diff --git a/test/user-font-proxy.svg12.rgb24.ref.png b/test/user-font-proxy.svg12.rgb24.ref.png Binary files differdeleted file mode 100644 index d2a7812b..00000000 --- a/test/user-font-proxy.svg12.rgb24.ref.png +++ /dev/null diff --git a/test/user-font-proxy.test-fallback.argb32.ref.png b/test/user-font-proxy.test-fallback.argb32.ref.png Binary files differdeleted file mode 100644 index 9cccf312..00000000 --- a/test/user-font-proxy.test-fallback.argb32.ref.png +++ /dev/null diff --git a/test/user-font-proxy.test-fallback.rgb24.ref.png b/test/user-font-proxy.test-fallback.rgb24.ref.png Binary files differdeleted file mode 100644 index 9cccf312..00000000 --- a/test/user-font-proxy.test-fallback.rgb24.ref.png +++ /dev/null diff --git a/test/user-font-rescale.svg.ref.png b/test/user-font-rescale.svg.ref.png Binary files differnew file mode 100644 index 00000000..6ed2a192 --- /dev/null +++ b/test/user-font-rescale.svg.ref.png diff --git a/test/user-font-rescale.svg11.ref.png b/test/user-font-rescale.svg11.ref.png Binary files differdeleted file mode 100644 index 871e27e4..00000000 --- a/test/user-font-rescale.svg11.ref.png +++ /dev/null diff --git a/test/user-font-rescale.svg12.ref.png b/test/user-font-rescale.svg12.ref.png Binary files differdeleted file mode 100644 index 871e27e4..00000000 --- a/test/user-font-rescale.svg12.ref.png +++ /dev/null diff --git a/test/user-font.svg.ref.png b/test/user-font.svg.ref.png Binary files differnew file mode 100644 index 00000000..1ff6ea0f --- /dev/null +++ b/test/user-font.svg.ref.png diff --git a/test/user-font.svg11.argb32.ref.png b/test/user-font.svg11.argb32.ref.png Binary files differdeleted file mode 100644 index 3dc77ae4..00000000 --- a/test/user-font.svg11.argb32.ref.png +++ /dev/null diff --git a/test/user-font.svg11.ref.png b/test/user-font.svg11.ref.png Binary files differdeleted file mode 100644 index 28ba652a..00000000 --- a/test/user-font.svg11.ref.png +++ /dev/null diff --git a/test/user-font.svg11.rgb24.ref.png b/test/user-font.svg11.rgb24.ref.png Binary files differdeleted file mode 100644 index 3dc77ae4..00000000 --- a/test/user-font.svg11.rgb24.ref.png +++ /dev/null diff --git a/test/user-font.svg12.argb32.ref.png b/test/user-font.svg12.argb32.ref.png Binary files differdeleted file mode 100644 index 3dc77ae4..00000000 --- a/test/user-font.svg12.argb32.ref.png +++ /dev/null diff --git a/test/user-font.svg12.ref.png b/test/user-font.svg12.ref.png Binary files differdeleted file mode 100644 index 28ba652a..00000000 --- a/test/user-font.svg12.ref.png +++ /dev/null diff --git a/test/user-font.svg12.rgb24.ref.png b/test/user-font.svg12.rgb24.ref.png Binary files differdeleted file mode 100644 index 3dc77ae4..00000000 --- a/test/user-font.svg12.rgb24.ref.png +++ /dev/null diff --git a/test/user-font.test-fallback.argb32.ref.png b/test/user-font.test-fallback.argb32.ref.png Binary files differdeleted file mode 100644 index 3080c694..00000000 --- a/test/user-font.test-fallback.argb32.ref.png +++ /dev/null diff --git a/test/user-font.test-fallback.rgb24.ref.png b/test/user-font.test-fallback.rgb24.ref.png Binary files differdeleted file mode 100644 index 3080c694..00000000 --- a/test/user-font.test-fallback.rgb24.ref.png +++ /dev/null |
