mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-09-06 17:14:02 +00:00
keyfile/tests: rename core's "test-keyfile" to "test-keyfile-settings"
We already have "libnm-core/tests/test-keyfile.c" from which we build "test-keyfile". Our test binaries should be named the following: - "*/tests/test-*" - the test binary "*/tests/test-*" should be build from a source file "*/tests/test-*.c". Meaning: the source's and executable's name should correspond. - test binaries should be named uniquely. Also, because older meson versions don't like having the same binary name more than once. Rename to avoid the duplicate name.
This commit is contained in:
parent
a80c199e9e
commit
d27f6b9d0a
3
.gitignore
vendored
3
.gitignore
vendored
|
@ -221,7 +221,7 @@ test-*.trs
|
||||||
/src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.[ch]
|
/src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.[ch]
|
||||||
/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh
|
/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh
|
||||||
/src/settings/plugins/ifupdown/tests/test-ifupdown
|
/src/settings/plugins/ifupdown/tests/test-ifupdown
|
||||||
/src/settings/plugins/keyfile/tests/test-keyfile
|
/src/settings/plugins/keyfile/tests/test-keyfile-settings
|
||||||
/src/settings/plugins/ifcfg-rh/tests/network-scripts/tmp/
|
/src/settings/plugins/ifcfg-rh/tests/network-scripts/tmp/
|
||||||
/src/supplicant/tests/test-supplicant-config
|
/src/supplicant/tests/test-supplicant-config
|
||||||
/src/tests/config/test-config
|
/src/tests/config/test-config
|
||||||
|
@ -314,5 +314,6 @@ test-*.trs
|
||||||
/src/rdisc/
|
/src/rdisc/
|
||||||
/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh-utils
|
/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh-utils
|
||||||
/src/settings/plugins/ifnet
|
/src/settings/plugins/ifnet
|
||||||
|
/src/settings/plugins/keyfile/tests/test-keyfile
|
||||||
/src/supplicant-manager/tests/test-supplicant-config
|
/src/supplicant-manager/tests/test-supplicant-config
|
||||||
/src/tests/test-resolvconf-capture
|
/src/tests/test-resolvconf-capture
|
||||||
|
|
10
Makefile.am
10
Makefile.am
|
@ -2622,19 +2622,19 @@ EXTRA_DIST += \
|
||||||
# src/settings/plugins/keyfile/tests
|
# src/settings/plugins/keyfile/tests
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
|
||||||
check_programs += src/settings/plugins/keyfile/tests/test-keyfile
|
check_programs += src/settings/plugins/keyfile/tests/test-keyfile-settings
|
||||||
|
|
||||||
src_settings_plugins_keyfile_tests_test_keyfile_CPPFLAGS = $(src_cppflags_test)
|
src_settings_plugins_keyfile_tests_test_keyfile_settings_CPPFLAGS = $(src_cppflags_test)
|
||||||
|
|
||||||
src_settings_plugins_keyfile_tests_test_keyfile_LDFLAGS = \
|
src_settings_plugins_keyfile_tests_test_keyfile_settings_LDFLAGS = \
|
||||||
$(GLIB_LIBS) \
|
$(GLIB_LIBS) \
|
||||||
$(CODE_COVERAGE_LDFLAGS) \
|
$(CODE_COVERAGE_LDFLAGS) \
|
||||||
$(SANITIZER_EXEC_LDFLAGS)
|
$(SANITIZER_EXEC_LDFLAGS)
|
||||||
|
|
||||||
src_settings_plugins_keyfile_tests_test_keyfile_LDADD = \
|
src_settings_plugins_keyfile_tests_test_keyfile_settings_LDADD = \
|
||||||
src/libNetworkManagerTest.la
|
src/libNetworkManagerTest.la
|
||||||
|
|
||||||
$(src_settings_plugins_keyfile_tests_test_keyfile_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
$(src_settings_plugins_keyfile_tests_test_keyfile_settings_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
||||||
|
|
||||||
EXTRA_DIST += \
|
EXTRA_DIST += \
|
||||||
src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection \
|
src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection \
|
||||||
|
|
|
@ -1,6 +1,4 @@
|
||||||
test_unit = 'test-keyfile'
|
test_unit = 'test-keyfile-settings'
|
||||||
|
|
||||||
test_keyfiles_dir = join_paths(meson.current_source_dir(), 'keyfiles')
|
|
||||||
|
|
||||||
exe = executable(
|
exe = executable(
|
||||||
test_unit,
|
test_unit,
|
||||||
|
@ -9,7 +7,7 @@ exe = executable(
|
||||||
)
|
)
|
||||||
|
|
||||||
test(
|
test(
|
||||||
'keyfile/' + test_unit,
|
test_unit,
|
||||||
test_script,
|
test_script,
|
||||||
args: test_args + [exe.full_path()],
|
args: test_args + [exe.full_path()],
|
||||||
timeout: default_test_timeout,
|
timeout: default_test_timeout,
|
||||||
|
|
Loading…
Reference in a new issue