From 15d97f1b6fad5cb52abff11a2d0f9991f1cd6bf7 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 27 Jan 2021 21:15:32 +0100 Subject: [PATCH] build/meson: cleanup "libnm-core/tests/meson.build" --- libnm-core/tests/meson.build | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/libnm-core/tests/meson.build b/libnm-core/tests/meson.build index 0f6a4f502..83ba89c47 100644 --- a/libnm-core/tests/meson.build +++ b/libnm-core/tests/meson.build @@ -1,30 +1,12 @@ # SPDX-License-Identifier: LGPL-2.1-or-later -# 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' - 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"', ) -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,7 +27,10 @@ foreach test_unit: test_units libnm_core_nm_default_dep, libnm_base_dep, ], - c_args: c_flags, + c_args: [ + '-DNETWORKMANAGER_COMPILATION_TEST', + '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE', + ], link_with: libnm_systemd_logging_stub, )