diff options
| author | Thomas Haller <thaller@redhat.com> | 2014-07-10 10:40:47 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2014-07-10 13:27:12 +0200 |
| commit | c469e81f960ccf4437ddb9029c9ce04028c4bcf2 (patch) | |
| tree | 9aba011288fa1f159d9b598619d90bb630c5598f | |
| parent | 362c4fe18810bb3ff0e71aebe795692d9388f31b (diff) | |
| download | NetworkManager-c469e81f960ccf4437ddb9029c9ce04028c4bcf2.tar.gz | |
core/test: move src/tests/test-general over to nm-test-utils.h (nmtst)
Signed-off-by: Thomas Haller <thaller@redhat.com>
| -rw-r--r-- | src/tests/Makefile.am | 1 | ||||
| -rw-r--r-- | src/tests/test-general.c | 11 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am index ee5be17d7b..a44c2ee3bd 100644 --- a/src/tests/Makefile.am +++ b/src/tests/Makefile.am @@ -5,6 +5,7 @@ AM_CPPFLAGS = \ -I$(top_builddir)/libnm-util \ -I$(top_srcdir)/src/logging \ -I$(top_srcdir)/src/platform \ + -I$(top_srcdir)/src/logging \ -I$(top_srcdir)/src/dhcp-manager \ -I$(top_srcdir)/src \ -I$(top_builddir)/src \ diff --git a/src/tests/test-general.c b/src/tests/test-general.c index 11c03f0dbe..723598e8e9 100644 --- a/src/tests/test-general.c +++ b/src/tests/test-general.c @@ -24,8 +24,9 @@ #include <netinet/ether.h> #include "NetworkManagerUtils.h" -#include "nm-utils.h" +#include "nm-logging.h" +#include "nm-test-utils.h" static void test_nm_utils_ascii_str_to_int64_check (const char *str, guint base, gint64 min, @@ -588,14 +589,12 @@ test_connection_no_match_ip4_addr (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_with_logging (&argc, &argv, NULL, "ALL"); g_test_add_func ("/general/nm_utils_ascii_str_to_int64", test_nm_utils_ascii_str_to_int64); g_test_add_func ("/general/nm_utils_ip6_address_clear_host_address", test_nm_utils_ip6_address_clear_host_address); |