[network-manager-applet: 5/6] tests: use "nm-test-utils.h" in tests

[Thomas Haller <thaller src gnome org>]

commit aa69f9c7cd441e1b091bf4c400182b27b0fb8314
Author: Thomas Haller <thaller redhat com>
Date:   Tue Feb 16 20:00:30 2016 +0100

    tests: use "nm-test-utils.h" in tests

 src/libnm-gtk/tests/Makefile.am             |    4 +---
 src/libnm-gtk/tests/test-mobile-providers.c |    9 +++++----
 src/utils/tests/Makefile.am                 |    3 +--
 src/utils/tests/test-utils.c                |    6 +++++-
 4 files changed, 12 insertions(+), 10 deletions(-)
---
diff --git a/src/libnm-gtk/tests/Makefile.am b/src/libnm-gtk/tests/Makefile.am
index 12a7ca0..6349d93 100644
--- a/src/libnm-gtk/tests/Makefile.am
+++ b/src/libnm-gtk/tests/Makefile.am
@@ -17,9 +17,7 @@ test_mobile_providers_LDADD = \
        $(top_builddir)/src/libnm-gtk/libnm-gtk.la \
        $(LIBNM_GLIB_LIBS)
 
-check-local: test-mobile-providers
-       $(abs_builddir)/test-mobile-providers
-
+TESTS: test-mobile-providers
 
 EXTRA_DIST = \
        iso3166-test.xml \
diff --git a/src/libnm-gtk/tests/test-mobile-providers.c b/src/libnm-gtk/tests/test-mobile-providers.c
index bad9fc5..1f74e35 100644
--- a/src/libnm-gtk/tests/test-mobile-providers.c
+++ b/src/libnm-gtk/tests/test-mobile-providers.c
@@ -22,6 +22,8 @@
 
 #include "nm-mobile-providers.h"
 
+#include "nm-test-utils.h"
+
 #if defined TEST_DATA_DIR
 #  define COUNTRY_CODES_FILE     TEST_DATA_DIR "/iso3166-test.xml"
 #  define SERVICE_PROVIDERS_FILE TEST_DATA_DIR "/serviceproviders-test.xml"
@@ -490,14 +492,13 @@ split_mccmnc_error_4 (void)
 
 /******************************************************************************/
 
+NMTST_DEFINE ();
+
 int main (int argc, char **argv)
 {
        setlocale (LC_ALL, "");
 
-#if !GLIB_CHECK_VERSION(2,36,0)
-       g_type_init ();
-#endif
-       g_test_init (&argc, &argv, NULL);
+       nmtst_init (&argc, &argv, TRUE);
 
        g_test_add_func ("/MobileProvidersDatabase/new-sync",  new_sync);
        g_test_add_func ("/MobileProvidersDatabase/new-async", new_async);
diff --git a/src/utils/tests/Makefile.am b/src/utils/tests/Makefile.am
index 2acd8ff..2741c48 100644
--- a/src/utils/tests/Makefile.am
+++ b/src/utils/tests/Makefile.am
@@ -14,6 +14,5 @@ test_utils_LDADD = \
        $(GTK_LIBS) \
        $(LIBNM_LIBS)
 
-check-local: test-utils
-       $(abs_builddir)/test-utils
+TESTS: test-utils
 
diff --git a/src/utils/tests/test-utils.c b/src/utils/tests/test-utils.c
index e0ecc92..496bd9d 100644
--- a/src/utils/tests/test-utils.c
+++ b/src/utils/tests/test-utils.c
@@ -29,6 +29,8 @@
 
 #include "utils.h"
 
+#include "nm-test-utils.h"
+
 typedef struct {
        char *foobar_infra_open;
        char *foobar_infra_wep;
@@ -412,13 +414,15 @@ test_ap_hash_foobar_asdf11_adhoc_wpa_rsn (TestData *d)
        g_assert (strcmp (d->foobar_adhoc_wpa_rsn, d->asdf11_adhoc_wpa_rsn));
 }
 
+NMTST_DEFINE ();
+
 int
 main (int argc, char **argv)
 {
        gint result;
        TestData *data;
 
-       g_test_init (&argc, &argv, NULL);
+       nmtst_init (&argc, &argv, TRUE);
 
        data = test_data_new ();