New upstream version 1.29.90 upstream/1.29.90

1 files changed, 11 insertions, 29 deletions

diff --git a/libnm-core/tests/meson.build b/libnm-core/tests/meson.build
index 4ce42526..df5209b4 100644
--- a/libnm-core/tests/meson.build
+++ b/libnm-core/tests/meson.build
@@ -1,36 +1,12 @@
-# SPDX-License-Identifier: LGPL-2.1+
-
-# test-cert.p12 created with:
-#
-# openssl pkcs12 -export \
-# -in test_key_and_cert.pem \
-# -inkey test_key_and_cert.pem \
-# -certfile test_ca_cert.pem \
-# -name "test-pkcs12" \
-# -out test-cert.p12
-
-enum_types = 'nm-core-tests-enum-types'
+# SPDX-License-Identifier: LGPL-2.1-or-later
 
 enum_sources = gnome.mkenums_simple(
-  enum_types,
+  'nm-core-tests-enum-types',
   sources: 'test-general-enums.h',
   identifier_prefix: nm_id_prefix,
-  body_prefix: '#include "nm-default.h"',
+  body_prefix: '#include "libnm-core/nm-default-libnm-core.h"',
 )
 
-deps = [
-  libnm_keyfile_dep,
-  libnm_core_dep,
-  libnm_core_nm_default_dep,
-]
-
-c_flags = [
-  '-DNETWORKMANAGER_COMPILATION_TEST',
-  '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE',
-]
-
-test_cert_dir = join_paths(meson.current_source_dir(), 'certs')
-
 test_units = [
   'test-compare',
   'test-crypto',
@@ -45,8 +21,14 @@ foreach test_unit: test_units
   exe = executable(
     'libnm-core-' + test_unit,
     [test_unit + '.c'] + enum_sources,
-    dependencies: deps,
-    c_args: c_flags,
+    dependencies: [
+      libnm_core_dep,
+      libnm_core_nm_default_dep,
+      libnm_base_dep,
+    ],
+    c_args: [
+      '-DG_LOG_DOMAIN="test"',
+    ],
     link_with: libnm_systemd_logging_stub,
   )