shared: move "shared/nm-utils/tests/test-shared-general" to "shared/nm-glib-aux/tests"

"shared/nm-utils" got long renamed and split into separate parts. The remaining
tests are really to test nm-std-aux and nm-glib-aux (no libnm dependencies). Move
the tests to the appropriate place.
This commit is contained in:
Thomas Haller 2019-12-06 13:31:56 +01:00
parent a33ed5ad82
commit 44c5331e29
5 changed files with 9 additions and 8 deletions

3
.gitignore vendored
View file

@ -128,7 +128,7 @@ test-*.trs
/examples/C/qt/monitor-nm-running
/examples/C/qt/monitor-nm-running.moc
/shared/nm-utils/tests/test-shared-general
/shared/nm-glib-aux/tests/test-shared-general
/shared/nm-version-macros.h
/introspection/org.freedesktop.NetworkManager*.[ch]
@ -325,6 +325,7 @@ test-*.trs
/libnm/tests/test-general
/policy/org.freedesktop.NetworkManager.policy
/policy/org.freedesktop.NetworkManager.policy.in
/shared/nm-utils/tests/test-shared-general
/src/devices/tests/test-arping
/src/devices/wifi/tests/test-general
/src/devices/wifi/tests/test-wifi-ap-utils

View file

@ -526,14 +526,14 @@ $(shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_OBJECTS): $(libnm_core_lib_h_
###############################################################################
EXTRA_DIST += \
shared/nm-utils/tests/meson.build \
shared/nm-glib-aux/tests/meson.build \
$(NULL)
###############################################################################
check_programs += shared/nm-utils/tests/test-shared-general
check_programs += shared/nm-glib-aux/tests/test-shared-general
shared_nm_utils_tests_test_shared_general_CPPFLAGS = \
shared_nm_glib_aux_tests_test_shared_general_CPPFLAGS = \
$(dflt_cppflags) \
-I$(srcdir)/shared \
-DNETWORKMANAGER_COMPILATION_TEST \
@ -543,12 +543,12 @@ shared_nm_utils_tests_test_shared_general_CPPFLAGS = \
$(SANITIZER_LIB_CFLAGS) \
$(NULL)
shared_nm_utils_tests_test_shared_general_LDFLAGS = \
shared_nm_glib_aux_tests_test_shared_general_LDFLAGS = \
$(CODE_COVERAGE_LDFLAGS) \
$(SANITIZER_EXEC_LDFLAGS) \
$(NULL)
shared_nm_utils_tests_test_shared_general_LDADD = \
shared_nm_glib_aux_tests_test_shared_general_LDADD = \
shared/nm-glib-aux/libnm-glib-aux.la \
shared/systemd/libnm-systemd-logging-stub.la \
shared/nm-std-aux/libnm-std-aux.la \

View file

@ -256,5 +256,5 @@ libnm_systemd_logging_stub = static_library(
)
if enable_tests
subdir('nm-utils/tests')
subdir('nm-glib-aux/tests')
endif

View file

@ -14,7 +14,7 @@ exe = executable(
)
test(
'shared/nm-utils/' + test_unit,
'shared/nm-glib-aux/' + test_unit,
test_script,
args: test_args + [exe.full_path()],
timeout: default_test_timeout,