summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIñigo Martínez <inigomartinez@gmail.com>2019-09-24 12:56:09 +0200
committerThomas Haller <thaller@redhat.com>2019-10-01 09:49:33 +0200
commit05c7a7702277e522579474abccd2e0cf16d42dd4 (patch)
tree6eec20cd03909ed51197e3a8139ffd4fa873a3ce
parent95abecb24d5621f56e48203b5d4fe5b9f9a0e446 (diff)
downloadNetworkManager-05c7a7702277e522579474abccd2e0cf16d42dd4.tar.gz
meson: Add missing "nm-bt-test" helper program
In 878d4963e a new `nm-bt-test` helper program was added. However, although `autotools` build steps were included, meson build steps were not. This add meson's build steps.
-rw-r--r--Makefile.am4
-rw-r--r--src/devices/bluetooth/meson.build2
-rw-r--r--src/devices/bluetooth/tests/meson.build8
3 files changed, 13 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 95238324a4..3cae931805 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3486,7 +3486,9 @@ check_local += check-local-devices-bluetooth
endif
EXTRA_DIST += \
- src/devices/bluetooth/meson.build
+ src/devices/bluetooth/meson.build \
+ src/devices/bluetooth/tests/meson.build \
+ $(NULL)
###############################################################################
# src/devices/wifi
diff --git a/src/devices/bluetooth/meson.build b/src/devices/bluetooth/meson.build
index d3489871f2..7854d1756e 100644
--- a/src/devices/bluetooth/meson.build
+++ b/src/devices/bluetooth/meson.build
@@ -34,3 +34,5 @@ test(
check_exports,
args: [libnm_device_plugin_bluetooth.full_path(), linker_script_devices],
)
+
+subdir('tests')
diff --git a/src/devices/bluetooth/tests/meson.build b/src/devices/bluetooth/tests/meson.build
new file mode 100644
index 0000000000..19b1955d17
--- /dev/null
+++ b/src/devices/bluetooth/tests/meson.build
@@ -0,0 +1,8 @@
+test_unit = 'nm-bt-test'
+
+executable(
+ test_unit,
+ test_unit + '.c',
+ dependencies: libnetwork_manager_test_dep,
+ c_args: test_c_flags,
+)