From 1491efa5d8ec1f90eb237eced2252a9e5cfc5b10 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@v3.sk>
Date: Tue, 26 Jun 2018 18:36:31 +0200
Subject: [PATCH] meson: run the check-export.sh in test phase

Targets not depended on by anything are not useful and likely never get run.
---
 libnm-glib/meson.build            | 6 +++---
 libnm-util/meson.build            | 6 +++---
 libnm/meson.build                 | 6 +++---
 meson.build                       | 2 +-
 src/devices/adsl/meson.build      | 6 +++---
 src/devices/bluetooth/meson.build | 6 +++---
 src/devices/ovs/meson.build       | 6 +++---
 src/devices/team/meson.build      | 6 +++---
 src/devices/wifi/meson.build      | 6 +++---
 src/devices/wwan/meson.build      | 6 +++---
 10 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/libnm-glib/meson.build b/libnm-glib/meson.build
index fabd881874..016aa6389a 100644
--- a/libnm-glib/meson.build
+++ b/libnm-glib/meson.build
@@ -269,10 +269,10 @@ executable(
   link_with: libnm_glib
 )
 
-run_target(
+test(
   'check-local-exports-' + libnm_glib_name,
-  command: [check_exports, libnm_glib.full_path(), linker_script],
-  depends: libnm_glib
+  check_exports,
+  args: [libnm_glib.full_path(), linker_script],
 )
 
 if enable_tests
diff --git a/libnm-util/meson.build b/libnm-util/meson.build
index 55df550175..0ba7b6ee36 100644
--- a/libnm-util/meson.build
+++ b/libnm-util/meson.build
@@ -167,10 +167,10 @@ if enable_introspection
   )
 endif
 
-run_target(
+test(
   'check-local-exports-' + libnm_util_name,
-  command: [check_exports, libnm_util.full_path(), linker_script],
-  depends: libnm_util
+  check_exports,
+  args: [libnm_util.full_path(), linker_script],
 )
 
 sources = files(
diff --git a/libnm/meson.build b/libnm/meson.build
index 151ad9e87d..27089004c7 100644
--- a/libnm/meson.build
+++ b/libnm/meson.build
@@ -186,10 +186,10 @@ pkg.generate(
   ]
 )
 
-run_target(
+test(
   'check-local-exports-' + libnm_name,
-  command: [check_exports, libnm.full_path(), linker_script],
-  depends: libnm
+  check_exports,
+  args: [libnm.full_path(), linker_script],
 )
 
 if enable_introspection
diff --git a/meson.build b/meson.build
index bca1f40c23..cbff9956a5 100644
--- a/meson.build
+++ b/meson.build
@@ -809,7 +809,7 @@ intltool_xml_cmd = [intltool_merge, '-x', '-u', '-c', intltool_cache, po_dir, '@
 perl = find_program('perl')
 xsltproc = find_program('xsltproc')
 
-check_exports = join_paths(meson.source_root(), 'tools', 'check-exports.sh')
+check_exports = find_program(join_paths(meson.source_root(), 'tools', 'check-exports.sh'))
 
 content_files = []
 
diff --git a/src/devices/adsl/meson.build b/src/devices/adsl/meson.build
index ee804d2387..7ac0e123ea 100644
--- a/src/devices/adsl/meson.build
+++ b/src/devices/adsl/meson.build
@@ -20,10 +20,10 @@ libnm_device_plugin_adsl = shared_module(
 
 core_plugins += libnm_device_plugin_adsl
 
-run_target(
+test(
   'check-local-devices-adsl',
-  command: [check_exports, libnm_device_plugin_adsl.full_path(), linker_script_devices],
-  depends: libnm_device_plugin_adsl
+  check_exports,
+  args: [libnm_device_plugin_adsl.full_path(), linker_script_devices],
 )
 
 # FIXME: check_so_symbols replacement
diff --git a/src/devices/bluetooth/meson.build b/src/devices/bluetooth/meson.build
index 30284f9e0f..019f04f6b5 100644
--- a/src/devices/bluetooth/meson.build
+++ b/src/devices/bluetooth/meson.build
@@ -31,10 +31,10 @@ libnm_device_plugin_bluetooth = shared_module(
 
 core_plugins += libnm_device_plugin_bluetooth
 
-run_target(
+test(
   'check-local-devices-bluetooth',
-  command: [check_exports, libnm_device_plugin_bluetooth.full_path(), linker_script_devices],
-  depends: libnm_device_plugin_bluetooth
+  check_exports,
+  args: [libnm_device_plugin_bluetooth.full_path(), linker_script_devices],
 )
 
 # FIXME: check_so_symbols replacement
diff --git a/src/devices/ovs/meson.build b/src/devices/ovs/meson.build
index f4edd57c00..731965d61e 100644
--- a/src/devices/ovs/meson.build
+++ b/src/devices/ovs/meson.build
@@ -24,10 +24,10 @@ libnm_device_plugin_ovs = shared_module(
 
 core_plugins += libnm_device_plugin_ovs
 
-run_target(
+test(
   'check-local-devices-ovs',
-  command: [check_exports, libnm_device_plugin_ovs.full_path(), linker_script_devices],
-  depends: libnm_device_plugin_ovs
+  check_exports,
+  args: [libnm_device_plugin_ovs.full_path(), linker_script_devices],
 )
 
 # FIXME: check_so_symbols replacement
diff --git a/src/devices/team/meson.build b/src/devices/team/meson.build
index 159c182a2e..0f0763bd20 100644
--- a/src/devices/team/meson.build
+++ b/src/devices/team/meson.build
@@ -21,10 +21,10 @@ libnm_device_plugin_team = shared_module(
 
 core_plugins += libnm_device_plugin_team
 
-run_target(
+test(
   'check-local-devices-team',
-  command: [check_exports, libnm_device_plugin_team.full_path(), linker_script_devices],
-  depends: libnm_device_plugin_team
+  check_exports,
+  args: [libnm_device_plugin_team.full_path(), linker_script_devices],
 )
 
 # FIXME: check_so_symbols replacement
diff --git a/src/devices/wifi/meson.build b/src/devices/wifi/meson.build
index a27f8e6a03..2745040bed 100644
--- a/src/devices/wifi/meson.build
+++ b/src/devices/wifi/meson.build
@@ -33,10 +33,10 @@ libnm_device_plugin_wifi = shared_module(
 
 core_plugins += libnm_device_plugin_wifi
 
-run_target(
+test(
   'check-local-devices-wifi',
-  command: [check_exports, libnm_device_plugin_wifi.full_path(), linker_script_devices],
-  depends: libnm_device_plugin_wifi
+  check_exports,
+  args: [libnm_device_plugin_wifi.full_path(), linker_script_devices],
 )
 
 # FIXME: check_so_symbols replacement
diff --git a/src/devices/wwan/meson.build b/src/devices/wwan/meson.build
index abf585946a..2c0ea5a10c 100644
--- a/src/devices/wwan/meson.build
+++ b/src/devices/wwan/meson.build
@@ -35,10 +35,10 @@ libnm_wwan_dep = declare_dependency(
 
 core_plugins += libnm_wwan
 
-run_target(
+test(
   'check-wwan',
-  command: [check_exports, libnm_wwan.full_path(), linker_script],
-  depends: libnm_wwan
+  check_exports,
+  args: [libnm_wwan.full_path(), linker_script],
 )
 
 sources = files(