From ee9c73a923909e23a649407be77e25235d769e25 Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Fri, 11 May 2018 22:08:45 +0200
Subject: New upstream version 1.10.8

---
 libnm/tests/meson.build | 42 ------------------------------------------
 1 file changed, 42 deletions(-)
 delete mode 100644 libnm/tests/meson.build

(limited to 'libnm/tests/meson.build')

diff --git a/libnm/tests/meson.build b/libnm/tests/meson.build
deleted file mode 100644
index c47814b3..00000000
--- a/libnm/tests/meson.build
+++ /dev/null
@@ -1,42 +0,0 @@
-test_units = [
-  ['test-general', shared_utils, [libnm_utils]],
-  ['test-nm-client', shared_test_utils, []],
-  ['test-remote-settings-client',  shared_test_utils, []],
-  ['test-secret-agent', shared_test_utils, []]
-]
-
-deps = [
-  libnm_dep,
-  nm_core_dep
-]
-
-cflags = [
-  '-DNETWORKMANAGER_COMPILATION_TEST',
-  '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM',
-  '-DTEST_NM_SERVICE="@0@"'.format(join_paths(meson.source_root(), 'tools', 'test-networkmanager-service.py'))
-]
-
-foreach test_unit: test_units
-  exe = executable(
-    'libnm-' + test_unit[0],
-    [test_unit[0] + '.c'] + test_unit[1],
-    dependencies: deps,
-    c_args: cflags,
-    link_with: test_unit[2]
-  )
-
-  test(
-    'libnm/' + test_unit[0],
-    test_script,
-    args: test_args + [exe.full_path()]
-  )
-endforeach
-
-# just test, that we can build "nm-vpn-plugin-utils.c"
-libnm_vpn_plugin_utils_test = static_library(
-  'nm-vpn-plugin-utils-test',
-  sources: shared_vpn_plugin_utils + [libnm_enum[1]],
-  include_directories: libnm_inc,
-  dependencies: nm_core_dep,
-  c_args: cflags
-)
-- 
cgit 1.3.0-6-gf8a5


From 04bc9e1cd3544445d883ad29ea108c1645c8e7b7 Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Mon, 4 Jun 2018 00:07:45 +0200
Subject: New upstream version 1.11.4

---
 libnm/tests/meson.build | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 libnm/tests/meson.build

(limited to 'libnm/tests/meson.build')

diff --git a/libnm/tests/meson.build b/libnm/tests/meson.build
new file mode 100644
index 00000000..e2b88273
--- /dev/null
+++ b/libnm/tests/meson.build
@@ -0,0 +1,42 @@
+test_units = [
+  ['test-general',                [libnm_utils, libnm_core]],
+  ['test-nm-client',              []],
+  ['test-remote-settings-client', []],
+  ['test-secret-agent',           []],
+]
+
+cflags = [
+  '-DNETWORKMANAGER_COMPILATION_TEST',
+  '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM',
+] + nm_build_cflags
+
+foreach test_unit: test_units
+  exe = executable(
+    'libnm-' + test_unit[0],
+    [
+      test_unit[0] + '.c',
+      shared_nm_test_utils_impl_c,
+    ],
+    dependencies: [
+      libnm_dep,
+      nm_core_dep,
+    ],
+    c_args: cflags,
+    link_with: test_unit[1]
+  )
+
+  test(
+    'libnm/' + test_unit[0],
+    test_script,
+    args: test_args + [exe.full_path()]
+  )
+endforeach
+
+# just test, that we can build "nm-vpn-plugin-utils.c"
+libnm_vpn_plugin_utils_test = static_library(
+  'nm-vpn-plugin-utils-test',
+  sources: shared_nm_utils_nm_vpn_plugin_utils_c + [libnm_enum[1]],
+  include_directories: libnm_inc,
+  dependencies: nm_core_dep,
+  c_args: cflags
+)
-- 
cgit 1.3.0-6-gf8a5