Merge remote-tracking branch 'salsa/debian/master'

2 files changed, 13 insertions, 28 deletions

diff --git a/dispatcher/tests/meson.build b/dispatcher/tests/meson.build
index 9d6a16de..83c915e5 100644
--- a/dispatcher/tests/meson.build
+++ b/dispatcher/tests/meson.build
@@ -1,22 +1,21 @@
 test_unit = 'test-dispatcher-envp'
 
-incs = [
-  dispatcher_inc,
-  libnm_inc,
+deps = [
+  libnm_nm_default_dep,
+  libnm_utils_base_dep,
+]
+
+c_flags = [
+  '-DNETWORKMANAGER_COMPILATION_TEST',
+  '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT',
 ]
 
 exe = executable(
   test_unit,
-  [ test_unit + '.c' ] + [ nmdbus_dispatcher_sources ],
-  include_directories: incs,
-  dependencies: [
-    libnm_core_dep,
-    libnm_dep,
-  ],
-  c_args: [
-      '-DNETWORKMANAGER_COMPILATION_TEST',
-      '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT',
-    ],
+  [test_unit + '.c', nmdbus_dispatcher_sources],
+  include_directories: dispatcher_inc,
+  dependencies: deps,
+  c_args: c_flags,
   link_with: libnm_dispatcher_core,
 )
 
diff --git a/dispatcher/tests/test-dispatcher-envp.c b/dispatcher/tests/test-dispatcher-envp.c
index 47ed04ee..240b8951 100644
--- a/dispatcher/tests/test-dispatcher-envp.c
+++ b/dispatcher/tests/test-dispatcher-envp.c
@@ -1,20 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
  * Copyright (C) 2011 Red Hat, Inc.
- *
  */
 
 #include "nm-default.h"