mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-10-15 12:34:55 +00:00
libnm/tests: add static helper library "src/libnm-client-test/"
This helper code is already used by several of our unit tests. Compile it as a separate library. Previously, the source code lingered unmotivated under "shared/", which is confusing.
This commit is contained in:
parent
9bba4871f3
commit
a03a03fbe9
58
Makefile.am
58
Makefile.am
|
@ -748,13 +748,51 @@ EXTRA_DIST += \
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
|
||||||
|
noinst_LTLIBRARIES += src/libnm-client-test/libnm-client-test.la
|
||||||
|
|
||||||
|
src_libnm_client_test_libnm_client_test_la_CPPFLAGS = \
|
||||||
|
$(dflt_cppflags) \
|
||||||
|
-I$(srcdir)/shared \
|
||||||
|
-I$(builddir)/shared \
|
||||||
|
-I$(srcdir)/src \
|
||||||
|
-I$(builddir)/src \
|
||||||
|
-I$(builddir)/src/libnm-core-public \
|
||||||
|
-I$(srcdir)/src/libnm-core-public \
|
||||||
|
-I$(srcdir)/src/libnm-client-public \
|
||||||
|
-I$(builddir)/src/libnm-client-public \
|
||||||
|
$(CODE_COVERAGE_CFLAGS) \
|
||||||
|
$(GLIB_CFLAGS) \
|
||||||
|
$(SANITIZER_LIB_CFLAGS) \
|
||||||
|
$(NULL)
|
||||||
|
|
||||||
|
src_libnm_client_test_libnm_client_test_la_SOURCES = \
|
||||||
|
src/libnm-client-test/nm-test-libnm-utils.h \
|
||||||
|
src/libnm-client-test/nm-test-utils-impl.c \
|
||||||
|
$(NULL)
|
||||||
|
|
||||||
|
src_libnm_client_test_libnm_client_test_la_LDFLAGS = \
|
||||||
|
$(CODE_COVERAGE_LDFLAGS) \
|
||||||
|
$(SANITIZER_LIB_LDFLAGS) \
|
||||||
|
$(NULL)
|
||||||
|
|
||||||
|
src_libnm_client_test_libnm_client_test_la_LIBADD = \
|
||||||
|
$(GLIB_LIBS) \
|
||||||
|
$(NULL)
|
||||||
|
|
||||||
|
$(src_libnm_client_test_libnm_client_test_la_OBJECTS): $(src_libnm_core_public_mkenums_h)
|
||||||
|
$(src_libnm_client_test_libnm_client_test_la_OBJECTS): $(src_libnm_client_public_mkenums_h)
|
||||||
|
|
||||||
|
EXTRA_DIST += \
|
||||||
|
src/libnm-client-test/meson.build \
|
||||||
|
$(NULL)
|
||||||
|
|
||||||
|
###############################################################################
|
||||||
|
|
||||||
EXTRA_DIST += \
|
EXTRA_DIST += \
|
||||||
src/libnm-glib-aux/tests/meson.build \
|
src/libnm-glib-aux/tests/meson.build \
|
||||||
shared/README.md \
|
shared/README.md \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
###############################################################################
|
|
||||||
|
|
||||||
check_programs += src/libnm-glib-aux/tests/test-shared-general
|
check_programs += src/libnm-glib-aux/tests/test-shared-general
|
||||||
|
|
||||||
src_libnm_glib_aux_tests_test_shared_general_CPPFLAGS = \
|
src_libnm_glib_aux_tests_test_shared_general_CPPFLAGS = \
|
||||||
|
@ -1849,6 +1887,7 @@ src_libnm_client_impl_tests_cppflags = \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
src_libnm_client_impl_tests_ldadd = \
|
src_libnm_client_impl_tests_ldadd = \
|
||||||
|
src/libnm-client-test/libnm-client-test.la \
|
||||||
src/libnm-client-impl/libnm-client-impl.la \
|
src/libnm-client-impl/libnm-client-impl.la \
|
||||||
$(GLIB_LIBS) \
|
$(GLIB_LIBS) \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
@ -1866,21 +1905,6 @@ src_libnm_client_impl_tests_test_libnm_SOURCES = \
|
||||||
src/libnm-client-impl/tests/test-libnm.c \
|
src/libnm-client-impl/tests/test-libnm.c \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
src_libnm_client_impl_tests_test_nm_client_SOURCES = \
|
|
||||||
shared/nm-test-utils-impl.c \
|
|
||||||
shared/nm-test-libnm-utils.h \
|
|
||||||
src/libnm-client-impl/tests/test-nm-client.c
|
|
||||||
|
|
||||||
src_libnm_client_impl_tests_test_remote_settings_client_SOURCES = \
|
|
||||||
shared/nm-test-utils-impl.c \
|
|
||||||
shared/nm-test-libnm-utils.h \
|
|
||||||
src/libnm-client-impl/tests/test-remote-settings-client.c
|
|
||||||
|
|
||||||
src_libnm_client_impl_tests_test_secret_agent_SOURCES = \
|
|
||||||
shared/nm-test-utils-impl.c \
|
|
||||||
shared/nm-test-libnm-utils.h \
|
|
||||||
src/libnm-client-impl/tests/test-secret-agent.c
|
|
||||||
|
|
||||||
src_libnm_client_impl_tests_test_libnm_LDADD = $(src_libnm_client_impl_tests_ldadd)
|
src_libnm_client_impl_tests_test_libnm_LDADD = $(src_libnm_client_impl_tests_ldadd)
|
||||||
src_libnm_client_impl_tests_test_nm_client_LDADD = $(src_libnm_client_impl_tests_ldadd)
|
src_libnm_client_impl_tests_test_nm_client_LDADD = $(src_libnm_client_impl_tests_ldadd)
|
||||||
src_libnm_client_impl_tests_test_remote_settings_client_LDADD = $(src_libnm_client_impl_tests_ldadd)
|
src_libnm_client_impl_tests_test_remote_settings_client_LDADD = $(src_libnm_client_impl_tests_ldadd)
|
||||||
|
|
|
@ -12,6 +12,4 @@ glib_nm_default_dep = declare_dependency(
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
||||||
nm_test_utils_impl_source = files('nm-test-utils-impl.c')
|
|
||||||
|
|
||||||
nm_vpn_plugin_utils_source = files('nm-utils/nm-vpn-plugin-utils.c')
|
nm_vpn_plugin_utils_source = files('nm-utils/nm-vpn-plugin-utils.c')
|
||||||
|
|
|
@ -10,11 +10,7 @@ test_units = [
|
||||||
foreach test_unit: test_units
|
foreach test_unit: test_units
|
||||||
exe = executable(
|
exe = executable(
|
||||||
test_unit,
|
test_unit,
|
||||||
[
|
test_unit + '.c',
|
||||||
test_unit + '.c',
|
|
||||||
nm_test_utils_impl_source,
|
|
||||||
libnm_client_public_enum_sources[1],
|
|
||||||
],
|
|
||||||
include_directories: [
|
include_directories: [
|
||||||
libnm_client_public_inc,
|
libnm_client_public_inc,
|
||||||
],
|
],
|
||||||
|
@ -24,6 +20,7 @@ foreach test_unit: test_units
|
||||||
],
|
],
|
||||||
link_with: [
|
link_with: [
|
||||||
libnm_client_impl,
|
libnm_client_impl,
|
||||||
|
libnm_client_test,
|
||||||
libnm_base,
|
libnm_base,
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
|
|
||||||
#include "nm-test-libnm-utils.h"
|
#include "libnm-client-test/nm-test-libnm-utils.h"
|
||||||
|
|
||||||
static struct {
|
static struct {
|
||||||
GMainLoop *loop;
|
GMainLoop *loop;
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
|
|
||||||
#include "libnm-glib-aux/nm-time-utils.h"
|
#include "libnm-glib-aux/nm-time-utils.h"
|
||||||
|
|
||||||
#include "nm-test-libnm-utils.h"
|
#include "libnm-client-test/nm-test-libnm-utils.h"
|
||||||
|
|
||||||
static struct {
|
static struct {
|
||||||
NMTstcServiceInfo * sinfo;
|
NMTstcServiceInfo * sinfo;
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
|
|
||||||
#include "nm-secret-agent-old.h"
|
#include "nm-secret-agent-old.h"
|
||||||
|
|
||||||
#include "nm-test-libnm-utils.h"
|
#include "libnm-client-test/nm-test-libnm-utils.h"
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
|
|
20
src/libnm-client-test/meson.build
Normal file
20
src/libnm-client-test/meson.build
Normal file
|
@ -0,0 +1,20 @@
|
||||||
|
# SPDX-License-Identifier: LGPL-2.1-or-later
|
||||||
|
|
||||||
|
libnm_client_test = static_library(
|
||||||
|
'nm-client-test',
|
||||||
|
sources: files(
|
||||||
|
'nm-test-utils-impl.c',
|
||||||
|
),
|
||||||
|
include_directories: [
|
||||||
|
libnm_core_public_inc,
|
||||||
|
libnm_client_public_inc,
|
||||||
|
src_inc,
|
||||||
|
top_inc,
|
||||||
|
],
|
||||||
|
dependencies: [
|
||||||
|
libnm_core_aux_intern_dep,
|
||||||
|
libnm_core_public_dep,
|
||||||
|
libnm_glib_aux_dep,
|
||||||
|
glib_dep,
|
||||||
|
],
|
||||||
|
)
|
|
@ -10,7 +10,7 @@
|
||||||
#include "NetworkManager.h"
|
#include "NetworkManager.h"
|
||||||
#include "libnm-std-aux/nm-dbus-compat.h"
|
#include "libnm-std-aux/nm-dbus-compat.h"
|
||||||
|
|
||||||
#include "nm-test-libnm-utils.h"
|
#include "libnm-client-test/nm-test-libnm-utils.h"
|
||||||
|
|
||||||
#define NMTSTC_NM_SERVICE NM_BUILD_SRCDIR "/tools/test-networkmanager-service.py"
|
#define NMTSTC_NM_SERVICE NM_BUILD_SRCDIR "/tools/test-networkmanager-service.py"
|
||||||
|
|
|
@ -109,6 +109,7 @@ subdir('libnm-client-aux-extern')
|
||||||
subdir('core')
|
subdir('core')
|
||||||
|
|
||||||
if enable_tests
|
if enable_tests
|
||||||
|
subdir('libnm-client-test')
|
||||||
subdir('libnm-glib-aux/tests')
|
subdir('libnm-glib-aux/tests')
|
||||||
subdir('libnm-platform/tests')
|
subdir('libnm-platform/tests')
|
||||||
subdir('libnm-core-impl/tests')
|
subdir('libnm-core-impl/tests')
|
||||||
|
|
Loading…
Reference in a new issue