diff options
| author | Pavel Grunt <pgrunt@redhat.com> | 2016-03-17 11:19:35 +0100 |
|---|---|---|
| committer | Pavel Grunt <pgrunt@redhat.com> | 2016-03-18 11:42:31 +0100 |
| commit | 0a9ec4ec01d9559440a347d9db348ecc92a44a9b (patch) | |
| tree | 3150368d3ecc0945f023eeee8702841f276c2e7c /tests | |
| parent | 23cd3e6041fa686fbd3ac0bbee2e440eeceac822 (diff) | |
Adjust to GLib 2.36
Dependency since 8693e7d3f7de1ff102082212fa6e35fb1a252ef7
Remove glib-compat files and most of GLIB_CHECK_VERSION guards
Acked-by: Victor Toso <victortoso@redhat.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/coroutine.c | 4 | ||||
| -rw-r--r-- | tests/mock-acl-helper.c | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/tests/coroutine.c b/tests/coroutine.c index 287b3c9..bded593 100644 --- a/tests/coroutine.c +++ b/tests/coroutine.c @@ -36,11 +36,9 @@ static void test_coroutine_simple(void) result = coroutine_yieldto(&co, GINT_TO_POINTER(42)); g_assert_cmpint(GPOINTER_TO_INT(result), ==, 0x42); -#if GLIB_CHECK_VERSION(2,34,0) g_test_expect_message(G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, "*!to->exited*"); coroutine_yieldto(&co, GINT_TO_POINTER(42)); g_test_assert_expected_messages(); -#endif g_assert(self == coroutine_self()); g_assert(coroutine_self_is_main()); @@ -117,11 +115,9 @@ static void test_coroutine_yield(void) g_assert(self == coroutine_self()); g_assert(val == NULL); -#if GLIB_CHECK_VERSION(2,34,0) g_test_expect_message(G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, "*!to->exited*"); coroutine_yieldto(&co, GINT_TO_POINTER(42)); g_test_assert_expected_messages(); -#endif } int main(int argc, char* argv[]) diff --git a/tests/mock-acl-helper.c b/tests/mock-acl-helper.c index 11268cb..782ebaf 100644 --- a/tests/mock-acl-helper.c +++ b/tests/mock-acl-helper.c @@ -71,10 +71,6 @@ int main(void) { GInputStream *stdin_unix_stream; -#if !GLIB_CHECK_VERSION(2,36,0) - g_type_init(); -#endif - loop = g_main_loop_new(NULL, FALSE); stdin_unix_stream = g_unix_input_stream_new(STDIN_FILENO, 0); |