summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/Makefile.sources1
-rw-r--r--test/bug-535.c51
-rw-r--r--test/cairo-test-runner.c14
-rw-r--r--test/completion.bash1
-rw-r--r--test/meson.build1
-rw-r--r--test/reference/bug-535.ref.pngbin0 -> 87 bytes
6 files changed, 68 insertions, 0 deletions
diff --git a/test/Makefile.sources b/test/Makefile.sources
index 27f67efb6..c01d3ac2a 100644
--- a/test/Makefile.sources
+++ b/test/Makefile.sources
@@ -28,6 +28,7 @@ test_sources = \
bug-361.c \
bug-431.c \
bug-448.c \
+ bug-535.c \
bug-51910.c \
bug-75705.c \
bug-84115.c \
diff --git a/test/bug-535.c b/test/bug-535.c
new file mode 100644
index 000000000..5283b2ec7
--- /dev/null
+++ b/test/bug-535.c
@@ -0,0 +1,51 @@
+/*
+ * Copyright © 2022 Uli Schlachter, Antony Lee
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author: Uli Schlachter <psychon@znc.in>
+ */
+
+#include "cairo-test.h"
+
+static cairo_test_status_t
+draw (cairo_t *cr, int width, int height)
+{
+ // Once upon a time, the "rectangle detection" in cairo-script was triggered
+ // by this degenerate rectangle and produces CAIRO_STATUS_INVALID_PATH_DATA.
+
+ cairo_move_to (cr, 0, 0);
+ cairo_line_to (cr, 9, 0);
+ cairo_fill (cr);
+
+ // Fill the whole surface so that argb32 and rgb24 can share a ref image
+ cairo_paint (cr);
+
+ return CAIRO_TEST_SUCCESS;
+}
+
+CAIRO_TEST (bug_535,
+ "Regression test for bug #535 in cairo-svg",
+ "degenerate", /* keywords */
+ NULL, /* requirements */
+ 1, 1,
+ NULL, draw)
+
diff --git a/test/cairo-test-runner.c b/test/cairo-test-runner.c
index 05d04b78e..7e8b10cd7 100644
--- a/test/cairo-test-runner.c
+++ b/test/cairo-test-runner.c
@@ -942,6 +942,20 @@ main (int argc, char **argv)
if (ctx.test->preamble != NULL) {
status = _cairo_test_runner_preamble (&runner, &ctx);
+ if (getenv ("CAIRO_TEST_UGLY_HACK_TO_IGNORE_PS_FAILURES")) {
+ if (strcmp (ctx.test_name, "ps-eps") == 0 || strcmp (ctx.test_name, "fallback-resolution") == 0) {
+ if (status == CAIRO_TEST_FAILURE) {
+ cairo_test_log (&ctx, "Turning FAIL into XFAIL due to env\n");
+ fprintf (stderr, "Turning FAIL into XFAIL due to env\n");
+ runner.num_ignored_via_env++;
+ status = CAIRO_TEST_XFAILURE;
+ } else {
+ fprintf (stderr, "Test was expected to fail due to an environment variable, but did not!\n");
+ fprintf (stderr, "Please update the corresponding CAIRO_TEST_IGNORE_* variable.\n");
+ status = CAIRO_TEST_ERROR;
+ }
+ }
+ }
switch (status) {
case CAIRO_TEST_SUCCESS:
in_preamble = TRUE;
diff --git a/test/completion.bash b/test/completion.bash
new file mode 100644
index 000000000..6942ea867
--- /dev/null
+++ b/test/completion.bash
@@ -0,0 +1 @@
+complete -W "$(./cairo-test-suite -l)" cairo-test-suite
diff --git a/test/meson.build b/test/meson.build
index d4d6ab539..f1612e670 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -28,6 +28,7 @@ test_sources = [
'bug-361.c',
'bug-431.c',
'bug-448.c',
+ 'bug-535.c',
'bug-51910.c',
'bug-75705.c',
'bug-84115.c',
diff --git a/test/reference/bug-535.ref.png b/test/reference/bug-535.ref.png
new file mode 100644
index 000000000..7d5589c1d
--- /dev/null
+++ b/test/reference/bug-535.ref.png
Binary files differ