mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-10-15 12:34:55 +00:00
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:
parent
a33ed5ad82
commit
44c5331e29
3
.gitignore
vendored
3
.gitignore
vendored
|
@ -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
|
||||
|
|
10
Makefile.am
10
Makefile.am
|
@ -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 \
|
||||
|
|
|
@ -256,5 +256,5 @@ libnm_systemd_logging_stub = static_library(
|
|||
)
|
||||
|
||||
if enable_tests
|
||||
subdir('nm-utils/tests')
|
||||
subdir('nm-glib-aux/tests')
|
||||
endif
|
||||
|
|
|
@ -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,
|
Loading…
Reference in a new issue