fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-03-06 16:20:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

meson: Fix platform tests

Browse source 
All platform tests were run twice with the `linux` platform, instead of
`fake` and `linux`, as expected.

(cherry picked from commit e0b168d6a8)
This commit is contained in:
Jan Alexander Steffens (heftig) 2018-10-19 18:48:43 +02:00 • committed by Thomas Haller
parent 3505998ef7
commit aca7fd801a
3 changed files with 24 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/meson.build
View file

@ -214,9 +214,6 @@ if enable_tests
test_cflags += ['-DREQUIRE_ROOT_TESTS=1']
endif
platform = (host_machine.system().contains('linux') ? 'linux' : 'fake')
test_cflags_platform = '-DSETUP=nm_' + platform + '_platform_setup'
libnetwork_manager_test = static_library(
nm_name + 'Test',
sources: sources,
@ -231,6 +228,16 @@ if enable_tests
link_with: libnetwork_manager_test
)
test_nm_dep_fake = declare_dependency(
dependencies: test_nm_dep,
compile_args: ['-DSETUP=nm_fake_platform_setup']
)
test_nm_dep_linux = declare_dependency(
dependencies: test_nm_dep,
compile_args: ['-DSETUP=nm_linux_platform_setup']
)
subdir('dnsmasq/tests')
subdir('ndisc/tests')
subdir('platform/tests')

6
src/ndisc/tests/meson.build
View file

@ -3,8 +3,7 @@ test_unit = 'test-ndisc-fake'
exe = executable(
test_unit,
test_unit + '.c',
dependencies: test_nm_dep,
c_args: test_cflags_platform
dependencies: test_nm_dep_fake,
)
test(
@ -18,6 +17,5 @@ test = 'test-ndisc-linux'
exe = executable(
test,
test + '.c',
dependencies: test_nm_dep,
c_args: test_cflags_platform
dependencies: test_nm_dep_linux,
)

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

@ -1,28 +1,27 @@
test_units = [
['test-link-fake', 'test-link.c', 60],
['test-link-linux', 'test-link.c', 60],
['test-address-fake', 'test-address.c'],
['test-address-linux', 'test-address.c'],
['test-general', 'test-general.c'],
['test-nmp-object', 'test-nmp-object.c'],
['test-route-fake', 'test-route.c'],
['test-route-linux', 'test-route.c'],
['test-cleanup-fake', 'test-cleanup.c'],
['test-cleanup-linux', 'test-cleanup.c'],
['test-link-fake', 'test-link.c', test_nm_dep_fake, 30],
['test-link-linux', 'test-link.c', test_nm_dep_linux, 90],
['test-address-fake', 'test-address.c', test_nm_dep_fake, 30],
['test-address-linux', 'test-address.c', test_nm_dep_linux, 30],
['test-general', 'test-general.c', test_nm_dep, 30],
['test-nmp-object', 'test-nmp-object.c', test_nm_dep, 30],
['test-route-fake', 'test-route.c', test_nm_dep_fake, 30],
['test-route-linux', 'test-route.c', test_nm_dep_linux, 30],
['test-cleanup-fake', 'test-cleanup.c', test_nm_dep_fake, 30],
['test-cleanup-linux', 'test-cleanup.c', test_nm_dep_linux, 30],
]
foreach test_unit: test_units
exe = executable(
'platform-' + test_unit[0],
test_unit[1],
dependencies: test_nm_dep,
c_args: test_cflags_platform
dependencies: test_unit[2],
)
test(
'platform/' + test_unit[0],
test_script,
timeout: test_unit.length() > 2 ? test_unit[2] : 30,
timeout: test_unit[3],
args: test_args + [exe.full_path()]
)
endforeach
@ -33,5 +32,4 @@ executable(
test,
test + '.c',
dependencies: test_nm_dep,
c_args: test_cflags_platform
)