diff options
-rwxr-xr-x | .gitlab-ci/run-tests.sh | 2 | ||||
-rw-r--r-- | lsan.supp | 1 | ||||
-rw-r--r-- | pango/pangocairo-fontmap.c | 2 | ||||
-rw-r--r-- | subprojects/cairo.wrap | 4 | ||||
-rw-r--r-- | subprojects/gobject-introspection.wrap | 10 | ||||
-rw-r--r-- | tests/test-font.c | 5 | ||||
-rw-r--r-- | tests/test-itemize.c | 1 | ||||
-rw-r--r-- | tests/test-shape.c | 5 | ||||
-rw-r--r-- | tests/testboundaries_ucd.c | 1 | ||||
-rw-r--r-- | utils/pango-list.c | 1 |
10 files changed, 26 insertions, 6 deletions
diff --git a/.gitlab-ci/run-tests.sh b/.gitlab-ci/run-tests.sh index e5c8e9af..73a1951f 100755 --- a/.gitlab-ci/run-tests.sh +++ b/.gitlab-ci/run-tests.sh @@ -8,6 +8,8 @@ builddir=$1 # Ignore memory leaks lower in dependencies export LSAN_OPTIONS=suppressions=$srcdir/lsan.supp +# Check leaks of slices +export G_SLICE=always-malloc meson test -C ${builddir} \ --print-errorlogs \ @@ -1,5 +1,4 @@ leak:g_quark_init -leak:libc.so leak:libfontconfig.so leak:libcairo.so leak:libpixman-1.so diff --git a/pango/pangocairo-fontmap.c b/pango/pangocairo-fontmap.c index 47c2245f..120ccb89 100644 --- a/pango/pangocairo-fontmap.c +++ b/pango/pangocairo-fontmap.c @@ -101,7 +101,7 @@ pango_cairo_font_map_new (void) " fontconfig" #endif ; - g_error ("Unknown $PANGOCAIRO_BACKEND value.\n Available backends are:%s", backends); + g_critical ("Unknown $PANGOCAIRO_BACKEND value.\n Available backends are:%s", backends); } return NULL; } diff --git a/subprojects/cairo.wrap b/subprojects/cairo.wrap index 5e539239..d09964e4 100644 --- a/subprojects/cairo.wrap +++ b/subprojects/cairo.wrap @@ -1,6 +1,6 @@ [wrap-git] directory=cairo -url=https://github.com/matthiasclasen/cairo.git +url=https://gitlab.freedesktop.org/cairo/cairo.git push-url=ssh://git@gitlab.freedesktop.org:cairo/cairo.git -revision=fix-osx-build +revision=master depth=1 diff --git a/subprojects/gobject-introspection.wrap b/subprojects/gobject-introspection.wrap new file mode 100644 index 00000000..7177b663 --- /dev/null +++ b/subprojects/gobject-introspection.wrap @@ -0,0 +1,10 @@ +[wrap-git] +directory=gobject-introspection +url=https://gitlab.gnome.org/GNOME/gobject-introspection.git +push-url=ssh://git@gitlab.gnome.org:GNOME/gobject-introspection.git +revision=master +depth=1 + +[provides] +dependency_names = gobject-introspection-1.0 +program_names = g-ir-scanner diff --git a/tests/test-font.c b/tests/test-font.c index 486504f9..d02c7932 100644 --- a/tests/test-font.c +++ b/tests/test-font.c @@ -164,9 +164,12 @@ test_extents (void) PangoGlyphString *glyphs; PangoRectangle ink, log; PangoContext *context; + PangoFontDescription *desc; context = pango_font_map_create_context (pango_cairo_font_map_get_default ()); - pango_context_set_font_description (context, pango_font_description_from_string ("Cantarell 11")); + desc = pango_font_description_from_string("Cantarell 11"); + pango_context_set_font_description (context, desc); + pango_font_description_free (desc); items = pango_itemize (context, str, 0, strlen (str), NULL, NULL); glyphs = pango_glyph_string_new (); diff --git a/tests/test-itemize.c b/tests/test-itemize.c index dbe67e64..d1447a0f 100644 --- a/tests/test-itemize.c +++ b/tests/test-itemize.c @@ -279,6 +279,7 @@ test_itemize (gconstpointer d) g_free (diff); g_string_free (dump, TRUE); g_free (expected_file); + g_object_unref (context); } int diff --git a/tests/test-shape.c b/tests/test-shape.c index 043f3d31..be3e4415 100644 --- a/tests/test-shape.c +++ b/tests/test-shape.c @@ -361,7 +361,10 @@ main (int argc, char *argv[]) g_free (path); if (g_error_matches (error, G_FILE_ERROR, G_FILE_ERROR_NOENT)) - return 0; + { + g_error_free (error); + return 0; + } g_assert_no_error (error); while ((name = g_dir_read_name (dir)) != NULL) diff --git a/tests/testboundaries_ucd.c b/tests/testboundaries_ucd.c index 18ab94cc..0cd301f7 100644 --- a/tests/testboundaries_ucd.c +++ b/tests/testboundaries_ucd.c @@ -233,6 +233,7 @@ do_test (const gchar *filename, if (g_error_matches (error, G_FILE_ERROR, G_FILE_ERROR_NOENT)) { g_test_skip ("Test file not found"); + g_error_free (error); return; } diff --git a/utils/pango-list.c b/utils/pango-list.c index 3d360975..6e81fd6e 100644 --- a/utils/pango-list.c +++ b/utils/pango-list.c @@ -200,6 +200,7 @@ main (int argc, g_free (faces); } g_free (families); + g_object_unref (ctx); g_object_unref (fontmap); return 0; |