summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/Makefile.am3
-rw-r--r--test/any2ppm.c5
-rw-r--r--test/cairo-test.c2
-rw-r--r--test/copy-path.c2
-rw-r--r--test/degenerate-dash.c2
-rw-r--r--test/map-to-image.c6
-rw-r--r--test/pattern-getters.c2
-rw-r--r--test/pdiff/args.c2
-rw-r--r--test/pdiff/args.h2
-rw-r--r--test/svg-clip.c2
-rw-r--r--test/svg2png.c3
-rw-r--r--test/text-cache-crash.c2
12 files changed, 14 insertions, 19 deletions
diff --git a/test/Makefile.am b/test/Makefile.am
index e3c42ea88..d69012b65 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -295,13 +295,12 @@ EXTRA_PROGRAMS += $(TESTS)
TARGETS = $(CAIRO_TEST_TARGET)
TARGETS_EXCLUDE = $(CAIRO_TEST_TARGET_EXCLUDE)
FORMAT = $(CAIRO_TEST_TARGET_FORMAT)
-NUM_THREADS = $(CAIRO_TEST_NUM_THREADS)
MODE = $(CAIRO_TEST_MODE)
# Same about ENV vs CAIRO_TEST_ENV. ENV is used with "make run" only
ENV = $(CAIRO_TEST_ENV)
-TESTS_ENVIRONMENT = CAIRO_TEST_MODE="$(MODE)" CAIRO_TEST_TARGET="$(TARGETS)" CAIRO_TEST_TARGET_FORMAT="$(FORMAT)" CAIRO_TEST_TARGET_EXCLUDE="$(TARGETS_EXCLUDE)" CAIRO_TEST_NUM_THREADS="$(NUM_THREADS)" $(ENV)
+TESTS_ENVIRONMENT = CAIRO_TEST_MODE="$(MODE)" CAIRO_TEST_TARGET="$(TARGETS)" CAIRO_TEST_TARGET_FORMAT="$(FORMAT)" CAIRO_TEST_TARGET_EXCLUDE="$(TARGETS_EXCLUDE)" $(ENV)
EXTRA_VALGRIND_FLAGS = $(CAIRO_EXTRA_VALGRIND_FLAGS)
VALGRIND_FLAGS = \
diff --git a/test/any2ppm.c b/test/any2ppm.c
index a92412d08..c3c1fd006 100644
--- a/test/any2ppm.c
+++ b/test/any2ppm.c
@@ -436,6 +436,7 @@ _rsvg_render_page (const char *filename,
if (handle == NULL)
return error->message; /* XXX g_error_free */
+ rsvg_handle_set_dpi (handle, 72.0);
rsvg_handle_get_dimensions (handle, &dimensions);
surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
dimensions.width,
@@ -873,10 +874,6 @@ main (int argc, char **argv)
#endif
#endif
-#if CAIRO_CAN_TEST_SVG_SURFACE
- rsvg_set_default_dpi (72.0);
-#endif
-
#if defined(_WIN32) && !defined (__CYGWIN__)
_setmode (1, _O_BINARY);
#endif
diff --git a/test/cairo-test.c b/test/cairo-test.c
index d93468bdb..dbfbf7e34 100644
--- a/test/cairo-test.c
+++ b/test/cairo-test.c
@@ -1470,7 +1470,7 @@ UNWIND_STRINGS:
#include <signal.h>
#include <setjmp.h>
/* Used to catch crashes in a test, so that we report it as such and
- * continue testing, although one crasher may already have corrupted memory in
+ * continue testing, although one crash may already have corrupted memory in
* an nonrecoverable fashion. */
static jmp_buf jmpbuf;
diff --git a/test/copy-path.c b/test/copy-path.c
index 25823b6b1..7d7a4f467 100644
--- a/test/copy-path.c
+++ b/test/copy-path.c
@@ -290,7 +290,7 @@ preamble (cairo_test_context_t *ctx)
return cairo_test_status_from_status (ctx, status);
}
- /* And test the degnerate case */
+ /* And test the degenerate case */
CAIRO_CREATE ();
path.num_data = 0;
cairo_append_path (cr, &path);
diff --git a/test/degenerate-dash.c b/test/degenerate-dash.c
index 6e7bf6b37..56d2e7938 100644
--- a/test/degenerate-dash.c
+++ b/test/degenerate-dash.c
@@ -85,6 +85,6 @@ 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",
"dash, degenerate", /* keywords */
- NULL, /* requirementts */
+ NULL, /* requirements */
210 + 2*PAD, 210 + 2*PAD,
NULL, draw)
diff --git a/test/map-to-image.c b/test/map-to-image.c
index 0262245a8..e2025c9a7 100644
--- a/test/map-to-image.c
+++ b/test/map-to-image.c
@@ -137,19 +137,19 @@ fill (cairo_t *cr, int width, int height)
}
CAIRO_TEST (map_all_to_image,
- "Test maping a surface to an image and modifying it externally",
+ "Test mapping a surface to an image and modifying it externally",
"image", /* keywords */
"target=raster", /* requirements */
WIDTH, HEIGHT,
NULL, all)
CAIRO_TEST (map_bit_to_image,
- "Test maping a surface to an image and modifying it externally",
+ "Test mapping a surface to an image and modifying it externally",
"image", /* keywords */
"target=raster", /* requirements */
WIDTH, HEIGHT,
NULL, bit)
CAIRO_TEST (map_to_image_fill,
- "Test maping a surface to an image and modifying it externally",
+ "Test mapping a surface to an image and modifying it externally",
"image", /* keywords */
"target=raster", /* requirements */
WIDTH, HEIGHT,
diff --git a/test/pattern-getters.c b/test/pattern-getters.c
index 08508d7d4..e0ece398f 100644
--- a/test/pattern-getters.c
+++ b/test/pattern-getters.c
@@ -67,7 +67,7 @@ draw (cairo_t *cr, int width, int height)
!CAIRO_TEST_DOUBLE_EQUALS(g,0.3) ||
!CAIRO_TEST_DOUBLE_EQUALS(b,0.4) ||
!CAIRO_TEST_DOUBLE_EQUALS(a,0.5)) {
- cairo_test_log (ctx, "Error: cairo_pattern_get_rgba returned unexepcted results: %g, %g, %g, %g\n",
+ cairo_test_log (ctx, "Error: cairo_pattern_get_rgba returned unexpected results: %g, %g, %g, %g\n",
r, g, b, a);
cairo_pattern_destroy (pat);
return CAIRO_TEST_FAILURE;
diff --git a/test/pdiff/args.c b/test/pdiff/args.c
index ac3aa83a9..64aef6fdb 100644
--- a/test/pdiff/args.c
+++ b/test/pdiff/args.c
@@ -1,5 +1,5 @@
/*
- Comapre Args
+ Compare Args
Copyright (C) 2006 Yangli Hector Yee
This program is free software; you can redistribute it and/or modify it under the terms of the
diff --git a/test/pdiff/args.h b/test/pdiff/args.h
index 502023915..338507f77 100644
--- a/test/pdiff/args.h
+++ b/test/pdiff/args.h
@@ -1,5 +1,5 @@
/*
- Comapre Args
+ Compare Args
Copyright (C) 2006 Yangli Hector Yee
This program is free software; you can redistribute it and/or modify it under the terms of the
diff --git a/test/svg-clip.c b/test/svg-clip.c
index dff65f7cc..d34144a9c 100644
--- a/test/svg-clip.c
+++ b/test/svg-clip.c
@@ -87,7 +87,7 @@ test_clip (cairo_t *cr, double width, double height)
cairo_stroke (cr2);
/* Using the first context, draw another black vertical line.
- * This line should be clipped agaist the bezier clipping path set
+ * This line should be clipped against the bezier clipping path set
* earlier. */
cairo_set_source_rgb (cr, 0, 0, 0);
cairo_move_to (cr, 400, 0);
diff --git a/test/svg2png.c b/test/svg2png.c
index 24bdbfa91..52f52d08f 100644
--- a/test/svg2png.c
+++ b/test/svg2png.c
@@ -52,12 +52,11 @@ int main (int argc, char *argv[])
error = NULL;
- rsvg_set_default_dpi (72.0);
-
handle = rsvg_handle_new_from_file (filename, &error);
if (!handle)
FAIL (error->message);
+ rsvg_handle_set_dpi (handle, 72.0);
rsvg_handle_get_dimensions (handle, &dimensions);
surface = cairo_image_surface_create (CAIRO_FORMAT_RGB24,
diff --git a/test/text-cache-crash.c b/test/text-cache-crash.c
index 27fe8cb42..6b6fe361c 100644
--- a/test/text-cache-crash.c
+++ b/test/text-cache-crash.c
@@ -42,7 +42,7 @@
*
* 2004-11-04 Carl Worth <cworth@cworth.org>
*
- * I trimmed down Ned's example to the folllowing test while still
+ * I trimmed down Ned's example to the following test while still
* maintaining the assertion.
*
* Oh, actually, it looks like I may have triggered something
View Lorry Controller Status