fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-02 00:40:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

platform/tests: rename platform's "test-general.c"

Browse source 
Older versions of meson don't like building multiple artifacts
with the same name (even if they are in different directories). We
have multiple tests called "test-general.c", and it would be natural
to compile a test binary of the same name.

  Meson encountered an error in file src/tests/meson.build, line 14, column 2:
  Tried to create target "test-general", but a target of that name already exists.

It's generally a bad idea to have in our source tree multiple files with the
same name. Rename the test.

Fixes: 16cd84d346 ('build/meson: rename platform tests to use same name as autotools'):
(cherry picked from commit 041aa3d605)
This commit is contained in:
Thomas Haller 2019-05-18 11:28:26 +02:00
parent 87c0e8dc83
commit 07ccf36ed0
4 changed files with 56 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

82
Makefile.am
View file

@ -3576,31 +3576,22 @@ check_programs_norun += \
src/platform/tests/monitor
check_programs += \
src/platform/tests/test-link-fake \
src/platform/tests/test-link-linux \
src/platform/tests/test-address-fake \
src/platform/tests/test-address-linux \
src/platform/tests/test-general \
src/platform/tests/test-cleanup-fake \
src/platform/tests/test-cleanup-linux \
src/platform/tests/test-link-fake \
src/platform/tests/test-link-linux \
src/platform/tests/test-nmp-object \
src/platform/tests/test-platform-general \
src/platform/tests/test-route-fake \
src/platform/tests/test-route-linux \
src/platform/tests/test-cleanup-fake \
src/platform/tests/test-cleanup-linux
$(NULL)
src_platform_tests_monitor_CPPFLAGS = $(src_cppflags_test)
src_platform_tests_monitor_LDFLAGS = $(src_platform_tests_ldflags)
src_platform_tests_monitor_LDADD = $(src_platform_tests_libadd)
src_platform_tests_test_link_fake_SOURCES = src/platform/tests/test-link.c
src_platform_tests_test_link_fake_CPPFLAGS = $(src_tests_cppflags_fake)
src_platform_tests_test_link_fake_LDFLAGS = $(src_platform_tests_ldflags)
src_platform_tests_test_link_fake_LDADD = $(src_platform_tests_libadd)
src_platform_tests_test_link_linux_SOURCES = src/platform/tests/test-link.c
src_platform_tests_test_link_linux_CPPFLAGS = $(src_tests_cppflags_linux)
src_platform_tests_test_link_linux_LDFLAGS = $(src_platform_tests_ldflags)
src_platform_tests_test_link_linux_LDADD = $(src_platform_tests_libadd)
src_platform_tests_test_address_fake_SOURCES = src/platform/tests/test-address.c
src_platform_tests_test_address_fake_CPPFLAGS = $(src_tests_cppflags_fake)
src_platform_tests_test_address_fake_LDFLAGS = $(src_platform_tests_ldflags)
@ -3611,16 +3602,6 @@ src_platform_tests_test_address_linux_CPPFLAGS = $(src_tests_cppflags_linux)
src_platform_tests_test_address_linux_LDFLAGS = $(src_platform_tests_ldflags)
src_platform_tests_test_address_linux_LDADD = $(src_platform_tests_libadd)
src_platform_tests_test_route_fake_SOURCES = src/platform/tests/test-route.c
src_platform_tests_test_route_fake_CPPFLAGS = $(src_tests_cppflags_fake)
src_platform_tests_test_route_fake_LDFLAGS = $(src_platform_tests_ldflags)
src_platform_tests_test_route_fake_LDADD = $(src_platform_tests_libadd)
src_platform_tests_test_route_linux_SOURCES = src/platform/tests/test-route.c
src_platform_tests_test_route_linux_CPPFLAGS = $(src_tests_cppflags_linux)
src_platform_tests_test_route_linux_LDFLAGS = $(src_platform_tests_ldflags)
src_platform_tests_test_route_linux_LDADD = $(src_platform_tests_libadd)
src_platform_tests_test_cleanup_fake_SOURCES = src/platform/tests/test-cleanup.c
src_platform_tests_test_cleanup_fake_CPPFLAGS = $(src_tests_cppflags_fake)
src_platform_tests_test_cleanup_fake_LDFLAGS = $(src_platform_tests_ldflags)
@ -3631,28 +3612,49 @@ src_platform_tests_test_cleanup_linux_CPPFLAGS = $(src_tests_cppflags_linux)
src_platform_tests_test_cleanup_linux_LDFLAGS = $(src_platform_tests_ldflags)
src_platform_tests_test_cleanup_linux_LDADD = $(src_platform_tests_libadd)
src_platform_tests_test_link_fake_SOURCES = src/platform/tests/test-link.c
src_platform_tests_test_link_fake_CPPFLAGS = $(src_tests_cppflags_fake)
src_platform_tests_test_link_fake_LDFLAGS = $(src_platform_tests_ldflags)
src_platform_tests_test_link_fake_LDADD = $(src_platform_tests_libadd)
src_platform_tests_test_link_linux_SOURCES = src/platform/tests/test-link.c
src_platform_tests_test_link_linux_CPPFLAGS = $(src_tests_cppflags_linux)
src_platform_tests_test_link_linux_LDFLAGS = $(src_platform_tests_ldflags)
src_platform_tests_test_link_linux_LDADD = $(src_platform_tests_libadd)
src_platform_tests_test_nmp_object_CPPFLAGS = $(src_cppflags_test)
src_platform_tests_test_nmp_object_LDFLAGS = $(src_platform_tests_ldflags)
src_platform_tests_test_nmp_object_LDADD = src/libNetworkManagerTest.la
src_platform_tests_test_general_CPPFLAGS = $(src_cppflags_test)
src_platform_tests_test_general_LDFLAGS = $(src_platform_tests_ldflags)
src_platform_tests_test_general_LDADD = src/libNetworkManagerTest.la
src_platform_tests_test_platform_general_CPPFLAGS = $(src_cppflags_test)
src_platform_tests_test_platform_general_LDFLAGS = $(src_platform_tests_ldflags)
src_platform_tests_test_platform_general_LDADD = src/libNetworkManagerTest.la
$(src_platform_tests_monitor_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
$(src_platform_tests_test_link_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
$(src_platform_tests_test_link_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
$(src_platform_tests_test_address_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
$(src_platform_tests_test_address_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
$(src_platform_tests_test_route_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
$(src_platform_tests_test_route_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
$(src_platform_tests_test_cleanup_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
$(src_platform_tests_test_cleanup_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
$(src_platform_tests_test_nmp_object_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
$(src_platform_tests_test_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
src_platform_tests_test_route_fake_SOURCES = src/platform/tests/test-route.c
src_platform_tests_test_route_fake_CPPFLAGS = $(src_tests_cppflags_fake)
src_platform_tests_test_route_fake_LDFLAGS = $(src_platform_tests_ldflags)
src_platform_tests_test_route_fake_LDADD = $(src_platform_tests_libadd)
src_platform_tests_test_route_linux_SOURCES = src/platform/tests/test-route.c
src_platform_tests_test_route_linux_CPPFLAGS = $(src_tests_cppflags_linux)
src_platform_tests_test_route_linux_LDFLAGS = $(src_platform_tests_ldflags)
src_platform_tests_test_route_linux_LDADD = $(src_platform_tests_libadd)
$(src_platform_tests_monitor_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
$(src_platform_tests_test_address_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
$(src_platform_tests_test_address_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
$(src_platform_tests_test_cleanup_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
$(src_platform_tests_test_cleanup_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
$(src_platform_tests_test_link_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
$(src_platform_tests_test_link_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
$(src_platform_tests_test_nmp_object_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
$(src_platform_tests_test_platform_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
$(src_platform_tests_test_route_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
$(src_platform_tests_test_route_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
EXTRA_DIST += \
src/platform/tests/meson.build
src/platform/tests/meson.build \
$(NULL)
###############################################################################
# src/devices/tests

6
src/platform/tests/.gitignore vendored
View file

@ -1,14 +1,16 @@
/dump
/monitor
/platform
/test-address-fake
/test-address-linux
/test-cleanup-fake
/test-cleanup-linux
/test-general
/test-link-fake
/test-link-linux
/test-nmp-object
/test-platform-general
/test-route-fake
/test-route-linux
# no longer exists but was used in the past.
/dump
/test-general

20
src/platform/tests/meson.build
View file

@ -1,14 +1,14 @@
test_units = [
['test-link-fake', 'test-link.c', test_nm_dep_fake, default_test_timeout],
['test-link-linux', 'test-link.c', test_nm_dep_linux, 900],
['test-address-fake', 'test-address.c', test_nm_dep_fake, default_test_timeout],
['test-address-linux', 'test-address.c', test_nm_dep_linux, default_test_timeout],
['test-general', 'test-general.c', test_nm_dep, default_test_timeout],
['test-nmp-object', 'test-nmp-object.c', test_nm_dep, default_test_timeout],
['test-route-fake', 'test-route.c', test_nm_dep_fake, default_test_timeout],
['test-route-linux', 'test-route.c', test_nm_dep_linux, default_test_timeout],
['test-cleanup-fake', 'test-cleanup.c', test_nm_dep_fake, default_test_timeout],
['test-cleanup-linux', 'test-cleanup.c', test_nm_dep_linux, default_test_timeout],
[ 'test-address-fake', 'test-address.c', test_nm_dep_fake, default_test_timeout ],
[ 'test-address-linux', 'test-address.c', test_nm_dep_linux, default_test_timeout ],
[ 'test-cleanup-fake', 'test-cleanup.c', test_nm_dep_fake, default_test_timeout ],
[ 'test-cleanup-linux', 'test-cleanup.c', test_nm_dep_linux, default_test_timeout ],
[ 'test-link-fake', 'test-link.c', test_nm_dep_fake, default_test_timeout ],
[ 'test-link-linux', 'test-link.c', test_nm_dep_linux, 900 ],
[ 'test-nmp-object', 'test-nmp-object.c', test_nm_dep, default_test_timeout ],
[ 'test-platform-general', 'test-platform-general.c', test_nm_dep, default_test_timeout ],
[ 'test-route-fake', 'test-route.c', test_nm_dep_fake, default_test_timeout ],
[ 'test-route-linux', 'test-route.c', test_nm_dep_linux, default_test_timeout ],
]
foreach test_unit: test_units

0
src/platform/tests/test-general.c → src/platform/tests/test-platform-general.c
View file