meson: Remove devices tests' meson build files

The devices tests' meson build files include only the build of a
single executable file and its execution as a test unit.

This has been moved to the devices' main meson build files so this
files can be removed.
This commit is contained in:
Iñigo Martínez 2019-09-24 13:07:50 +02:00 committed by Thomas Haller
parent 05c7a77022
commit 42a8533d5f
7 changed files with 40 additions and 45 deletions

View File

@ -3399,7 +3399,6 @@ EXTRA_DIST += \
src/devices/wwan/libnm-wwan.ver \
src/devices/wwan/meson.build \
src/devices/wwan/tests/test-service-providers.xml \
src/devices/wwan/tests/meson.build \
$(NULL)
###############################################################################
@ -3487,7 +3486,6 @@ endif
EXTRA_DIST += \
src/devices/bluetooth/meson.build \
src/devices/bluetooth/tests/meson.build \
$(NULL)
###############################################################################
@ -3560,7 +3558,7 @@ endif
EXTRA_DIST += \
src/devices/wifi/meson.build \
src/devices/wifi/tests/meson.build
$(NULL)
###############################################################################
# src/devices/team

View File

@ -35,4 +35,11 @@ test(
args: [libnm_device_plugin_bluetooth.full_path(), linker_script_devices],
)
subdir('tests')
test_unit = 'nm-bt-test'
executable(
test_unit,
'tests/' + test_unit + '.c',
dependencies: libnetwork_manager_test_dep,
c_args: test_c_flags,
)

View File

@ -1,8 +0,0 @@
test_unit = 'nm-bt-test'
executable(
test_unit,
test_unit + '.c',
dependencies: libnetwork_manager_test_dep,
c_args: test_c_flags,
)

View File

@ -39,5 +39,19 @@ test(
)
if enable_tests
subdir('tests')
test_unit = 'test-devices-wifi'
exe = executable(
test_unit,
['tests/' + test_unit + '.c'] + common_sources,
dependencies: libnetwork_manager_test_dep,
c_args: test_c_flags,
)
test(
test_unit,
test_script,
args: test_args + [exe.full_path()],
timeout: default_test_timeout,
)
endif

View File

@ -1,15 +0,0 @@
test_unit = 'test-devices-wifi'
exe = executable(
test_unit,
[test_unit + '.c'] + common_sources,
dependencies: libnetwork_manager_test_dep,
c_args: test_c_flags,
)
test(
test_unit,
test_script,
args: test_args + [exe.full_path()],
timeout: default_test_timeout,
)

View File

@ -71,5 +71,20 @@ run_target(
)
if enable_tests
subdir('tests')
test_unit = 'test-service-providers'
exe = executable(
test_unit,
['tests/' + test_unit + '.c'] + nm_service_providers_source,
include_directories: wwan_inc,
dependencies: libnetwork_manager_test_dep,
c_args: test_c_flags,
)
test(
'wwan/' + test_unit,
test_script,
timeout: default_test_timeout,
args: test_args + [exe.full_path()],
)
endif

View File

@ -1,16 +0,0 @@
test_unit = 'test-service-providers'
exe = executable(
test_unit,
[test_unit + '.c'] + nm_service_providers_source,
include_directories: wwan_inc,
dependencies: libnetwork_manager_test_dep,
c_args: test_c_flags,
)
test(
'wwan/' + test_unit,
test_script,
timeout: default_test_timeout,
args: test_args + [exe.full_path()],
)