From 36a136fb58df64422604e8c8b0884f878d48b887 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 7 Jan 2015 17:09:52 +0100 Subject: [PATCH] config/test: move test over to nm-test-util (partially cherry picked from commit 13c7f6a56db55db47d31a181c85913f1d183f95a) Conflicts: src/tests/config/test-config.c --- src/tests/config/test-config.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/tests/config/test-config.c b/src/tests/config/test-config.c index 808fc670b3..4d99506c28 100644 --- a/src/tests/config/test-config.c +++ b/src/tests/config/test-config.c @@ -27,6 +27,9 @@ #include #include "nm-test-device.h" #include "nm-fake-platform.h" +#include "nm-logging.h" + +#include "nm-test-utils.h" static void setup_config (const char *config_file, const char *config_dir, ...) @@ -279,14 +282,12 @@ test_config_confdir_parse_error (void) g_assert_error (error, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_PARSE); } +NMTST_DEFINE (); + int main (int argc, char **argv) { -#if !GLIB_CHECK_VERSION (2, 35, 0) - g_type_init (); -#endif - - g_test_init (&argc, &argv, NULL); + nmtst_init_assert_logging (&argc, &argv); nm_fake_platform_setup ();