mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-05 22:48:55 +02:00
8609879a5e
the build system was changed to meson also, use libVersion and libVersionCompat variables test results: 5 of the tests crash, the others pass
46 lines
1.6 KiB
Plaintext
46 lines
1.6 KiB
Plaintext
From 2d117cae0c7298d1e408e39e2056e7ff2950fcce Mon Sep 17 00:00:00 2001
|
|
From: Jerome Duval <jerome.duval@gmail.com>
|
|
Date: Mon, 12 Oct 2015 22:19:59 +0000
|
|
Subject: Haiku patch
|
|
|
|
|
|
diff --git a/tests/testattributes.c b/tests/testattributes.c
|
|
index 8e63201..1c9f8d9 100644
|
|
--- a/tests/testattributes.c
|
|
+++ b/tests/testattributes.c
|
|
@@ -412,7 +412,7 @@ test_list_filter (void)
|
|
g_assert_null (out);
|
|
|
|
out = pango_attr_list_filter (list, just_weight, NULL);
|
|
- g_assert_nonnull (out);
|
|
+ g_assert (out != NULL);
|
|
|
|
assert_attr_list (list, "[0,-1]size=10\n"
|
|
"[10,20]stretch=2\n");
|
|
@@ -505,11 +505,11 @@ test_iter_get (void)
|
|
iter = pango_attr_list_get_iterator (list);
|
|
pango_attr_iterator_next (iter);
|
|
attr = pango_attr_iterator_get (iter, PANGO_ATTR_SIZE);
|
|
- g_assert_nonnull (attr);
|
|
+ g_assert (attr != NULL);
|
|
g_assert_cmpuint (attr->start_index, ==, 0);
|
|
g_assert_cmpuint (attr->end_index, ==, G_MAXUINT);
|
|
attr = pango_attr_iterator_get (iter, PANGO_ATTR_STRETCH);
|
|
- g_assert_nonnull (attr);
|
|
+ g_assert (attr != NULL);
|
|
g_assert_cmpuint (attr->start_index, ==, 10);
|
|
g_assert_cmpuint (attr->end_index, ==, 30);
|
|
attr = pango_attr_iterator_get (iter, PANGO_ATTR_WEIGHT);
|
|
@@ -567,7 +567,7 @@ test_iter_get_font (void)
|
|
pango_attr_iterator_get_font (iter, desc, &lang, &attrs);
|
|
desc2 = pango_font_description_from_string ("Times Condensed 10");
|
|
g_assert_true (pango_font_description_equal (desc, desc2));
|
|
- g_assert_nonnull (lang);
|
|
+ g_assert (lang != NULL);
|
|
g_assert_cmpstr (pango_language_to_string (lang), ==, "ja-jp");
|
|
g_assert_null (attrs);
|
|
pango_font_description_free (desc);
|
|
--
|
|
2.30.2
|
|
|