From f60117b41d5433be1b4a96d82cd11d0c3dce9b63 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 23 Apr 2018 18:00:21 +0200 Subject: New upstream version 1.11.3 --- src/nm-test-utils-core.h | 32 ++++++++------------------------ 1 file changed, 8 insertions(+), 24 deletions(-) (limited to 'src/nm-test-utils-core.h') diff --git a/src/nm-test-utils-core.h b/src/nm-test-utils-core.h index 58beadcd..da24992e 100644 --- a/src/nm-test-utils-core.h +++ b/src/nm-test-utils-core.h @@ -30,6 +30,14 @@ /*****************************************************************************/ +#define NMTST_EXPECT_NM(level, msg) NMTST_EXPECT ("NetworkManager", level, msg) + +#define NMTST_EXPECT_NM_ERROR(msg) NMTST_EXPECT_NM (G_LOG_LEVEL_MESSAGE, "* [*] "msg) +#define NMTST_EXPECT_NM_WARN(msg) NMTST_EXPECT_NM (G_LOG_LEVEL_MESSAGE, "* [*] "msg) +#define NMTST_EXPECT_NM_INFO(msg) NMTST_EXPECT_NM (G_LOG_LEVEL_INFO, "* [*] "msg) +#define NMTST_EXPECT_NM_DEBUG(msg) NMTST_EXPECT_NM (G_LOG_LEVEL_DEBUG, "* [*] "msg) +#define NMTST_EXPECT_NM_TRACE(msg) NMTST_EXPECT_NM (G_LOG_LEVEL_DEBUG, "* [*] "msg) + static inline void nmtst_init_with_logging (int *argc, char ***argv, const char *log_level, const char *log_domains) { @@ -313,18 +321,6 @@ nmtst_ip4_config_new (int ifindex) return nm_ip4_config_new (multi_idx, ifindex); } -static inline NMIP4Config * -nmtst_ip4_config_clone (NMIP4Config *config) -{ - NMIP4Config *copy; - - g_assert (config); - copy = nm_ip4_config_new (nm_ip4_config_get_multi_idx (config), -1); - g_assert (copy); - nm_ip4_config_replace (copy, config, NULL); - return copy; -} - #endif @@ -340,18 +336,6 @@ nmtst_ip6_config_new (int ifindex) return nm_ip6_config_new (multi_idx, ifindex); } -static inline NMIP6Config * -nmtst_ip6_config_clone (NMIP6Config *config) -{ - NMIP6Config *copy; - - g_assert (config); - copy = nm_ip6_config_new (nm_ip6_config_get_multi_idx (config), -1); - g_assert (copy); - nm_ip6_config_replace (copy, config, NULL); - return copy; -} - #endif #endif /* __NM_TEST_UTILS_CORE_H__ */ -- cgit 1.3.0-6-gf8a5