From 0ed8baa00f2e961c1daeb296a4cb4d5a07acec6d Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 3 Sep 2019 18:13:26 +0200 Subject: [PATCH] core/tests: avoid deprecated g_main_run()/g_main_loop_unref() in test These are deprecated. Also, they are nowadays implemented as macros that expand to #define g_main_run(loop) g_main_loop_run(loop) GLIB_DEPRECATED_MACRO_IN_2_26_FOR(g_main_loop_run) This can cause compilation failure (in some environments). (cherry picked from commit de6f0bc6db35a7c6b6f70b18502a9fcb0afd5ad6) (cherry picked from commit 9e209138dc74d8b39545e0210ad8a49e1e2456ac) --- src/tests/test-general-with-expect.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/tests/test-general-with-expect.c b/src/tests/test-general-with-expect.c index 8339fa5d43..cc06be3858 100644 --- a/src/tests/test-general-with-expect.c +++ b/src/tests/test-general-with-expect.c @@ -119,13 +119,13 @@ test_nm_utils_kill_child_async_do (const char *name, pid_t pid, int sig, guint32 timeout_id = g_timeout_add_seconds (5, test_nm_utils_kill_child_async_fail_cb, &data); data.loop = g_main_loop_new (NULL, FALSE); - g_main_run (data.loop); + g_main_loop_run (data.loop); g_assert (data.called); success = g_source_remove (timeout_id); g_assert (success); - g_main_destroy (data.loop); + g_main_loop_unref (data.loop); } static void @@ -574,4 +574,3 @@ main (int argc, char **argv) return g_test_run (); } -