summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2019-09-03 18:13:26 +0200
committerThomas Haller <thaller@redhat.com>2019-09-03 18:13:27 +0200
commitde6f0bc6db35a7c6b6f70b18502a9fcb0afd5ad6 (patch)
tree8409c45573dd066985d33e1041183e7c26ecdc1a
parentdbfbbed53c989aa7b7ac88ad8292e205c6ae0271 (diff)
downloadNetworkManager-de6f0bc6db35a7c6b6f70b18502a9fcb0afd5ad6.tar.gz
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).
-rw-r--r--src/tests/test-core-with-expect.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/tests/test-core-with-expect.c b/src/tests/test-core-with-expect.c
index d38025ecb1..2d111a41dc 100644
--- a/src/tests/test-core-with-expect.c
+++ b/src/tests/test-core-with-expect.c
@@ -118,13 +118,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
@@ -578,4 +578,3 @@ main (int argc, char **argv)
return g_test_run ();
}
-