summaryrefslogtreecommitdiff
path: root/test/cairo-test.c
diff options
context:
space:
mode:
Diffstat (limited to 'test/cairo-test.c')
-rw-r--r--test/cairo-test.c66
1 files changed, 26 insertions, 40 deletions
diff --git a/test/cairo-test.c b/test/cairo-test.c
index 119506d..255ea8b 100644
--- a/test/cairo-test.c
+++ b/test/cairo-test.c
@@ -101,7 +101,6 @@ static cairo_bool_t print_fail_on_stdout;
static int cairo_test_timeout = 60;
#define NUM_DEVICE_OFFSETS 2
-#define NUM_DEVICE_SCALE 2
cairo_bool_t
cairo_test_mkdir (const char *path)
@@ -431,8 +430,8 @@ cairo_test_target_has_similar (const cairo_test_context_t *ctx,
target->content,
ctx->test->width,
ctx->test->height,
- ctx->test->width* NUM_DEVICE_SCALE + 25 * NUM_DEVICE_OFFSETS,
- ctx->test->height* NUM_DEVICE_SCALE + 25 * NUM_DEVICE_OFFSETS,
+ ctx->test->width + 25 * NUM_DEVICE_OFFSETS,
+ ctx->test->height + 25 * NUM_DEVICE_OFFSETS,
CAIRO_BOILERPLATE_MODE_TEST,
&closure);
if (surface == NULL)
@@ -629,7 +628,6 @@ static cairo_test_status_t
cairo_test_for_target (cairo_test_context_t *ctx,
const cairo_boilerplate_target_t *target,
int dev_offset,
- int dev_scale,
cairo_bool_t similar)
{
cairo_test_status_t status;
@@ -637,7 +635,6 @@ cairo_test_for_target (cairo_test_context_t *ctx,
cairo_t *cr;
const char *empty_str = "";
char *offset_str;
- char *scale_str;
char *base_name, *base_path;
char *out_png_path;
char *ref_path = NULL, *ref_png_path, *cmp_png_path = NULL;
@@ -669,23 +666,15 @@ cairo_test_for_target (cairo_test_context_t *ctx,
else
offset_str = (char *) empty_str;
- if (dev_scale != 1)
- xasprintf (&scale_str, ".x%d", dev_scale);
- else
- scale_str = (char *) empty_str;
-
- xasprintf (&base_name, "%s.%s.%s%s%s%s",
+ xasprintf (&base_name, "%s.%s.%s%s%s",
ctx->test_name,
target->name,
format,
similar ? ".similar" : "",
- offset_str,
- scale_str);
+ offset_str);
if (offset_str != empty_str)
free (offset_str);
- if (scale_str != empty_str)
- free (scale_str);
ref_png_path = cairo_test_reference_filename (ctx,
base_name,
@@ -793,8 +782,6 @@ cairo_test_for_target (cairo_test_context_t *ctx,
width = ctx->test->width;
height = ctx->test->height;
if (width && height) {
- width *= dev_scale;
- height *= dev_scale;
width += dev_offset;
height += dev_offset;
}
@@ -823,8 +810,8 @@ REPEAT:
surface = (target->create_surface) (base_path,
target->content,
width, height,
- ctx->test->width * NUM_DEVICE_SCALE + 25 * NUM_DEVICE_OFFSETS,
- ctx->test->height * NUM_DEVICE_SCALE + 25 * NUM_DEVICE_OFFSETS,
+ ctx->test->width + 25 * NUM_DEVICE_OFFSETS,
+ ctx->test->height + 25 * NUM_DEVICE_OFFSETS,
CAIRO_BOILERPLATE_MODE_TEST,
&closure);
if (surface == NULL) {
@@ -891,7 +878,6 @@ REPEAT:
}
cairo_surface_set_device_offset (surface, dev_offset, dev_offset);
- cairo_surface_set_device_scale (surface, dev_scale, dev_scale);
cr = cairo_create (surface);
if (cairo_set_user_data (cr, &_cairo_test_context_key, (void*) ctx, NULL)) {
@@ -1485,7 +1471,7 @@ cairo_test_status_t
_cairo_test_context_run_for_target (cairo_test_context_t *ctx,
const cairo_boilerplate_target_t *target,
cairo_bool_t similar,
- int dev_offset, int dev_scale)
+ int dev_offset)
{
cairo_test_status_t status;
@@ -1496,15 +1482,15 @@ _cairo_test_context_run_for_target (cairo_test_context_t *ctx,
return CAIRO_TEST_UNTESTED;
cairo_test_log (ctx,
- "Testing %s with %s%s target (dev offset %d scale: %d)\n",
+ "Testing %s with %s%s target (dev offset %d)\n",
ctx->test_name,
similar ? " (similar) " : "",
target->name,
- dev_offset, dev_scale);
+ dev_offset);
- printf ("%s.%s.%s [%dx%d]%s:\t", ctx->test_name, target->name,
+ printf ("%s.%s.%s [%d]%s:\t", ctx->test_name, target->name,
cairo_boilerplate_content_name (target->content),
- dev_offset, dev_scale,
+ dev_offset,
similar ? " (similar)": "");
fflush (stdout);
@@ -1533,7 +1519,7 @@ _cairo_test_context_run_for_target (cairo_test_context_t *ctx,
old_sigalrm_handler = signal (SIGALRM, segfault_handler);
#endif
if (0 == setjmp (jmpbuf))
- status = cairo_test_for_target (ctx, target, dev_offset, dev_scale, similar);
+ status = cairo_test_for_target (ctx, target, dev_offset, similar);
else
status = CAIRO_TEST_CRASHED;
#ifdef SIGSEGV
@@ -1552,17 +1538,17 @@ _cairo_test_context_run_for_target (cairo_test_context_t *ctx,
signal (SIGALRM, old_sigalrm_handler);
#endif
} else {
- status = cairo_test_for_target (ctx, target, dev_offset, dev_scale, similar);
+ status = cairo_test_for_target (ctx, target, dev_offset, similar);
}
#else
- status = cairo_test_for_target (ctx, target, dev_offset, dev_scale, similar);
+ status = cairo_test_for_target (ctx, target, dev_offset, similar);
#endif
cairo_test_log (ctx,
- "TEST: %s TARGET: %s FORMAT: %s OFFSET: %d SCALE: %d SIMILAR: %d RESULT: ",
+ "TEST: %s TARGET: %s FORMAT: %s OFFSET: %d SIMILAR: %d RESULT: ",
ctx->test_name, target->name,
cairo_boilerplate_content_name (target->content),
- dev_offset, dev_scale, similar);
+ dev_offset, similar);
switch (status) {
case CAIRO_TEST_SUCCESS:
printf ("PASS\n");
@@ -1584,9 +1570,9 @@ _cairo_test_context_run_for_target (cairo_test_context_t *ctx,
fflush (stdout);
}
cairo_test_log (ctx, "CRASHED\n");
- fprintf (stderr, "%s.%s.%s [%dx%d]%s:\t%s!!!CRASHED!!!%s\n",
+ fprintf (stderr, "%s.%s.%s [%d]%s:\t%s!!!CRASHED!!!%s\n",
ctx->test_name, target->name,
- cairo_boilerplate_content_name (target->content), dev_offset, dev_scale, similar ? " (similar)" : "",
+ cairo_boilerplate_content_name (target->content), dev_offset, similar ? " (similar)" : "",
fail_face, normal_face);
break;
@@ -1599,9 +1585,9 @@ _cairo_test_context_run_for_target (cairo_test_context_t *ctx,
fflush (stdout);
}
cairo_test_log (ctx, "ERROR\n");
- fprintf (stderr, "%s.%s.%s [%dx%d]%s:\t%s!!!ERROR!!!%s\n",
+ fprintf (stderr, "%s.%s.%s [%d]%s:\t%s!!!ERROR!!!%s\n",
ctx->test_name, target->name,
- cairo_boilerplate_content_name (target->content), dev_offset, dev_scale, similar ? " (similar)" : "",
+ cairo_boilerplate_content_name (target->content), dev_offset, similar ? " (similar)" : "",
fail_face, normal_face);
break;
@@ -1613,9 +1599,9 @@ _cairo_test_context_run_for_target (cairo_test_context_t *ctx,
printf ("\r");
fflush (stdout);
}
- fprintf (stderr, "%s.%s.%s [%dx%d]%s:\t%sXFAIL%s\n",
+ fprintf (stderr, "%s.%s.%s [%d]%s:\t%sXFAIL%s\n",
ctx->test_name, target->name,
- cairo_boilerplate_content_name (target->content), dev_offset, dev_scale, similar ? " (similar)" : "",
+ cairo_boilerplate_content_name (target->content), dev_offset, similar ? " (similar)" : "",
xfail_face, normal_face);
cairo_test_log (ctx, "XFAIL\n");
break;
@@ -1628,9 +1614,9 @@ _cairo_test_context_run_for_target (cairo_test_context_t *ctx,
printf ("\r");
fflush (stdout);
}
- fprintf (stderr, "%s.%s.%s [%dx%d]%s:\t%sNEW%s\n",
+ fprintf (stderr, "%s.%s.%s [%d]%s:\t%sNEW%s\n",
ctx->test_name, target->name,
- cairo_boilerplate_content_name (target->content), dev_offset, dev_scale, similar ? " (similar)" : "",
+ cairo_boilerplate_content_name (target->content), dev_offset, similar ? " (similar)" : "",
fail_face, normal_face);
cairo_test_log (ctx, "NEW\n");
break;
@@ -1644,9 +1630,9 @@ _cairo_test_context_run_for_target (cairo_test_context_t *ctx,
printf ("\r");
fflush (stdout);
}
- fprintf (stderr, "%s.%s.%s [%dx%d]%s:\t%sFAIL%s\n",
+ fprintf (stderr, "%s.%s.%s [%d]%s:\t%sFAIL%s\n",
ctx->test_name, target->name,
- cairo_boilerplate_content_name (target->content), dev_offset, dev_scale, similar ? " (similar)" : "",
+ cairo_boilerplate_content_name (target->content), dev_offset, similar ? " (similar)" : "",
fail_face, normal_face);
cairo_test_log (ctx, "FAIL\n");
break;
generated by cgit v1.2.3 (git 2.39.1) at 2025-09-10 19:34:37 +0000