Merge tag 'upstream/1.1.90' into experimental

Upstream version 1.1.90

1 files changed, 6 insertions, 6 deletions

diff --git a/src/tests/test-dcb.c b/src/tests/test-dcb.c
index dacb1f52..35f1ed0f 100644
--- a/src/tests/test-dcb.c
+++ b/src/tests/test-dcb.c
@@ -20,11 +20,13 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <string.h>
 
+#include "nm-default.h"
 #include "nm-dcb.h"
 
+#include "nm-test-utils.h"
+
 typedef struct {
 	guint num;
 	const char *cmds[];
@@ -335,14 +337,12 @@ test_fcoe_cleanup (void)
 
 /*******************************************/
 
+NMTST_DEFINE ();
+
 int
 main (int argc, char **argv)
 {
-	g_test_init (&argc, &argv, NULL);
-
-#if !GLIB_CHECK_VERSION (2, 35, 0)
-	g_type_init ();
-#endif
+	nmtst_init_assert_logging (&argc, &argv, "INFO", "DEFAULT");
 
 	g_test_add_func ("/dcb/fcoe", test_dcb_fcoe);
 	g_test_add_func ("/dcb/iscsi", test_dcb_iscsi);