colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

all: merge branch 'th/build-cleanup-defines'

Browse Source 
https://github.com/NetworkManager/NetworkManager/pull/126
This commit is contained in:
Thomas Haller
2018-05-31 15:59:47 +02:00
parent cdbd99c5d5 f445128af4
commit cc472f52fb
51 changed files with 626 additions and 747 deletions
Download Patch File Download Diff File Expand all files Collapse all files

125
Makefile.am
View File

@@ -81,6 +81,8 @@ servicedir = $(datadir)/dbus-1/system-services
completiondir = $(datadir)/bash-completion/completions
nmlocaledir = $(datadir)/locale
GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM
GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM
@@ -104,6 +106,11 @@ endif
###############################################################################
nm_build_cflags = \
-DNM_BUILD_SRCDIR=\"$(abs_srcdir)\" \
-DNM_BUILD_BUILDDIR=\"$(abs_builddir)\" \
$(NULL)
set_sanitizer_env = \
[ -n "$(SANITIZER_ENV)" ] && export $(SANITIZER_ENV) ; \
if echo $(SANITIZER_LIB_CFLAGS) $(SANITIZER_EXEC_CFLAGS) | grep -e -fsanitize=address > /dev/null; then \
@@ -438,7 +445,6 @@ libnm_core_lib_h_priv = \
shared/nm-utils/nm-shared-utils.h \
shared/nm-utils/nm-random-utils.h \
shared/nm-utils/nm-udev-utils.h \
shared/nm-utils/siphash24.h \
shared/nm-meta-setting.h \
libnm-core/crypto.h \
libnm-core/nm-connection-private.h \
@@ -577,7 +583,7 @@ libnm_core_libnm_core_la_CPPFLAGS = \
$(dflt_cppflags_libnm_core) \
-DG_LOG_DOMAIN=\""libnm"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE \
-DLOCALEDIR=\"$(datadir)/locale\" \
-DNMLOCALEDIR=\"$(nmlocaledir)\" \
-DNMCONFDIR=\"$(nmconfdir)\" \
-DNMLIBDIR=\"$(nmlibdir)\" \
-DNMVPNDIR=\"$(pkglibdir)\" \
@@ -599,9 +605,11 @@ nodist_libnm_core_libnm_core_la_SOURCES = \
$(libnm_core_lib_c_mkenums)
libnm_core_libnm_core_la_LIBADD = \
shared/libcsiphash.la \
$(GLIB_LIBS) \
$(UUID_LIBS) \
$(LIBUDEV_LIBS)
$(LIBUDEV_LIBS) \
$(NULL)
libnm_core_libnm_core_la_LDFLAGS = \
$(CODE_COVERAGE_LDFLAGS) \
@@ -665,9 +673,10 @@ libnm_core_tests_cppflags = \
$(dflt_cppflags_libnm_core) \
-I$(srcdir)/libnm-core/tests \
-I$(builddir)/libnm-core/tests \
$(nm_build_cflags) \
-DNETWORKMANAGER_COMPILATION_TEST \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE \
-DTEST_CERT_DIR=\"$(abs_srcdir)/libnm-core/tests/certs\"
$(NULL)
libnm_core_tests_test_compare_CPPFLAGS = $(libnm_core_tests_cppflags)
libnm_core_tests_test_crypto_CPPFLAGS = $(libnm_core_tests_cppflags)
@@ -863,7 +872,7 @@ libnm_lib_cppflags = \
-I$(builddir)/libnm \
-DG_LOG_DOMAIN=\""libnm"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM \
-DNMRUNDIR=\"$(nmrundir)\"
$(NULL)
libnminclude_HEADERS += \
$(libnm_lib_h_pub_real)
@@ -1084,9 +1093,10 @@ libnm_tests_cppflags = \
$(dflt_cppflags_libnm_core) \
-I$(srcdir)/libnm \
-I$(builddir)/libnm \
$(nm_build_cflags) \
-DNETWORKMANAGER_COMPILATION_TEST \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM \
-DTEST_NM_SERVICE=\"$(abs_srcdir)/tools/test-networkmanager-service.py\"
$(NULL)
libnm_tests_ldadd = \
libnm/libnm.la \
@@ -1192,7 +1202,7 @@ src_cppflags = \
-DRUNDIR=\"$(rundir)\" \
\
-DNMCONFDIR=\"$(nmconfdir)\" \
-DNMLOCALEDIR=\"$(datadir)/locale\" \
-DNMLOCALEDIR=\"$(nmlocaledir)\" \
-DNMPLUGINDIR=\"$(plugindir)\" \
-DNMRUNDIR=\"$(nmrundir)\" \
-DNMSTATEDIR=\"$(nmstatedir)\" \
@@ -1229,24 +1239,34 @@ noinst_LTLIBRARIES += \
###############################################################################
shared_libcsiphash_la_CPPFLAGS = $(src_cppflags)
noinst_LTLIBRARIES += shared/libcsiphash.la
shared_libcsiphash_la_CPPFLAGS = \
$(CODE_COVERAGE_CFLAGS) \
$(SANITIZER_LIB_CFLAGS) \
$(NULL)
shared_libcsiphash_la_SOURCES = \
shared/c-siphash/src/c-siphash.c \
shared/c-siphash/src/c-siphash.h
###############################################################################
noinst_LTLIBRARIES += shared/libnacd.la
shared_libnacd_la_CFLAGS = -std=gnu99
shared_libnacd_la_CPPFLAGS = \
$(src_cppflags) \
-I $(srcdir)/shared/c-list/src \
-I $(srcdir)/shared/c-siphash/src
$(CODE_COVERAGE_CFLAGS) \
$(SANITIZER_LIB_CFLAGS) \
-I$(srcdir)/shared/c-list/src \
-I$(srcdir)/shared/c-siphash/src \
$(NULL)
shared_libnacd_la_SOURCES = \
shared/n-acd/src/n-acd.c \
shared/n-acd/src/n-acd.h
noinst_LTLIBRARIES += \
shared/libcsiphash.la \
shared/libnacd.la
EXTRA_DIST += shared/c-list/src/c-list.h
###############################################################################
@@ -1258,7 +1278,6 @@ src_libsystemd_nm_la_cppflags = \
-I$(builddir)/libnm-core \
-I$(srcdir)/src \
-I$(srcdir)/src/systemd/sd-adapt \
-I$(srcdir)/shared/nm-utils \
-I$(srcdir)/src/systemd/src/systemd \
-I$(srcdir)/src/systemd/src/basic \
-I$(srcdir)/src/systemd/src/shared \
@@ -1305,6 +1324,7 @@ src_libsystemd_nm_la_SOURCES = \
src/systemd/sd-adapt/terminal-util.h \
src/systemd/sd-adapt/udev-util.h \
src/systemd/sd-adapt/udev.h \
src/systemd/sd-adapt/unaligned.h \
src/systemd/sd-adapt/user-util.h \
src/systemd/sd-adapt/virt.h \
src/systemd/src/basic/alloc-util.c \
@@ -1352,6 +1372,7 @@ src_libsystemd_nm_la_SOURCES = \
src/systemd/src/basic/refcnt.h \
src/systemd/src/basic/set.h \
src/systemd/src/basic/signal-util.h \
src/systemd/src/basic/siphash24.h \
src/systemd/src/basic/socket-util.c \
src/systemd/src/basic/socket-util.h \
src/systemd/src/basic/sparse-endian.h \
@@ -1679,7 +1700,6 @@ src_libNetworkManager_la_SOURCES = \
src_libNetworkManager_la_LIBADD = \
src/libNetworkManagerBase.la \
src/libsystemd-nm.la \
shared/libcsiphash.la \
shared/libnacd.la \
$(GLIB_LIBS) \
$(LIBUDEV_LIBS) \
@@ -1813,7 +1833,8 @@ EXTRA_DIST += \
src_dhcp_tests_cppflags = \
$(src_tests_cppflags) \
-DTESTDIR="\"$(abs_srcdir)/src/dhcp/tests\""
$(nm_build_cflags) \
$(NULL)
src_dhcp_tests_ldadd = \
src/libNetworkManagerTest.la
@@ -1914,8 +1935,8 @@ check_programs += src/settings/plugins/keyfile/tests/test-keyfile
src_settings_plugins_keyfile_tests_test_keyfile_CPPFLAGS = \
$(src_tests_cppflags) \
-DTEST_KEYFILES_DIR=\"$(abs_srcdir)/src/settings/plugins/keyfile/tests/keyfiles\" \
-DTEST_SCRATCH_DIR=\"$(abs_builddir)/src/settings/plugins/keyfile/tests/keyfiles\"
$(nm_build_cflags) \
$(NULL)
src_settings_plugins_keyfile_tests_test_keyfile_LDFLAGS = \
$(GLIB_LIBS) \
@@ -2025,10 +2046,10 @@ src_settings_plugins_ibft_tests_test_ibft_CPPFLAGS = \
-I$(srcdir)/libnm-core \
-I$(builddir)/libnm-core \
-I$(srcdir)/src \
$(nm_build_cflags) \
-DNETWORKMANAGER_COMPILATION_TEST \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \
-DTEST_IBFT_DIR=\"$(abs_srcdir)/src/settings/plugins/ibft/tests\" \
-DTEST_SCRATCH_DIR=\"$(abs_builddir)/src/settings/plugins/ibft/tests\"
$(NULL)
src_settings_plugins_ibft_tests_test_ibft_LDFLAGS = \
$(GLIB_LIBS) \
@@ -2166,8 +2187,8 @@ src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_SOURCES = \
src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_CPPFLAGS = \
$(src_tests_cppflags) \
-DTEST_IFCFG_DIR=\"$(abs_srcdir)/src/settings/plugins/ifcfg-rh/tests\" \
-DTEST_SCRATCH_DIR=\"$(abs_builddir)/src/settings/plugins/ifcfg-rh/tests\"
$(nm_build_cflags) \
$(NULL)
src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_LDFLAGS = \
$(GLIB_LIBS) \
@@ -2474,10 +2495,11 @@ src_settings_plugins_ifupdown_tests_test_ifupdown_CPPFLAGS = \
-I$(srcdir)/libnm-core \
-I$(builddir)/libnm-core \
-I$(srcdir)/src \
$(GLIB_CFLAGS) \
-DNETWORKMANAGER_COMPILATION_TEST \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \
$(GLIB_CFLAGS) \
-DTEST_ENI_DIR=\"$(abs_srcdir)/src/settings/plugins/ifupdown/tests\"
$(nm_build_cflags) \
$(NULL)
src_settings_plugins_ifupdown_tests_test_ifupdown_LDFLAGS = \
$(GLIB_LDFLAGS) \
@@ -2904,13 +2926,13 @@ check_programs += src/dnsmasq/tests/test-dnsmasq-utils
src_dnsmasq_tests_test_dnsmasq_utils_CPPFLAGS = \
$(src_tests_cppflags) \
-DTESTDIR="\"$(abs_srcdir)\""
$(NULL)
src_dnsmasq_tests_test_dnsmasq_utils_LDADD = \
src/libNetworkManagerTest.la
src_dnsmasq_tests_test_dnsmasq_utils_LDFLAGS = \
$(SANITIZER_EXEC_LDFLAGS)
$(SANITIZER_EXEC_LDFLAGS)
$(src_dnsmasq_tests_test_dnsmasq_utils_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
@@ -3077,7 +3099,8 @@ check_programs += src/supplicant/tests/test-supplicant-config
src_supplicant_tests_test_supplicant_config_CPPFLAGS = \
$(src_tests_cppflags) \
-DTEST_CERT_DIR=\"$(abs_srcdir)/src/supplicant/tests/certs\"
$(nm_build_cflags) \
$(NULL)
src_supplicant_tests_test_supplicant_config_LDADD = \
src/libNetworkManagerTest.la
@@ -3105,8 +3128,8 @@ src_tests_config_test_config_SOURCES = \
src_tests_config_test_config_CPPFLAGS = \
$(src_tests_cppflags) \
-DSRCDIR=\""$(abs_srcdir)/src/tests/config"\" \
-DBUILDDIR=\""$(abs_builddir)/src/tests/config"\"
$(nm_build_cflags) \
$(NULL)
src_tests_config_test_config_LDADD = \
src/libNetworkManagerTest.la
@@ -3188,11 +3211,12 @@ src_tests_test_systemd_CPPFLAGS = \
$(src_libsystemd_nm_la_cppflags) \
-DNETWORKMANAGER_COMPILATION_TEST
src_tests_test_systemd_SOURCES = \
shared/nm-utils/siphash24.c \
src/tests/test-systemd.c
src_tests_test_systemd_LDADD = \
src/libsystemd-nm.la \
$(src_libsystemd_nm_la_libadd)
shared/libcsiphash.la \
$(src_libsystemd_nm_la_libadd) \
$(NULL)
$(src_tests_test_systemd_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
@@ -3317,11 +3341,12 @@ dispatcher_tests_test_dispatcher_envp_CPPFLAGS = \
-I$(builddir)/libnm \
-I$(srcdir)/dispatcher \
-I$(builddir)/dispatcher \
-DSRCDIR=\"$(abs_srcdir)/dispatcher/tests\" \
$(nm_build_cflags) \
-DNETWORKMANAGER_COMPILATION_TEST \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
$(GLIB_CFLAGS) \
$(SANITIZER_EXEC_CFLAGS)
$(SANITIZER_EXEC_CFLAGS) \
$(NULL)
dispatcher_tests_test_dispatcher_envp_LDFLAGS = \
$(SANITIZER_EXEC_LDFLAGS)
@@ -3359,7 +3384,7 @@ clients_nm_online_CPPFLAGS = \
$(GLIB_CFLAGS) \
-DG_LOG_DOMAIN=\""nm-online"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
-DNMLOCALEDIR=\"$(datadir)/locale\"
-DNMLOCALEDIR=\"$(nmlocaledir)\"
clients_nm_online_LDFLAGS = \
-Wl,--version-script="$(srcdir)/linker-script-binary.ver"
@@ -3387,7 +3412,7 @@ clients_cppflags = \
-I$(srcdir)/clients/common \
-I$(builddir)/clients/common \
$(GLIB_CFLAGS) \
-DNMLOCALEDIR=\"$(datadir)/locale\" \
-DNMLOCALEDIR=\"$(nmlocaledir)\" \
$(NULL)
check_ltlibraries += clients/common/libnmc-base.la
@@ -3401,7 +3426,6 @@ clients_common_libnmc_base_la_SOURCES = \
shared/nm-utils/nm-random-utils.h \
shared/nm-utils/nm-shared-utils.c \
shared/nm-utils/nm-shared-utils.h \
shared/nm-utils/siphash24.h \
\
clients/common/nm-secret-agent-simple.c \
clients/common/nm-secret-agent-simple.h \
@@ -3417,7 +3441,9 @@ clients_common_libnmc_base_la_CPPFLAGS = \
clients_common_libnmc_base_la_LIBADD = \
libnm/libnm.la \
$(GLIB_LIBS)
shared/libcsiphash.la \
$(GLIB_LIBS) \
$(NULL)
$(clients_common_libnmc_base_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
$(clients_common_libnmc_base_la_OBJECTS): $(libnm_lib_h_pub_mkenums)
@@ -3541,7 +3567,7 @@ clients_cli_nmcli_CPPFLAGS = \
-DSYSCONFDIR=\"$(sysconfdir)\" \
-DG_LOG_DOMAIN=\""nmcli"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
-DNMCLI_LOCALEDIR=\"$(datadir)/locale\"
-DNMLOCALEDIR=\"$(nmlocaledir)\"
clients_cli_nmcli_LDADD = \
libnm/libnm.la \
@@ -3747,7 +3773,7 @@ clients_tui_nmtui_CPPFLAGS = \
$(NEWT_CFLAGS) \
-DG_LOG_DOMAIN=\""nmtui"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
-DLOCALEDIR=\""$(localedir)"\"
-DNMLOCALEDIR=\""$(nmlocaledir)"\"
clients_tui_nmtui_LDFLAGS = \
-Wl,--version-script="$(srcdir)/linker-script-binary.ver" \
@@ -3908,7 +3934,7 @@ libnm_util_cppflags = \
-I$(builddir)/shared \
-DG_LOG_DOMAIN=\""libnm-util"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_UTIL \
-DLOCALEDIR=\"$(datadir)/locale\" \
-DNMLOCALEDIR=\"$(nmlocaledir)\" \
$(GLIB_CFLAGS) \
$(DBUS_CFLAGS) \
$(UUID_CFLAGS)
@@ -4120,11 +4146,11 @@ libnm_util_tests_cppflags = \
-I$(builddir)/libnm-util \
$(GLIB_CFLAGS) \
$(DBUS_CFLAGS) \
-DBUILD_DIR=\"$(abs_builddir)/libnm-util/tests\" \
-DTEST_CERT_DIR=\"$(abs_srcdir)/libnm-core/tests/certs\" \
$(nm_build_cflags) \
-DNETWORKMANAGER_COMPILATION_TEST \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_UTIL \
$(SANITIZER_EXEC_CFLAGS)
$(SANITIZER_EXEC_CFLAGS) \
$(NULL)
libnm_util_tests_ldadd = \
libnm-util/libnm-util.la \
@@ -4336,7 +4362,7 @@ nodist_libnm_glib_libnm_glib_la_SOURCES = \
libnm_glib_libnm_glib_la_CPPFLAGS = \
$(libnm_glib_cppflags) \
$(LIBUDEV_CFLAGS) \
-DNMRUNDIR=\"$(nmrundir)\"
$(NULL)
libnm_glib_libnm_glib_la_LDFLAGS = \
-Wl,--version-script=$(srcdir)/libnm-glib/libnm-glib.ver \
@@ -4477,11 +4503,12 @@ libnm_glib_tests_cppflags = \
-I$(srcdir)/libnm-util \
-I$(builddir)/libnm-util \
-I$(srcdir)/libnm-glib \
$(nm_build_cflags) \
-DNETWORKMANAGER_COMPILATION_TEST \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_GLIB \
-DTEST_NM_SERVICE=\"$(abs_srcdir)/tools/test-networkmanager-service.py\" \
$(GLIB_CFLAGS) \
$(DBUS_CFLAGS)
$(DBUS_CFLAGS) \
$(NULL)
libnm_glib_tests_programs_req_introspection = \
libnm-glib/tests/test-nm-client \
@@ -4768,8 +4795,6 @@ EXTRA_DIST += \
shared/nm-utils/nm-vpn-plugin-macros.h \
shared/nm-utils/nm-vpn-plugin-utils.c \
shared/nm-utils/nm-vpn-plugin-utils.h \
shared/nm-utils/siphash24.c \
shared/nm-utils/siphash24.h \
shared/nm-utils/unaligned.h \
shared/nm-version-macros.h.in \
shared/meson.build \

2
clients/cli/meson.build
View File

@@ -29,7 +29,7 @@ deps = [
cflags = clients_cflags + [
'-DSYSCONFDIR="@0@"'.format(nm_sysconfdir),
'-DG_LOG_DOMAIN="@0@"'.format(name),
'-DNMCLI_LOCALEDIR="@0@"'.format(nm_localedir)
'-DNMLOCALEDIR="@0@"'.format(nm_localedir)
]
if enable_polkit_agent

2
clients/cli/nmcli.c
View File

@@ -950,7 +950,7 @@ main (int argc, char *argv[])
#ifdef GETTEXT_PACKAGE
/* Set i18n stuff */
bindtextdomain (GETTEXT_PACKAGE, NMCLI_LOCALEDIR);
bindtextdomain (GETTEXT_PACKAGE, NMLOCALEDIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
#endif

23
clients/common/meson.build
View File

@@ -11,15 +11,13 @@ cflags = clients_cflags + [
'-DG_LOG_DOMAIN="libnmc"',
]
sources = shared_utils + files(
'nm-client-utils.c',
'nm-secret-agent-simple.c',
'nm-vpn-helpers.c'
)
libnmc_base = static_library(
'nmc-base',
sources: sources,
sources: shared_files_clients_common + files(
'nm-client-utils.c',
'nm-secret-agent-simple.c',
'nm-vpn-helpers.c',
),
dependencies: deps,
c_args: cflags
)
@@ -29,11 +27,6 @@ libnmc_base_dep = declare_dependency(
link_with: libnmc_base
)
sources = shared_meta_setting + files(
'nm-meta-setting-access.c',
'nm-meta-setting-desc.c'
)
settings_docs = 'settings-docs.h'
if enable_introspection
@@ -60,11 +53,13 @@ else
configuration: configuration_data()
)
endif
sources += settings_docs_source
libnmc = static_library(
'nmc',
sources: sources,
sources: files(
'nm-meta-setting-access.c',
'nm-meta-setting-desc.c'
) + shared_nm_utils_nm_meta_setting_c + [settings_docs_source],
dependencies: deps,
c_args: cflags,
link_with: libnmc_base,

2
clients/tui/meson.build
View File

@@ -7,7 +7,7 @@ deps = [
cflags = clients_cflags + [
'-DG_LOG_DOMAIN="@0@"'.format(name),
'-DLOCALEDIR="@0@"'.format(nm_localedir)
'-DNMLOCALEDIR="@0@"'.format(nm_localedir)
]
subdir('newt')

2
clients/tui/nmtui.c
View File

@@ -226,7 +226,7 @@ main (int argc, char **argv)
int i;
setlocale (LC_ALL, "");
bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
bindtextdomain (GETTEXT_PACKAGE, NMLOCALEDIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);

12
dispatcher/tests/meson.build
View File

@@ -5,18 +5,16 @@ incs = [
libnm_inc
]
cflags = [
'-DNETWORKMANAGER_COMPILATION_TEST',
'-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT',
'-DSRCDIR="@0@"'.format(meson.current_source_dir()),
]
exe = executable(
test_unit,
test_unit + '.c',
include_directories: incs,
dependencies: nm_core_dep,
c_args: cflags,
c_args: [
'-DNETWORKMANAGER_COMPILATION_TEST',
'-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT',
] +
nm_build_cflags,
link_with: libnm_dispatcher_core
)

5
dispatcher/tests/test-dispatcher-envp.c
View File

@@ -29,6 +29,8 @@
#include "nm-utils/nm-test-utils.h"
#define TEST_DIR NM_BUILD_SRCDIR"/dispatcher/tests"
/*****************************************************************************/
static void
@@ -525,8 +527,7 @@ test_generic (const char *file, const char *override_vpn_ip_iface)
gs_strfreev char **denv = NULL;
char **iter;
/* Read in the test file */
p = g_build_filename (SRCDIR, file, NULL);
p = g_build_filename (TEST_DIR, file, NULL);
success = get_dispatcher_file (p,
&con_dict,
&con_props,

18
libnm-core/meson.build
View File

@@ -131,14 +131,15 @@ deps = [
dl_dep,
libudev_dep,
shared_dep,
uuid_dep
uuid_dep,
shared_c_siphash_dep,
]
cflags = [
'-DG_LOG_DOMAIN="@0@"'.format(libnm_name),
'-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE',
'-DLIBEXECDIR="@0@"'.format(nm_libexecdir),
'-DLOCALEDIR="@0@"'.format(nm_localedir),
'-DNMLOCALEDIR="@0@"'.format(nm_localedir),
'-DNMCONFDIR="@0@"'.format(nm_pkgconfdir),
'-DNMLIBDIR="@0@"'.format(nm_pkglibdir),
'-DNMPLUGINDIR="@0@"'.format(nm_plugindir),
@@ -150,9 +151,15 @@ if enable_json_validation
deps += jansson_dep
endif
libnm_core_sources_all = libnm_core_sources
libnm_core_sources_all += libnm_core_enum
libnm_core_sources_all += shared_nm_utils_nm_meta_setting_c
libnm_core_sources_all += shared_files_libnm_core
libnm_core_sources_all += [version_header]
libnm_core = static_library(
'nm-core',
sources: libnm_core_sources + libnm_core_enum + shared_sources + [version_header],
sources: libnm_core_sources_all,
dependencies: deps,
c_args: cflags
)
@@ -160,7 +167,10 @@ libnm_core = static_library(
nm_core_dep = declare_dependency(
sources: libnm_core_enum[1],
include_directories: libnm_core_inc,
dependencies: shared_dep
dependencies: [
shared_dep,
shared_c_siphash_dep,
],
)
enums_to_docbook = join_paths(meson.source_root(), 'tools', 'enums-to-docbook.pl')

2
libnm-core/nm-utils.c
View File

@@ -249,7 +249,7 @@ _nm_utils_init (void)
g_error ("libnm-util symbols detected; Mixing libnm with libnm-util/libnm-glib is not supported");
g_module_close (self);
bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
bindtextdomain (GETTEXT_PACKAGE, NMLOCALEDIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
_nm_dbus_errors_init ();

12
libnm-core/tests/meson.build
View File

@@ -29,18 +29,16 @@ test_units = [
test_cert_dir = join_paths(meson.current_source_dir(), 'certs')
cflags = [
'-DNETWORKMANAGER_COMPILATION_TEST',
'-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE',
'-DTEST_CERT_DIR="@0@"'.format(test_cert_dir),
]
foreach test_unit: test_units
exe = executable(
'libnm-core-' + test_unit,
[test_unit + '.c'] + enum,
dependencies: nm_core_dep,
c_args: cflags,
c_args: [
'-DNETWORKMANAGER_COMPILATION_TEST',
'-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE',
] +
nm_build_cflags,
link_with: libnm_core
)
test(

2
libnm-core/tests/test-crypto.c
View File

@@ -35,6 +35,8 @@
#include "nm-utils/nm-test-utils.h"
#define TEST_CERT_DIR NM_BUILD_SRCDIR"/libnm-core/tests/certs"
#if 0
static const char *pem_rsa_key_begin = "-----BEGIN RSA PRIVATE KEY-----";
static const char *pem_rsa_key_end = "-----END RSA PRIVATE KEY-----";

1
libnm-core/tests/test-keyfile.c
View File

@@ -33,6 +33,7 @@
#include "nm-utils/nm-test-utils.h"
#define TEST_CERT_DIR NM_BUILD_SRCDIR"/libnm-core/tests/certs"
#define TEST_WIRED_TLS_CA_CERT TEST_CERT_DIR"/test-ca-cert.pem"
#define TEST_WIRED_TLS_PRIVKEY TEST_CERT_DIR"/test-key-and-cert.pem"

3
libnm-core/tests/test-secrets.c
View File

@@ -40,7 +40,8 @@
#include "nm-utils/nm-test-utils.h"
#define TEST_NEED_SECRETS_EAP_TLS_CA_CERT TEST_CERT_DIR "/test_ca_cert.pem"
#define TEST_CERT_DIR NM_BUILD_SRCDIR"/libnm-core/tests/certs"
#define TEST_NEED_SECRETS_EAP_TLS_CA_CERT TEST_CERT_DIR "/test_ca_cert.pem"
#define TEST_NEED_SECRETS_EAP_TLS_CLIENT_CERT TEST_CERT_DIR "/test_key_and_cert.pem"
#define TEST_NEED_SECRETS_EAP_TLS_PRIVATE_KEY TEST_CERT_DIR "/test_key_and_cert.pem"

2
libnm-core/tests/test-setting.c
View File

@@ -37,6 +37,8 @@
#include "nm-utils/nm-test-utils.h"
#define TEST_CERT_DIR NM_BUILD_SRCDIR"/libnm-core/tests/certs"
/*****************************************************************************/
static void

30
libnm-glib/meson.build
View File

@@ -79,13 +79,6 @@ sources = files(
glue = 'nm-vpn-plugin-glue.h'
sources += custom_target(
glue,
input: ifaces_vpn_plugin_xml,
output: glue,
command: [dbus_binding_tool, '--prefix=nm_vpn_plugin', '--mode=glib-server', '--output=@OUTPUT@', '@INPUT@']
)
enum_types = 'nm-vpn-enum-types'
libnm_glib_vpn_enum = gnome.mkenums(
@@ -104,7 +97,18 @@ linker_script = join_paths(meson.current_source_dir(), 'libnm-glib-vpn.ver')
libnm_glib_vpn = shared_library(
'nm-glib-vpn',
sources: sources + libnm_glib_vpn_enum,
sources: files(
'nm-vpn-plugin.c',
'nm-vpn-plugin-ui-interface.c',
'nm-vpn-plugin-utils.c',
) + [
custom_target(
glue,
input: ifaces_vpn_plugin_xml,
output: glue,
command: [dbus_binding_tool, '--prefix=nm_vpn_plugin', '--mode=glib-server', '--output=@OUTPUT@', '@INPUT@'],
),
] + libnm_glib_vpn_enum,
version: libnm_glib_vpn_version,
dependencies: deps,
c_args: cflags,
@@ -131,7 +135,7 @@ pkg.generate(
variables: 'exec_prefix=${prefix}'
)
sources = shared_udev_utils + files(
libnm_glib_sources = shared_files_libnm_glib + files(
'nm-access-point.c',
'nm-active-connection.c',
'nm-client.c',
@@ -194,12 +198,10 @@ linker_script = join_paths(meson.current_source_dir(), 'libnm-glib.ver')
libnm_glib = shared_library(
'nm-glib',
sources: sources + libnm_glib_enum + [nm_secret_agent_glue],
sources: libnm_glib_sources + libnm_glib_enum + [nm_secret_agent_glue],
version: libnm_glib_version,
dependencies: deps,
c_args: cflags + [
'-DNMRUNDIR="@0@"'.format(nm_pkgrundir),
],
c_args: cflags,
link_whole: libdeprecated_nm_glib,
link_args: [
'-Wl,--version-script,@0@'.format(linker_script),
@@ -225,7 +227,7 @@ pkg.generate(
)
if enable_introspection
gir_sources = sources + headers + libnm_glib_enum
gir_sources = libnm_glib_sources + headers + libnm_glib_enum
deps = [
dbus_glib_dep,

11
libnm-glib/tests/meson.build
View File

@@ -14,12 +14,13 @@ test_units = [
foreach test_unit: test_units
exe = executable(
test_unit,
[test_unit + '.c'] + shared_test_utils,
[test_unit + '.c'] + shared_nm_test_utils_impl_c,
dependencies: deps,
c_args: common_cflags + [
'-DNETWORKMANAGER_COMPILATION_TEST',
'-DTEST_NM_SERVICE="@0@"'.format(join_paths(meson.source_root(), 'tools', 'test-networkmanager-service.py')),
],
c_args:
common_cflags + [
'-DNETWORKMANAGER_COMPILATION_TEST',
] +
nm_build_cflags,
)
test(

5
libnm-util/meson.build
View File

@@ -55,7 +55,7 @@ libnm_utils_enum = gnome.mkenums(
install_dir: nm_pkgincludedir
)
sources = shared_utils + files(
sources = files(
'crypto.c',
'crypto_' + crypto + '.c',
'nm-connection.c',
@@ -90,6 +90,7 @@ sources = shared_utils + files(
'nm-utils.c',
'nm-value-transforms.c'
)
sources += shared_files_libnm_util
deps = [
crypto_dep,
@@ -101,7 +102,7 @@ deps = [
common_cflags = [
'-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_UTIL',
'-DLOCALEDIR="@0@"'.format(nm_localedir),
'-DNMLOCALEDIR="@0@"'.format(nm_localedir),
]
cflags = common_cflags + [

2
libnm-util/nm-utils.c
View File

@@ -232,7 +232,7 @@ nm_utils_init (GError **error)
if (!initialized) {
initialized = TRUE;
bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
bindtextdomain (GETTEXT_PACKAGE, NMLOCALEDIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
if (!crypto_init (error))

4
libnm-util/tests/meson.build
View File

@@ -6,10 +6,8 @@ deps = [
]
cflags = common_cflags + [
'-DBUILD_DIR="@0@"'.format(meson.current_build_dir()),
'-DTEST_CERT_DIR="@0@"'.format(test_cert_dir),
'-DNETWORKMANAGER_COMPILATION_TEST',
]
] + nm_build_cflags
test = 'test-libnm-linking'

2
libnm-util/tests/test-crypto.c
View File

@@ -33,6 +33,8 @@
#include "nm-utils/nm-test-utils.h"
#define TEST_CERT_DIR NM_BUILD_SRCDIR"/libnm-core/tests/certs"
#if 0
static const char *pem_rsa_key_begin = "-----BEGIN RSA PRIVATE KEY-----";
static const char *pem_rsa_key_end = "-----END RSA PRIVATE KEY-----";

3
libnm-util/tests/test-general.c
View File

@@ -2428,7 +2428,8 @@ test_libnm_linking (void)
int status;
GError *error = NULL;
g_spawn_sync (BUILD_DIR, argv, NULL, 0 /*G_SPAWN_DEFAULT*/,
g_spawn_sync (NM_BUILD_BUILDDIR"/libnm-util/tests",
argv, NULL, 0 /*G_SPAWN_DEFAULT*/,
_test_libnm_linking_setup_child_process, NULL,
&out, &err, &status, &error);
g_assert_no_error (error);

3
libnm-util/tests/test-secrets.c
View File

@@ -39,7 +39,8 @@
#include "nm-utils/nm-test-utils.h"
#define TEST_NEED_SECRETS_EAP_TLS_CA_CERT TEST_CERT_DIR "/test_ca_cert.pem"
#define TEST_CERT_DIR NM_BUILD_SRCDIR"/libnm-core/tests/certs"
#define TEST_NEED_SECRETS_EAP_TLS_CA_CERT TEST_CERT_DIR "/test_ca_cert.pem"
#define TEST_NEED_SECRETS_EAP_TLS_CLIENT_CERT TEST_CERT_DIR "/test_key_and_cert.pem"
#define TEST_NEED_SECRETS_EAP_TLS_PRIVATE_KEY TEST_CERT_DIR "/test_key_and_cert.pem"

2
libnm-util/tests/test-setting-8021x.c
View File

@@ -29,6 +29,8 @@
#include "nm-utils/nm-test-utils.h"
#define TEST_CERT_DIR NM_BUILD_SRCDIR"/libnm-core/tests/certs"
static void
compare_blob_data (const char *test,
const char *key_path,

1
libnm/meson.build
View File

@@ -10,7 +10,6 @@ deps = [
cflags = [
'-DG_LOG_DOMAIN="@0@"'.format(libnm_name),
'-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM',
'-DNMRUNDIR="@0@"'.format(nm_pkgrundir)
]
if have_fake_typelibs

30
libnm/tests/meson.build
View File

@@ -1,28 +1,28 @@
test_units = [
['test-general', shared_utils, [libnm_utils]],
['test-nm-client', shared_test_utils, []],
['test-remote-settings-client', shared_test_utils, []],
['test-secret-agent', shared_test_utils, []]
]
deps = [
libnm_dep,
nm_core_dep
['test-general', [libnm_utils, libnm_core]],
['test-nm-client', []],
['test-remote-settings-client', []],
['test-secret-agent', []],
]
cflags = [
'-DNETWORKMANAGER_COMPILATION_TEST',
'-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM',
'-DTEST_NM_SERVICE="@0@"'.format(join_paths(meson.source_root(), 'tools', 'test-networkmanager-service.py'))
]
] + nm_build_cflags
foreach test_unit: test_units
exe = executable(
'libnm-' + test_unit[0],
[test_unit[0] + '.c'] + test_unit[1],
dependencies: deps,
[
test_unit[0] + '.c',
shared_nm_test_utils_impl_c,
],
dependencies: [
libnm_dep,
nm_core_dep,
],
c_args: cflags,
link_with: test_unit[2]
link_with: test_unit[1]
)
test(
@@ -35,7 +35,7 @@ endforeach
# just test, that we can build "nm-vpn-plugin-utils.c"
libnm_vpn_plugin_utils_test = static_library(
'nm-vpn-plugin-utils-test',
sources: shared_vpn_plugin_utils + [libnm_enum[1]],
sources: shared_nm_utils_nm_vpn_plugin_utils_c + [libnm_enum[1]],
include_directories: libnm_inc,
dependencies: nm_core_dep,
c_args: cflags

5
meson.build
View File

@@ -54,6 +54,11 @@ nm_pkgstatedir = join_paths(nm_localstatedir, nm_name)
nm_vpndir = join_paths(nm_libdir, nm_name)
nm_plugindir = join_paths(nm_libdir, nm_name, dist_version)
nm_build_cflags = [
'-DNM_BUILD_SRCDIR="@0@"'.format(meson.source_root()),
'-DNM_BUILD_BUILDDIR="@0@"'.format(meson.build_root()),
]
libnm_name = 'libnm'
current = 1

82
shared/meson.build
View File

@@ -1,70 +1,78 @@
shared_c_list_dep = declare_dependency(
include_directories: include_directories('c-list/src')
)
shared_inc = include_directories('.')
shared_c_siphash = static_library(
'c-siphash',
sources: ['c-siphash/src/c-siphash.c']
sources: 'c-siphash/src/c-siphash.c',
)
shared_c_siphash_dep = declare_dependency(
include_directories: include_directories('c-siphash/src'),
link_with: shared_c_siphash
include_directories: shared_inc,
link_with: shared_c_siphash,
)
shared_n_acd = static_library(
'n-acd',
sources: ['n-acd/src/n-acd.c'],
dependencies: [ shared_c_siphash_dep, shared_c_list_dep ]
sources: 'n-acd/src/n-acd.c',
include_directories: [
include_directories('c-siphash/src'),
include_directories('c-list/src'),
],
dependencies: shared_c_siphash_dep,
)
shared_n_acd_dep = declare_dependency(
include_directories: include_directories('.'),
include_directories: shared_inc,
link_with: shared_n_acd,
)
shared_inc = include_directories('.')
version_conf = configuration_data()
version_conf.set('NM_MAJOR_VERSION', nm_major_version)
version_conf.set('NM_MINOR_VERSION', nm_minor_version)
version_conf.set('NM_MICRO_VERSION', nm_micro_version)
version = 'nm-version-macros.h'
version_header = configure_file(
input: version + '.in',
output: version,
configuration: version_conf
input: 'nm-version-macros.h.in',
output: 'nm-version-macros.h',
configuration: version_conf,
)
shared_meta_setting = files('nm-meta-setting.c')
shared_nm_utils_nm_meta_setting_c = files('nm-meta-setting.c')
shared_test_utils = files('nm-test-utils-impl.c')
shared_nm_test_utils_impl_c = files('nm-test-utils-impl.c')
shared_siphash = files('nm-utils/siphash24.c')
shared_nm_utils_nm_vpn_plugin_utils_c = files('nm-utils/nm-vpn-plugin-utils.c')
shared_udev_utils = files('nm-utils/nm-udev-utils.c')
shared_files_libnm_core = files('''
c-siphash/src/c-siphash.c
nm-utils/c-list-util.c
nm-utils/nm-dedup-multi.c
nm-utils/nm-enum-utils.c
nm-utils/nm-hash-utils.c
nm-utils/nm-random-utils.c
nm-utils/nm-shared-utils.c
nm-utils/nm-udev-utils.c
'''.split())
shared_utils = files(
'nm-utils/nm-enum-utils.c',
'nm-utils/nm-hash-utils.c',
'nm-utils/nm-random-utils.c',
'nm-utils/nm-shared-utils.c'
)
shared_files_clients_common = files('''
c-siphash/src/c-siphash.c
nm-utils/nm-enum-utils.c
nm-utils/nm-hash-utils.c
nm-utils/nm-random-utils.c
nm-utils/nm-shared-utils.c
'''.split())
shared_vpn_plugin_utils = files('nm-utils/nm-vpn-plugin-utils.c')
shared_files_libnm_util = files('''
nm-utils/nm-shared-utils.c
'''.split())
shared_sources = shared_utils + shared_meta_setting + shared_udev_utils + files(
'nm-utils/c-list-util.c',
'nm-utils/nm-dedup-multi.c'
)
shared_files_libnm_glib = files('''
nm-utils/nm-udev-utils.c
'''.split())
shared_dep = declare_dependency(
include_directories: [
top_inc,
shared_inc,
include_directories('nm-utils')
],
dependencies: glib_dep
include_directories: [
top_inc,
shared_inc,
],
dependencies: glib_dep,
)

10
shared/nm-test-utils-impl.c
View File

@@ -28,6 +28,8 @@
#include "nm-test-libnm-utils.h"
#define NMTSTC_NM_SERVICE NM_BUILD_SRCDIR"/tools/test-networkmanager-service.py"
/*****************************************************************************/
static gboolean
@@ -116,7 +118,7 @@ nmtstc_service_available (NMTstcServiceInfo *info)
/* This happens, when test-networkmanager-service.py exits with 77 status
* code. */
m = g_strdup_printf ("missing dependency for running NetworkManager stub service %s", TEST_NM_SERVICE);
m = g_strdup_printf ("missing dependency for running NetworkManager stub service %s", NMTSTC_NM_SERVICE);
g_test_skip (m);
return NULL;
}
@@ -125,7 +127,7 @@ NMTstcServiceInfo *
nmtstc_service_init (void)
{
NMTstcServiceInfo *info;
const char *args[] = { TEST_NM_PYTHON, TEST_NM_SERVICE, NULL };
const char *args[] = { TEST_NM_PYTHON, NMTSTC_NM_SERVICE, NULL };
GError *error = NULL;
info = g_malloc0 (sizeof (*info));
@@ -170,7 +172,7 @@ nmtstc_service_init (void)
g_main_context_unref (context);
if (had_timeout)
g_error ("test service %s did not start in time", TEST_NM_SERVICE);
g_error ("test service %s did not start in time", NMTSTC_NM_SERVICE);
if (!data.name_found) {
g_assert (data.exited);
info->pid = NM_PID_T_INVAL;
@@ -184,7 +186,7 @@ nmtstc_service_init (void)
* via pygobject. */
return NULL;
}
g_error ("test service %s exited with error code %d", TEST_NM_SERVICE, data.exit_code);
g_error ("test service %s exited with error code %d", NMTSTC_NM_SERVICE, data.exit_code);
}
}

16
shared/nm-utils/nm-hash-utils.c
View File

@@ -28,8 +28,6 @@
#include "nm-shared-utils.h"
#include "nm-random-utils.h"
#include "siphash24.c"
/*****************************************************************************/
#define HASH_KEY_SIZE 16u
@@ -49,7 +47,7 @@ _get_hash_key_init (void)
} g_arr _nm_alignas (guint64);
static gsize g_lock;
const guint8 *g;
struct siphash siph_state;
CSipHash siph_state;
uint64_t h;
guint *p;
@@ -66,9 +64,9 @@ _get_hash_key_init (void)
/* use siphash() of the key-size, to mangle the first guint. Otherwise,
* the first guint has only the entropy that nm_utils_random_bytes()
* generated for the first 4 bytes and relies on a good random generator. */
siphash24_init (&siph_state, g_arr.v8);
siphash24_compress (g_arr.v8, sizeof (g_arr.v8), &siph_state);
h = siphash24_finalize (&siph_state);
c_siphash_init (&siph_state, g_arr.v8);
c_siphash_append (&siph_state, g_arr.v8, sizeof (g_arr.v8));
h = c_siphash_finalize (&siph_state);
p = (guint *) g_arr.v8;
if (sizeof (guint) < sizeof (h))
*p = *p ^ ((guint) (h & 0xFFFFFFFFu)) ^ ((guint) (h >> 32));
@@ -97,10 +95,10 @@ guint
nm_hash_static (guint static_seed)
{
/* note that we only xor the static_seed with the key.
* We don't use siphash24(), which would mix the bits better.
* We don't use siphash, which would mix the bits better.
* Note that this doesn't matter, because static_seed is not
* supposed to be a value that you are hashing (for that, use
* full siphash24()).
* full siphash).
* Instead, different callers may set a different static_seed
* so that nm_hash_str(NULL) != nm_hash_ptr(NULL).
*
@@ -121,7 +119,7 @@ nm_hash_init (NMHashState *state, guint static_seed)
g = _get_hash_key ();
memcpy (seed, g, HASH_KEY_SIZE);
seed[0] ^= static_seed;
siphash24_init (&state->_state, (const guint8 *) seed);
c_siphash_init (&state->_state, (const guint8 *) seed);
}
guint

10
shared/nm-utils/nm-hash-utils.h
View File

@@ -22,11 +22,11 @@
#ifndef __NM_HASH_UTILS_H__
#define __NM_HASH_UTILS_H__
#include "siphash24.h"
#include "c-siphash/src/c-siphash.h"
#include "nm-macros-internal.h"
struct _NMHashState {
struct siphash _state;
CSipHash _state;
};
typedef struct _NMHashState NMHashState;
@@ -42,7 +42,7 @@ nm_hash_complete (NMHashState *state)
nm_assert (state);
h = siphash24_finalize (&state->_state);
h = c_siphash_finalize (&state->_state);
/* we don't ever want to return a zero hash.
*
@@ -57,7 +57,7 @@ nm_hash_update (NMHashState *state, const void *ptr, gsize n)
nm_assert (ptr);
nm_assert (n > 0);
siphash24_compress (ptr, n, &state->_state);
c_siphash_append (&state->_state, ptr, n);
}
#define nm_hash_update_val(state, val) \
@@ -168,7 +168,7 @@ nm_hash_update_mem (NMHashState *state, const void *ptr, gsize n)
* instead. */
nm_hash_update (state, &n, sizeof (n));
if (n > 0)
siphash24_compress (ptr, n, &state->_state);
c_siphash_append (&state->_state, ptr, n);
}
static inline void

204
shared/nm-utils/siphash24.c
View File

@@ -1,204 +0,0 @@
/*
SipHash reference C implementation
Written in 2012 by
Jean-Philippe Aumasson <jeanphilippe.aumasson@gmail.com>
Daniel J. Bernstein <djb@cr.yp.to>
To the extent possible under law, the author(s) have dedicated all copyright
and related and neighboring rights to this software to the public domain
worldwide. This software is distributed without any warranty.
You should have received a copy of the CC0 Public Domain Dedication along with
this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
(Minimal changes made by Lennart Poettering, to make clean for inclusion in systemd)
(Refactored by Tom Gundersen to split up in several functions and follow systemd
coding style)
*/
#include "nm-default.h"
#define assert(cond) nm_assert (cond)
#define _fallthrough_ _nm_fallthrough
#include <stdio.h>
#include "siphash24.h"
#include "unaligned.h"
static inline uint64_t rotate_left(uint64_t x, uint8_t b) {
assert(b < 64);
return (x << b) | (x >> (64 - b));
}
static inline void sipround(struct siphash *state) {
assert(state);
state->v0 += state->v1;
state->v1 = rotate_left(state->v1, 13);
state->v1 ^= state->v0;
state->v0 = rotate_left(state->v0, 32);
state->v2 += state->v3;
state->v3 = rotate_left(state->v3, 16);
state->v3 ^= state->v2;
state->v0 += state->v3;
state->v3 = rotate_left(state->v3, 21);
state->v3 ^= state->v0;
state->v2 += state->v1;
state->v1 = rotate_left(state->v1, 17);
state->v1 ^= state->v2;
state->v2 = rotate_left(state->v2, 32);
}
void siphash24_init(struct siphash *state, const uint8_t k[16]) {
uint64_t k0, k1;
assert(state);
assert(k);
k0 = unaligned_read_le64(k);
k1 = unaligned_read_le64(k + 8);
*state = (struct siphash) {
/* "somepseudorandomlygeneratedbytes" */
.v0 = 0x736f6d6570736575ULL ^ k0,
.v1 = 0x646f72616e646f6dULL ^ k1,
.v2 = 0x6c7967656e657261ULL ^ k0,
.v3 = 0x7465646279746573ULL ^ k1,
.padding = 0,
.inlen = 0,
};
}
void siphash24_compress(const void *_in, size_t inlen, struct siphash *state) {
const uint8_t *in = _in;
const uint8_t *end = in + inlen;
size_t left = state->inlen & 7;
uint64_t m;
assert(in);
assert(state);
/* Update total length */
state->inlen += inlen;
/* If padding exists, fill it out */
if (left > 0) {
for ( ; in < end && left < 8; in ++, left ++)
state->padding |= ((uint64_t) *in) << (left * 8);
if (in == end && left < 8)
/* We did not have enough input to fill out the padding completely */
return;
#ifdef DEBUG
printf("(%3zu) v0 %08x %08x\n", state->inlen, (uint32_t) (state->v0 >> 32), (uint32_t) state->v0);
printf("(%3zu) v1 %08x %08x\n", state->inlen, (uint32_t) (state->v1 >> 32), (uint32_t) state->v1);
printf("(%3zu) v2 %08x %08x\n", state->inlen, (uint32_t) (state->v2 >> 32), (uint32_t) state->v2);
printf("(%3zu) v3 %08x %08x\n", state->inlen, (uint32_t) (state->v3 >> 32), (uint32_t) state->v3);
printf("(%3zu) compress padding %08x %08x\n", state->inlen, (uint32_t) (state->padding >> 32), (uint32_t)state->padding);
#endif
state->v3 ^= state->padding;
sipround(state);
sipround(state);
state->v0 ^= state->padding;
state->padding = 0;
}
end -= (state->inlen % sizeof(uint64_t));
for ( ; in < end; in += 8) {
m = unaligned_read_le64(in);
#ifdef DEBUG
printf("(%3zu) v0 %08x %08x\n", state->inlen, (uint32_t) (state->v0 >> 32), (uint32_t) state->v0);
printf("(%3zu) v1 %08x %08x\n", state->inlen, (uint32_t) (state->v1 >> 32), (uint32_t) state->v1);
printf("(%3zu) v2 %08x %08x\n", state->inlen, (uint32_t) (state->v2 >> 32), (uint32_t) state->v2);
printf("(%3zu) v3 %08x %08x\n", state->inlen, (uint32_t) (state->v3 >> 32), (uint32_t) state->v3);
printf("(%3zu) compress %08x %08x\n", state->inlen, (uint32_t) (m >> 32), (uint32_t) m);
#endif
state->v3 ^= m;
sipround(state);
sipround(state);
state->v0 ^= m;
}
left = state->inlen & 7;
switch (left) {
case 7:
state->padding |= ((uint64_t) in[6]) << 48;
_fallthrough_;
case 6:
state->padding |= ((uint64_t) in[5]) << 40;
_fallthrough_;
case 5:
state->padding |= ((uint64_t) in[4]) << 32;
_fallthrough_;
case 4:
state->padding |= ((uint64_t) in[3]) << 24;
_fallthrough_;
case 3:
state->padding |= ((uint64_t) in[2]) << 16;
_fallthrough_;
case 2:
state->padding |= ((uint64_t) in[1]) << 8;
_fallthrough_;
case 1:
state->padding |= ((uint64_t) in[0]);
_fallthrough_;
case 0:
break;
}
}
uint64_t siphash24_finalize(struct siphash *state) {
uint64_t b;
assert(state);
b = state->padding | (((uint64_t) state->inlen) << 56);
#ifdef DEBUG
printf("(%3zu) v0 %08x %08x\n", state->inlen, (uint32_t) (state->v0 >> 32), (uint32_t) state->v0);
printf("(%3zu) v1 %08x %08x\n", state->inlen, (uint32_t) (state->v1 >> 32), (uint32_t) state->v1);
printf("(%3zu) v2 %08x %08x\n", state->inlen, (uint32_t) (state->v2 >> 32), (uint32_t) state->v2);
printf("(%3zu) v3 %08x %08x\n", state->inlen, (uint32_t) (state->v3 >> 32), (uint32_t) state->v3);
printf("(%3zu) padding %08x %08x\n", state->inlen, (uint32_t) (state->padding >> 32), (uint32_t) state->padding);
#endif
state->v3 ^= b;
sipround(state);
sipround(state);
state->v0 ^= b;
#ifdef DEBUG
printf("(%3zu) v0 %08x %08x\n", state->inlen, (uint32_t) (state->v0 >> 32), (uint32_t) state->v0);
printf("(%3zu) v1 %08x %08x\n", state->inlen, (uint32_t) (state->v1 >> 32), (uint32_t) state->v1);
printf("(%3zu) v2 %08x %08x\n", state->inlen, (uint32_t) (state->v2 >> 32), (uint32_t) state->v2);
printf("(%3zu) v3 %08x %08x\n", state->inlen, (uint32_t) (state->v3 >> 32), (uint32_t) state->v3);
#endif
state->v2 ^= 0xff;
sipround(state);
sipround(state);
sipround(state);
sipround(state);
return state->v0 ^ state->v1 ^ state->v2 ^ state->v3;
}
uint64_t siphash24(const void *in, size_t inlen, const uint8_t k[16]) {
struct siphash state;
assert(in);
assert(k);
siphash24_init(&state, k);
siphash24_compress(in, inlen, &state);
return siphash24_finalize(&state);
}

23
shared/nm-utils/siphash24.h
View File

@@ -1,23 +0,0 @@
#pragma once
#include <inttypes.h>
#include <stddef.h>
#include <stdint.h>
#include <sys/types.h>
struct siphash {
uint64_t v0;
uint64_t v1;
uint64_t v2;
uint64_t v3;
uint64_t padding;
size_t inlen;
};
void siphash24_init(struct siphash *state, const uint8_t k[16]);
void siphash24_compress(const void *in, size_t inlen, struct siphash *state);
#define siphash24_compress_byte(byte, state) siphash24_compress((const uint8_t[]) { (byte) }, 1, (state))
uint64_t siphash24_finalize(struct siphash *state);
uint64_t siphash24(const void *in, size_t inlen, const uint8_t k[16]);

2
src/dhcp/tests/meson.build
View File

@@ -8,7 +8,7 @@ foreach test_unit: test_units
test_unit,
test_unit + '.c',
dependencies: test_nm_dep,
c_args: '-DTESTDIR="@0@"'.format(meson.current_source_dir())
c_args: nm_build_cflags,
)
test(

6
src/dhcp/tests/test-dhcp-dhclient.c
View File

@@ -36,6 +36,8 @@
#include "nm-test-utils-core.h"
#define TEST_DIR NM_BUILD_SRCDIR"/src/dhcp/tests"
static void
test_config (const char *orig,
const char *expected,
@@ -736,7 +738,7 @@ test_read_duid_from_leasefile (void)
gconstpointer duid_arr;
gsize duid_len;
duid = nm_dhcp_dhclient_read_duid (TESTDIR "/test-dhclient-duid.leases", &error);
duid = nm_dhcp_dhclient_read_duid (TEST_DIR"/test-dhclient-duid.leases", &error);
g_assert_no_error (error);
g_assert (duid);
duid_arr = g_bytes_get_data (duid, &duid_len);
@@ -750,7 +752,7 @@ test_read_commented_duid_from_leasefile (void)
GBytes *duid;
GError *error = NULL;
duid = nm_dhcp_dhclient_read_duid (TESTDIR "/test-dhclient-commented-duid.leases", &error);
duid = nm_dhcp_dhclient_read_duid (TEST_DIR"/test-dhclient-commented-duid.leases", &error);
g_assert_no_error (error);
g_assert (duid == NULL);
}

1
src/dnsmasq/tests/meson.build
View File

@@ -4,7 +4,6 @@ exe = executable(
test_unit,
test_unit + '.c',
dependencies: test_nm_dep,
c_args: '-DTESTDIR="@0@"'.format(meson.source_root())
)
test(

7
src/settings/plugins/ibft/tests/meson.build
View File

@@ -2,16 +2,11 @@ test_unit = 'test-ibft'
test_ibft_dir = meson.current_source_dir()
cflags = [
'-DTEST_IBFT_DIR="@0@"'.format(test_ibft_dir),
'-DTEST_SCRATCH_DIR="@0@"'.format(test_ibft_dir)
]
exe = executable(
test_unit,
test_unit + '.c',
dependencies: test_nm_dep,
c_args: cflags,
c_args: nm_build_cflags,
link_with: libnms_ibft_core
)

20
src/settings/plugins/ibft/tests/test-ibft.c
View File

@@ -36,6 +36,8 @@
#include "nm-test-utils-core.h"
#define TEST_DIR NM_BUILD_SRCDIR"/src/settings/plugins/ibft/tests"
static GPtrArray *
read_block (const char *iscsiadm_path, const char *expected_mac)
{
@@ -78,7 +80,7 @@ test_read_ibft_dhcp (void)
const char *expected_mac_address = "00:33:21:98:b9:f1";
GPtrArray *block;
block = read_block (TEST_IBFT_DIR "/iscsiadm-test-dhcp", expected_mac_address);
block = read_block (TEST_DIR "/iscsiadm-test-dhcp", expected_mac_address);
connection = nms_ibft_reader_get_connection_from_block (block, &error);
g_assert_no_error (error);
@@ -125,7 +127,7 @@ test_read_ibft_static (void)
NMIPAddress *ip4_addr;
GPtrArray *block;
block = read_block (TEST_IBFT_DIR "/iscsiadm-test-static", expected_mac_address);
block = read_block (TEST_DIR "/iscsiadm-test-static", expected_mac_address);
connection = nms_ibft_reader_get_connection_from_block (block, &error);
g_assert_no_error (error);
@@ -227,7 +229,7 @@ test_read_ibft_vlan (void)
GError *error = NULL;
GPtrArray *block;
block = read_block (TEST_IBFT_DIR "/iscsiadm-test-vlan", expected_mac_address);
block = read_block (TEST_DIR "/iscsiadm-test-vlan", expected_mac_address);
connection = nms_ibft_reader_get_connection_from_block (block, &error);
g_assert_no_error (error);
@@ -280,12 +282,12 @@ int main (int argc, char **argv)
g_test_add_func (TPATH "ibft/dhcp", test_read_ibft_dhcp);
g_test_add_func (TPATH "ibft/static", test_read_ibft_static);
g_test_add_func (TPATH "ibft/vlan", test_read_ibft_vlan);
g_test_add_data_func (TPATH "ibft/bad-record-read", TEST_IBFT_DIR "/iscsiadm-test-bad-record", test_read_ibft_malformed);
g_test_add_data_func (TPATH "ibft/bad-entry-read", TEST_IBFT_DIR "/iscsiadm-test-bad-entry", test_read_ibft_malformed);
g_test_add_data_func (TPATH "ibft/bad-ipaddr-read", TEST_IBFT_DIR "/iscsiadm-test-bad-ipaddr", test_read_ibft_bad_address);
g_test_add_data_func (TPATH "ibft/bad-gateway-read", TEST_IBFT_DIR "/iscsiadm-test-bad-gateway", test_read_ibft_bad_address);
g_test_add_data_func (TPATH "ibft/bad-dns1-read", TEST_IBFT_DIR "/iscsiadm-test-bad-dns1", test_read_ibft_bad_address);
g_test_add_data_func (TPATH "ibft/bad-dns2-read", TEST_IBFT_DIR "/iscsiadm-test-bad-dns2", test_read_ibft_bad_address);
g_test_add_data_func (TPATH "ibft/bad-record-read", TEST_DIR "/iscsiadm-test-bad-record", test_read_ibft_malformed);
g_test_add_data_func (TPATH "ibft/bad-entry-read", TEST_DIR "/iscsiadm-test-bad-entry", test_read_ibft_malformed);
g_test_add_data_func (TPATH "ibft/bad-ipaddr-read", TEST_DIR "/iscsiadm-test-bad-ipaddr", test_read_ibft_bad_address);
g_test_add_data_func (TPATH "ibft/bad-gateway-read", TEST_DIR "/iscsiadm-test-bad-gateway", test_read_ibft_bad_address);
g_test_add_data_func (TPATH "ibft/bad-dns1-read", TEST_DIR "/iscsiadm-test-bad-dns1", test_read_ibft_bad_address);
g_test_add_data_func (TPATH "ibft/bad-dns2-read", TEST_DIR "/iscsiadm-test-bad-dns2", test_read_ibft_bad_address);
return g_test_run ();
}

7
src/settings/plugins/ifcfg-rh/tests/meson.build
View File

@@ -2,16 +2,11 @@ test_unit = 'test-ifcfg-rh'
test_ifcfg_dir = meson.current_source_dir()
cflags = [
'-DTEST_IFCFG_DIR="@0@"'.format(test_ifcfg_dir),
'-DTEST_SCRATCH_DIR="@0@"'.format(test_ifcfg_dir)
]
exe = executable(
test_unit,
test_unit + '.c',
dependencies: test_nm_dep,
c_args: cflags,
c_args: nm_build_cflags,
link_with: libnms_ifcfg_rh_core
)

490
src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
View File

File diff suppressed because it is too large Load Diff

4
src/settings/plugins/ifupdown/tests/meson.build
View File

@@ -1,12 +1,10 @@
test_unit = 'test-ifupdown'
cflags = '-DTEST_ENI_DIR="@0@"'.format(meson.current_source_dir())
exe = executable(
test_unit,
test_unit + '.c',
dependencies: test_nm_dep,
c_args: cflags,
c_args: nm_build_cflags,
link_with: libnms_ifupdown_core
)

44
src/settings/plugins/ifupdown/tests/test-ifupdown.c
View File

@@ -29,6 +29,10 @@
#include "nm-test-utils-core.h"
#define TEST_DIR NM_BUILD_SRCDIR"/src/settings/plugins/ifupdown/tests"
/*****************************************************************************/
typedef struct {
char *key;
char *data;
@@ -659,45 +663,45 @@ main (int argc, char **argv)
if (0)
dump_blocks ();
g_test_add_data_func ("/ifupdate/ignore_line_before_first_block", TEST_ENI_DIR,
g_test_add_data_func ("/ifupdate/ignore_line_before_first_block", TEST_DIR,
(GTestDataFunc) test1_ignore_line_before_first_block);
g_test_add_data_func ("/ifupdate/wrapped_line", TEST_ENI_DIR,
g_test_add_data_func ("/ifupdate/wrapped_line", TEST_DIR,
(GTestDataFunc) test2_wrapped_line);
g_test_add_data_func ("/ifupdate/wrapped_multiline_multiarg", TEST_ENI_DIR,
g_test_add_data_func ("/ifupdate/wrapped_multiline_multiarg", TEST_DIR,
(GTestDataFunc) test3_wrapped_multiline_multiarg);
g_test_add_data_func ("/ifupdate/allow_auto_is_auto", TEST_ENI_DIR,
g_test_add_data_func ("/ifupdate/allow_auto_is_auto", TEST_DIR,
(GTestDataFunc) test4_allow_auto_is_auto);
g_test_add_data_func ("/ifupdate/allow_auto_multiarg", TEST_ENI_DIR,
g_test_add_data_func ("/ifupdate/allow_auto_multiarg", TEST_DIR,
(GTestDataFunc) test5_allow_auto_multiarg);
g_test_add_data_func ("/ifupdate/mixed_whitespace", TEST_ENI_DIR,
g_test_add_data_func ("/ifupdate/mixed_whitespace", TEST_DIR,
(GTestDataFunc) test6_mixed_whitespace);
g_test_add_data_func ("/ifupdate/long_line", TEST_ENI_DIR,
g_test_add_data_func ("/ifupdate/long_line", TEST_DIR,
(GTestDataFunc) test7_long_line);
g_test_add_data_func ("/ifupdate/long_line_wrapped", TEST_ENI_DIR,
g_test_add_data_func ("/ifupdate/long_line_wrapped", TEST_DIR,
(GTestDataFunc) test8_long_line_wrapped);
g_test_add_data_func ("/ifupdate/wrapped_lines_in_block", TEST_ENI_DIR,
g_test_add_data_func ("/ifupdate/wrapped_lines_in_block", TEST_DIR,
(GTestDataFunc) test9_wrapped_lines_in_block);
g_test_add_data_func ("/ifupdate/complex_wrap", TEST_ENI_DIR,
g_test_add_data_func ("/ifupdate/complex_wrap", TEST_DIR,
(GTestDataFunc) test11_complex_wrap);
g_test_add_data_func ("/ifupdate/complex_wrap_split_word", TEST_ENI_DIR,
g_test_add_data_func ("/ifupdate/complex_wrap_split_word", TEST_DIR,
(GTestDataFunc) test12_complex_wrap_split_word);
g_test_add_data_func ("/ifupdate/more_mixed_whitespace", TEST_ENI_DIR,
g_test_add_data_func ("/ifupdate/more_mixed_whitespace", TEST_DIR,
(GTestDataFunc) test13_more_mixed_whitespace);
g_test_add_data_func ("/ifupdate/mixed_whitespace_block_start", TEST_ENI_DIR,
g_test_add_data_func ("/ifupdate/mixed_whitespace_block_start", TEST_DIR,
(GTestDataFunc) test14_mixed_whitespace_block_start);
g_test_add_data_func ("/ifupdate/trailing_space", TEST_ENI_DIR,
g_test_add_data_func ("/ifupdate/trailing_space", TEST_DIR,
(GTestDataFunc) test15_trailing_space);
g_test_add_data_func ("/ifupdate/missing_newline", TEST_ENI_DIR,
g_test_add_data_func ("/ifupdate/missing_newline", TEST_DIR,
(GTestDataFunc) test16_missing_newline);
g_test_add_data_func ("/ifupdate/read_static_ipv4", TEST_ENI_DIR,
g_test_add_data_func ("/ifupdate/read_static_ipv4", TEST_DIR,
(GTestDataFunc) test17_read_static_ipv4);
g_test_add_data_func ("/ifupdate/read_static_ipv6", TEST_ENI_DIR,
g_test_add_data_func ("/ifupdate/read_static_ipv6", TEST_DIR,
(GTestDataFunc) test18_read_static_ipv6);
g_test_add_data_func ("/ifupdate/read_static_ipv4_plen", TEST_ENI_DIR,
g_test_add_data_func ("/ifupdate/read_static_ipv4_plen", TEST_DIR,
(GTestDataFunc) test19_read_static_ipv4_plen);
g_test_add_data_func ("/ifupdate/source_stanza", TEST_ENI_DIR,
g_test_add_data_func ("/ifupdate/source_stanza", TEST_DIR,
(GTestDataFunc) test20_source_stanza);
g_test_add_data_func ("/ifupdate/source_dir_stanza", TEST_ENI_DIR,
g_test_add_data_func ("/ifupdate/source_dir_stanza", TEST_DIR,
(GTestDataFunc) test21_source_dir_stanza);
return g_test_run ();

7
src/settings/plugins/keyfile/tests/meson.build
View File

@@ -2,16 +2,11 @@ test_unit = 'test-keyfile'
test_keyfiles_dir = join_paths(meson.current_source_dir(), 'keyfiles')
cflags = [
'-DTEST_KEYFILES_DIR="@0@"'.format(test_keyfiles_dir),
'-DTEST_SCRATCH_DIR="@0@"'.format(test_keyfiles_dir)
]
exe = executable(
test_unit,
test_unit + '.c',
dependencies: test_nm_dep,
c_args: cflags
c_args: nm_build_cflags,
)
test(

3
src/settings/plugins/keyfile/tests/test-keyfile.c
View File

@@ -37,6 +37,9 @@
#include "nm-test-utils-core.h"
#define TEST_KEYFILES_DIR NM_BUILD_SRCDIR"/src/settings/plugins/keyfile/tests/keyfiles"
#define TEST_SCRATCH_DIR NM_BUILD_BUILDDIR"/src/settings/plugins/keyfile/tests/keyfiles"
/*****************************************************************************/
static void

2
src/supplicant/tests/meson.build
View File

@@ -4,7 +4,7 @@ exe = executable(
test_unit,
test_unit + '.c',
dependencies: test_nm_dep,
c_args: '-DTEST_CERT_DIR="@0@"'.format(join_paths(meson.current_source_dir(), 'certs'))
c_args: nm_build_cflags,
)
test(

4
src/supplicant/tests/test-supplicant-config.c
View File

@@ -37,6 +37,10 @@
#include "nm-test-utils-core.h"
#define TEST_CERT_DIR NM_BUILD_SRCDIR"/src/supplicant/tests/certs"
/*****************************************************************************/
static gboolean
validate_opt (const char *detail,
GVariant *config,

3
src/systemd/sd-adapt/unaligned.h Normal file
View File

@@ -0,0 +1,3 @@
#pragma once
#include "nm-utils/unaligned.h"

53
src/systemd/src/basic/siphash24.h Normal file
View File

@@ -0,0 +1,53 @@
#pragma once
#include <inttypes.h>
#include <stddef.h>
#include <stdint.h>
#include <sys/types.h>
#if 0 /* NM_IGNORED */
struct siphash {
uint64_t v0;
uint64_t v1;
uint64_t v2;
uint64_t v3;
uint64_t padding;
size_t inlen;
};
#else /* NM_IGNORED */
struct siphash {
CSipHash _csiphash;
};
static inline void
siphash24_init (struct siphash *state, const uint8_t k[16])
{
c_siphash_init ((CSipHash *) state, k);
}
static inline void
siphash24_compress (const void *in, size_t inlen, struct siphash *state)
{
c_siphash_append ((CSipHash *) state, in, inlen);
}
static inline uint64_t
siphash24_finalize (struct siphash *state)
{
return c_siphash_finalize ((CSipHash *) state);
}
static inline uint64_t
siphash24 (const void *in, size_t inlen, const uint8_t k[16])
{
return c_siphash_hash (k, in, inlen);
}
#endif /* NM_IGNORED */
void siphash24_init(struct siphash *state, const uint8_t k[16]);
void siphash24_compress(const void *in, size_t inlen, struct siphash *state);
#define siphash24_compress_byte(byte, state) siphash24_compress((const uint8_t[]) { (byte) }, 1, (state))
uint64_t siphash24_finalize(struct siphash *state);
uint64_t siphash24(const void *in, size_t inlen, const uint8_t k[16]);

7
src/tests/config/meson.build
View File

@@ -7,16 +7,11 @@ sources = files(
test_config_dir = meson.current_source_dir()
cflags = [
'-DSRCDIR="@0@"'.format(test_config_dir),
'-DBUILDDIR="@0@"'.format(test_config_dir)
]
exe = executable(
test_unit,
sources,
dependencies: test_nm_dep,
c_args: cflags
c_args: nm_build_cflags,
)
test(

55
src/tests/config/test-config.c
View File

@@ -30,6 +30,9 @@
#include "nm-test-utils-core.h"
#define TEST_DIR NM_BUILD_SRCDIR"/src/tests/config"
#define BUILD_DIR NM_BUILD_BUILDDIR"/src/tests/config"
/*****************************************************************************/
static void
@@ -133,9 +136,9 @@ test_config_simple (void)
gs_unref_object NMDevice *dev51 = nm_test_device_new ("00:00:00:00:00:51");
gs_unref_object NMDevice *dev52 = nm_test_device_new ("00:00:00:00:00:52");
config = setup_config (NULL, SRCDIR "/NetworkManager.conf", "", NULL, "/no/such/dir", "", NULL);
config = setup_config (NULL, TEST_DIR "/NetworkManager.conf", "", NULL, "/no/such/dir", "", NULL);
g_assert_cmpstr (nm_config_data_get_config_main_file (nm_config_get_data_orig (config)), ==, SRCDIR "/NetworkManager.conf");
g_assert_cmpstr (nm_config_data_get_config_main_file (nm_config_get_data_orig (config)), ==, TEST_DIR "/NetworkManager.conf");
g_assert_cmpstr (_config_get_dhcp_client_a (config), ==, "dhclient");
g_assert_cmpstr (nm_config_get_log_level (config), ==, "INFO");
g_assert_cmpint (nm_config_data_get_connectivity_interval (nm_config_get_data_orig (config)), ==, 100);
@@ -206,7 +209,7 @@ test_config_non_existent (void)
{
GError *error = NULL;
setup_config (&error, SRCDIR "/no-such-file", "", NULL, "/no/such/dir", "", NULL);
setup_config (&error, TEST_DIR "/no-such-file", "", NULL, "/no/such/dir", "", NULL);
g_assert_error (error, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_NOT_FOUND);
g_clear_error (&error);
}
@@ -216,7 +219,7 @@ test_config_parse_error (void)
{
GError *error = NULL;
setup_config (&error, SRCDIR "/bad.conf", "", NULL, "/no/such/dir", "", NULL);
setup_config (&error, TEST_DIR "/bad.conf", "", NULL, "/no/such/dir", "", NULL);
g_assert_error (error, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_PARSE);
g_clear_error (&error);
}
@@ -227,12 +230,12 @@ test_config_override (void)
gs_unref_object NMConfig *config = NULL;
gs_strfreev char **plugins = NULL;
config = setup_config (NULL, SRCDIR "/NetworkManager.conf", "", NULL, "/no/such/dir", "",
config = setup_config (NULL, TEST_DIR "/NetworkManager.conf", "", NULL, "/no/such/dir", "",
"--plugins", "alpha,beta,gamma,delta",
"--connectivity-interval", "12",
NULL);
g_assert_cmpstr (nm_config_data_get_config_main_file (nm_config_get_data_orig (config)), ==, SRCDIR "/NetworkManager.conf");
g_assert_cmpstr (nm_config_data_get_config_main_file (nm_config_get_data_orig (config)), ==, TEST_DIR "/NetworkManager.conf");
g_assert_cmpstr (_config_get_dhcp_client_a (config), ==, "dhclient");
g_assert_cmpstr (nm_config_get_log_level (config), ==, "INFO");
g_assert_cmpint (nm_config_data_get_connectivity_interval (nm_config_get_data_orig (config)), ==, 12);
@@ -253,7 +256,7 @@ test_config_global_dns (void)
NMGlobalDnsDomain *domain;
const char *const*strv;
config = setup_config (NULL, SRCDIR "/NetworkManager.conf", "", NULL,
config = setup_config (NULL, TEST_DIR "/NetworkManager.conf", "", NULL,
"/no/such/dir", "", NULL);
dns = nm_config_data_get_global_dns_config (nm_config_get_data_orig (config));
@@ -308,7 +311,7 @@ test_config_global_dns (void)
g_object_unref (config);
/* Check that a file without a default domain section gives a NULL configuration */
config = setup_config (NULL, SRCDIR "/global-dns-invalid.conf", "", NULL,
config = setup_config (NULL, TEST_DIR "/global-dns-invalid.conf", "", NULL,
"/no/such/dir", "", NULL);
dns = nm_config_data_get_global_dns_config (nm_config_get_data_orig (config));
g_assert (!dns);
@@ -319,12 +322,12 @@ static void
test_config_connectivity_check (void)
{
#if WITH_CONCHECK
const char *CONFIG_INTERN = BUILDDIR"/test-connectivity-check-intern.conf";
const char *CONFIG_INTERN = BUILD_DIR"/test-connectivity-check-intern.conf";
NMConfig *config;
NMConnectivity *connectivity;
g_assert (g_file_set_contents (CONFIG_INTERN, "", 0, NULL));
config = setup_config (NULL, SRCDIR "/NetworkManager.conf", CONFIG_INTERN, NULL,
config = setup_config (NULL, TEST_DIR "/NetworkManager.conf", CONFIG_INTERN, NULL,
"/no/such/dir", "", NULL);
connectivity = nm_connectivity_get();
@@ -371,7 +374,7 @@ test_config_no_auto_default (void)
g_assert_cmpint (nwrote, ==, 18);
nm_close (fd);
config = setup_config (NULL, SRCDIR "/NetworkManager.conf", "", NULL, "/no/such/dir", "",
config = setup_config (NULL, TEST_DIR "/NetworkManager.conf", "", NULL, "/no/such/dir", "",
"--no-auto-default", state_file,
NULL);
@@ -393,7 +396,7 @@ test_config_no_auto_default (void)
g_object_unref (config);
config = setup_config (NULL, SRCDIR "/NetworkManager.conf", "", NULL, "/no/such/dir", "",
config = setup_config (NULL, TEST_DIR "/NetworkManager.conf", "", NULL, "/no/such/dir", "",
"--no-auto-default", state_file,
NULL);
@@ -421,9 +424,9 @@ test_config_confdir (void)
char *value;
GSList *specs;
config = setup_config (NULL, SRCDIR "/NetworkManager.conf", "", NULL, SRCDIR "/conf.d", "", NULL);
config = setup_config (NULL, TEST_DIR "/NetworkManager.conf", "", NULL, TEST_DIR "/conf.d", "", NULL);
g_assert_cmpstr (nm_config_data_get_config_main_file (nm_config_get_data_orig (config)), ==, SRCDIR "/NetworkManager.conf");
g_assert_cmpstr (nm_config_data_get_config_main_file (nm_config_get_data_orig (config)), ==, TEST_DIR "/NetworkManager.conf");
g_assert_cmpstr (_config_get_dhcp_client_a (config), ==, "dhcpcd");
g_assert_cmpstr (nm_config_get_log_level (config), ==, "INFO");
g_assert_cmpstr (nm_config_get_log_domains (config), ==, "PLATFORM,DNS,WIFI");
@@ -524,8 +527,8 @@ test_config_confdir_parse_error (void)
{
GError *error = NULL;
/* Using SRCDIR as the conf dir will pick up bad.conf */
setup_config (&error, SRCDIR "/NetworkManager.conf", "", NULL, SRCDIR, "", NULL);
/* Using TEST_DIR as the conf dir will pick up bad.conf */
setup_config (&error, TEST_DIR "/NetworkManager.conf", "", NULL, TEST_DIR, "", NULL);
g_assert_error (error, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_PARSE);
g_clear_error (&error);
}
@@ -808,8 +811,8 @@ static void
test_config_set_values (void)
{
gs_unref_object NMConfig *config = NULL;
const char *CONFIG_USER = BUILDDIR"/test-set-values-user.conf";
const char *CONFIG_INTERN = BUILDDIR"/test-set-values-intern.conf";
const char *CONFIG_USER = BUILD_DIR"/test-set-values-user.conf";
const char *CONFIG_INTERN = BUILD_DIR"/test-set-values-intern.conf";
const char *atomic_section_prefixes[] = {
"atomic-prefix-1.",
"atomic-prefix-2.",
@@ -893,7 +896,7 @@ test_config_signal (void)
NMConfigChangeFlags expected;
gs_unref_object NMConfigData *config_data_orig = NULL;
config = setup_config (NULL, SRCDIR "/NetworkManager.conf", "", NULL, SRCDIR "/conf.d", "", NULL);
config = setup_config (NULL, TEST_DIR "/NetworkManager.conf", "", NULL, TEST_DIR "/conf.d", "", NULL);
config_data_orig = g_object_ref (nm_config_get_data_orig (config));
@@ -945,19 +948,19 @@ test_config_enable (void)
_nm_config_match_env = g_strdup ("something-else");
_nm_config_match_nm_version = nm_encode_version (1, 3, 4);
config = setup_config (NULL, SRCDIR "/NetworkManager.conf", "", NULL, SRCDIR "/conf.d", "", NULL);
config = setup_config (NULL, TEST_DIR "/NetworkManager.conf", "", NULL, TEST_DIR "/conf.d", "", NULL);
assert_config_value (nm_config_get_data_orig (config), "test-group-config-enable-1", "key1", NULL);
g_clear_object (&config);
_nm_config_match_nm_version = nm_encode_version (1, 5, 32);
config = setup_config (NULL, SRCDIR "/NetworkManager.conf", "", NULL, SRCDIR "/conf.d", "", NULL);
config = setup_config (NULL, TEST_DIR "/NetworkManager.conf", "", NULL, TEST_DIR "/conf.d", "", NULL);
assert_config_value (nm_config_get_data_orig (config), "test-group-config-enable-1", "key1", "enabled");
g_clear_object (&config);
_nm_config_match_nm_version = nm_encode_version (1, 5, 3);
g_clear_pointer (&_nm_config_match_env, g_free);
_nm_config_match_env = g_strdup ("test-match-env-1");
config = setup_config (NULL, SRCDIR "/NetworkManager.conf", "", NULL, SRCDIR "/conf.d", "", NULL);
config = setup_config (NULL, TEST_DIR "/NetworkManager.conf", "", NULL, TEST_DIR "/conf.d", "", NULL);
assert_config_value (nm_config_get_data_orig (config), "test-group-config-enable-1", "key1", "enabled");
g_clear_object (&config);
@@ -977,14 +980,14 @@ test_config_state_file (void)
gboolean ret;
gs_free char *file_data = NULL;
gsize file_size;
const char *const TMP_FILE = BUILDDIR "/tmp.state";
const char *const TMP_FILE = BUILD_DIR "/tmp.state";
ret = g_file_get_contents (SRCDIR "/NetworkManager.state", &file_data, &file_size, &error);
ret = g_file_get_contents (TEST_DIR "/NetworkManager.state", &file_data, &file_size, &error);
nmtst_assert_success (ret, error);
ret = g_file_set_contents (TMP_FILE, file_data, file_size, &error);
nmtst_assert_success (ret, error);
config = setup_config (NULL, SRCDIR "/NetworkManager.conf", "", NULL, SRCDIR "/conf.d", "",
config = setup_config (NULL, TEST_DIR "/NetworkManager.conf", "", NULL, TEST_DIR "/conf.d", "",
"--state-file", TMP_FILE, NULL);
g_assert (config);
@@ -1010,7 +1013,7 @@ test_config_state_file (void)
g_object_unref (config);
/* Reload configuration */
config = setup_config (NULL, SRCDIR "/NetworkManager.conf", "", NULL, SRCDIR "/conf.d", "",
config = setup_config (NULL, TEST_DIR "/NetworkManager.conf", "", NULL, TEST_DIR "/conf.d", "",
"--state-file", TMP_FILE, NULL);
g_assert (config);

2
src/tests/meson.build
View File

@@ -33,7 +33,7 @@ cflags = [
exe = executable(
test_unit,
[test_unit + '.c'] + shared_siphash,
[test_unit + '.c'],
include_directories: src_inc,
dependencies: nm_core_dep,
c_args: cflags,