[#3729] Add the rest of the meson.build files

diff --git a/fuzz/meson.build b/fuzz/meson.build
index 13aa0c3d4ca0f020910a438b07d3d34bced92548..bb6ba3568ccfcc74049602f346f61fe6e026e084 100644 (file)
--- a/fuzz/meson.build
+++ b/fuzz/meson.build
@@ -1,3 +1,7 @@
+if not gtest.found()
+    subdir_done()
+endif
+
 subdir('input')
 subdir('tests')
 

diff --git a/fuzz/tests/meson.build b/fuzz/tests/meson.build
index ba1b482c498cb67cbdc6ab93e8dde3e909efb416..b9084099df05d56bb71a3d1cd7de9b58927c4ad3 100644 (file)
--- a/fuzz/tests/meson.build
+++ b/fuzz/tests/meson.build
@@ -1,32 +1,13 @@
-test(
+foreach i : [
     'test_fuzz_http_endpoint_kea_dhcp4.sh',
-    find_program('test_fuzz_http_endpoint_kea_dhcp4.sh'),
-)
-test(
     'test_fuzz_packets_kea_dhcp6.sh',
-    find_program('test_fuzz_packets_kea_dhcp6.sh'),
-)
-test(
     'test_fuzz_config_kea_dhcp4.sh',
-    find_program('test_fuzz_config_kea_dhcp4.sh'),
-)
-test(
     'test_fuzz_packets_kea_dhcp4.sh',
-    find_program('test_fuzz_packets_kea_dhcp4.sh'),
-)
-test(
     'test_fuzz_unix_socket_kea_dhcp6.sh',
-    find_program('test_fuzz_unix_socket_kea_dhcp6.sh'),
-)
-test(
     'test_fuzz_config_kea_dhcp6.sh',
-    find_program('test_fuzz_config_kea_dhcp6.sh'),
-)
-test(
     'test_fuzz_unix_socket_kea_dhcp4.sh',
-    find_program('test_fuzz_unix_socket_kea_dhcp4.sh'),
-)
-test(
     'test_fuzz_http_endpoint_kea_dhcp6.sh',
-    find_program('test_fuzz_http_endpoint_kea_dhcp6.sh'),
-)
+]
+    t = configure_file(input: i, output: i, copy: true)
+    test(i, t)
+endforeach

diff --git a/meson.build b/meson.build
index bc20e3e24a0c37a1f6fc6daa486ad97068a29994..7b766baa4546028357c843b774a4d1b9756d589d 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -164,6 +164,7 @@ if not crypto.found()
 endif
 
 # Kerberos
+krb5 = disabler()
 krb5_config = find_program('krb5-config', required: false)
 if krb5_config.found()
     cflags = run_command([krb5_config, '--cflags', 'gssapi'], check: false)
@@ -243,8 +244,8 @@ endif
 
 # NETCONF
 netconf_deps = {}
-netconf_deps_array = []
-netconf_deps_found = true
+NETCONF_DEPS_ARRAY = []
+NETCONF_DEPS_FOUND = true
 foreach dep : ['yang', 'yang-cpp', 'sysrepo', 'sysrepo-cpp']
     netconf_deps = netconf_deps + {dep: dependency(dep, required: false)}
     if netconf_deps[dep].found()
@@ -272,9 +273,9 @@ foreach dep : ['yang', 'yang-cpp', 'sysrepo', 'sysrepo-cpp']
 endforeach
 foreach dep : ['yang', 'yang-cpp', 'sysrepo', 'sysrepo-cpp']
     if netconf_deps[dep].found()
-        netconf_deps_array += netconf_deps[dep]
+        NETCONF_DEPS_ARRAY += netconf_deps[dep]
     else
-        netconf_deps_found = false
+        NETCONF_DEPS_FOUND = false
     endif
 endforeach
 

diff --git a/src/bin/agent/tests/meson.build b/src/bin/agent/tests/meson.build
new file mode 100644 (file)
index 0000000..ac95e5d
--- /dev/null
+++ b/src/bin/agent/tests/meson.build
@@ -0,0 +1,30 @@
+if not gtest.found()
+    subdir_done()
+endif
+
+current_build_dir = meson.current_build_dir()
+
+kea_agent_tests = executable(
+    'kea-agent-tests',
+    'basic_auth_library.cc',
+    'ca_cfg_mgr_unittests.cc',
+    'ca_command_mgr_unittests.cc',
+    'ca_controller_unittests.cc',
+    'ca_process_unittests.cc',
+    'ca_response_creator_factory_unittests.cc',
+    'ca_response_creator_unittests.cc',
+    'ca_unittests.cc',
+    'callout_library.cc',
+    'get_config_unittest.cc',
+    'parser_unittests.cc',
+    cpp_args: [
+        f'-DCFG_EXAMPLES="@TOP_SOURCE_DIR@/doc/examples/agent"',
+        f'-DSYNTAX_FILE="@current_source_dir@/../agent_parser.yy"',
+        f'-DTEST_CA_DIR="@TEST_CA_DIR@"',
+        f'-DTEST_DATA_BUILDDIR="@current_build_dir@"',
+    ],
+    dependencies: [gtest],
+    include_directories: [include_directories('.')] + INCLUDES,
+    link_with: [agent_lib] + LIBS_BUILT_SO_FAR,
+)
+test('kea-agent-tests', kea_agent_tests, protocol: 'gtest')

diff --git a/src/bin/d2/tests/meson.build b/src/bin/d2/tests/meson.build
new file mode 100644 (file)
index 0000000..0ad9c90
--- /dev/null
+++ b/src/bin/d2/tests/meson.build
@@ -0,0 +1,35 @@
+if not gtest.found()
+    subdir_done()
+endif
+
+current_build_dir = meson.current_build_dir()
+
+kea_d2_tests = executable(
+    'kea-d2-tests',
+    'check_exists_add.cc',
+    'check_exists_remove.cc',
+    'd2_controller.cc',
+    'd2_lexer.cc',
+    'd2_parser.cc',
+    'd2_process.cc',
+    'd2_queue_mgr.cc',
+    'd2_update_mgr.cc',
+    'main.cc',
+    'nc_add.cc',
+    'nc_remove.cc',
+    'parser_context.cc',
+    'simple_add.cc',
+    'simple_add_without_dhcid.cc',
+    'simple_remove.cc',
+    'simple_remove_without_dhcid.cc',
+    cpp_args: [
+        f'-DCFG_EXAMPLES="@TOP_SOURCE_DIR@/doc/examples/ddns"',
+        f'-DSYNTAX_FILE="@current_source_dir@/../d2_parser.yy"',
+        f'-DTEST_CA_DIR="@TEST_CA_DIR@"',
+        f'-DTEST_DATA_BUILDDIR="@current_build_dir@"',
+    ],
+    dependencies: [gtest],
+    include_directories: [include_directories('.')] + INCLUDES,
+    link_with: [d2_lib] + LIBS_BUILT_SO_FAR,
+)
+test('kea-d2-tests', kea_d2_tests, protocol: 'gtest')

diff --git a/src/bin/dhcp4/tests/meson.build b/src/bin/dhcp4/tests/meson.build
index 420f205479e720bc14ad03404cc403443a71af62..88488af655ebf117d6e976ed48fbf1ce84bbb7b1 100644 (file)
--- a/src/bin/dhcp4/tests/meson.build
+++ b/src/bin/dhcp4/tests/meson.build
@@ -44,6 +44,7 @@ test(
     dhcp4_process_tests,
     workdir: current_build_dir,
     is_parallel: false,
+    priority: -1,
 )
 configure_file(
     input: 'marker_file.h.in',
@@ -61,8 +62,8 @@ configure_file(
     configuration: dhcp4_tests_conf_data,
 )
 # Not yet used configs-list.txt
-dhcp4_unittests = executable(
-    'dhcp4_unittests',
+kea_dhcp4_tests = executable(
+    'kea-dhcp4-tests',
     'classify_unittest.cc',
     'client_handler_unittest.cc',
     'config_backend_unittest.cc',
@@ -102,9 +103,15 @@ dhcp4_unittests = executable(
     ],
     dependencies: dhcp4_tests_deps,
     include_directories: [include_directories('.')] + INCLUDES,
-    link_with: [dhcp4_lib] + dhcp4_tests_libs + LIBS_BUILT_SO_FAR,
+    link_with: [dhcp4_lib, dhcp4_tests_libs] + LIBS_BUILT_SO_FAR,
+)
+test(
+    'kea-dhcp4-tests',
+    kea_dhcp4_tests,
+    protocol: 'gtest',
+    is_parallel: false,
+    priority: -1,
 )
-test('dhcp4_unittests', dhcp4_unittests, protocol: 'gtest', is_parallel: false)
 
 shared_library(
     'co1',

diff --git a/src/bin/dhcp6/tests/meson.build b/src/bin/dhcp6/tests/meson.build
new file mode 100644 (file)
index 0000000..45d18c8
--- /dev/null
+++ b/src/bin/dhcp6/tests/meson.build
@@ -0,0 +1,144 @@
+if not gtest.found()
+    subdir_done()
+endif
+
+current_build_dir = meson.current_build_dir()
+current_source_dir = meson.current_source_dir()
+dhcp6_tests_deps = [boost, crypto, gtest]
+dhcp6_tests_libs = [
+    kea_dhcpsrv_testutils_lib,
+    kea_dhcp_testutils_lib,
+    kea_database_testutils_lib,
+    kea_testutils_lib,
+    kea_util_unittests_lib,
+    kea_asiolink_testutils_lib,
+]
+if mysql.found()
+    dhcp6_tests_deps += [mysql]
+    dhcp6_tests_libs += [
+        dhcp_mysql_archive,
+        kea_mysql_testutils_lib,
+        kea_mysql_lib,
+    ]
+endif
+if postgresql.found()
+    dhcp6_tests_deps += [postgresql]
+    dhcp6_tests_libs += [
+        dhcp_pgsql_archive,
+        kea_pgsql_testutils_lib,
+        kea_pgsql_lib,
+    ]
+endif
+
+dhcp6_tests_conf_data = configuration_data()
+dhcp6_tests_conf_data.set('abs_top_builddir', TOP_BUILD_DIR)
+dhcp6_tests_conf_data.set('abs_top_srcdir', TOP_SOURCE_DIR)
+dhcp6_tests_conf_data.set('abs_builddir', meson.current_build_dir())
+dhcp6_process_tests = configure_file(
+    input: 'meson-dhcp6_process_tests.sh.in',
+    output: 'dhcp6_process_tests.sh',
+    configuration: dhcp6_tests_conf_data,
+)
+test(
+    'dhcp6_process_tests.sh',
+    dhcp6_process_tests,
+    workdir: current_build_dir,
+    is_parallel: false, priority: -1,
+)
+configure_file(
+    input: 'marker_file.h.in',
+    output: 'marker_file.h',
+    configuration: dhcp6_tests_conf_data,
+)
+configure_file(
+    input: 'test_data_files_config.h.in',
+    output: 'test_data_files_config.h',
+    configuration: dhcp6_tests_conf_data,
+)
+configure_file(
+    input: 'meson-test_libraries.h.in',
+    output: 'test_libraries.h',
+    configuration: dhcp6_tests_conf_data,
+)
+# Not yet used configs-list.txt
+kea_dhcp6_tests = executable(
+    'kea-dhcp6-tests',
+    'classify_unittest.cc',
+    'client_handler_unittest.cc',
+    'config_backend_unittest.cc',
+    'config_parser_unittest.cc',
+    'ctrl_dhcp6_srv_unittest.cc',
+    'd2_unittest.cc',
+    'decline_unittest.cc',
+    'dhcp6_client.cc',
+    'dhcp6_srv_unittest.cc',
+    'dhcp6_test_utils.cc',
+    'dhcp6_unittests.cc',
+    'dhcp6to6_ipc_unittest.cc',
+    'direct_client_unittest.cc',
+    'dora_unittest.cc',
+    'fqdn_unittest.cc',
+    'get_config_unittest.cc',
+    'hooks_unittest.cc',
+    'host_options_unittest.cc',
+    'host_unittest.cc',
+    'http_control_socket_unittest.cc',
+    'inform_unittest.cc',
+    'kea_controller_unittest.cc',
+    'marker_file.cc',
+    'out_of_range_unittest.cc',
+    'parser_unittest.cc',
+    'release_unittest.cc',
+    'shared_network_unittest.cc',
+    'simple_parser6_unittest.cc',
+    'vendor_opts_unittest.cc',
+    cpp_args: [
+        f'-DTEST_DATA_BUILDDIR="@current_build_dir@"',
+        f'-DCFG_EXAMPLES="@TOP_SOURCE_DIR@/doc/examples/kea6"',
+        f'-DDHCP_DATA_DIR="@current_build_dir@"',
+        f'-DSYNTAX_FILE="@current_source_dir@/../dhcp6_parser.yy"',
+        f'-DKEA_LFC_EXECUTABLE="@KEA_LFC@"',
+        f'-DTEST_CA_DIR="@TEST_CA_DIR@"',
+    ],
+    dependencies: dhcp6_tests_deps,
+    include_directories: [include_directories('.')] + INCLUDES,
+    link_with: [dhcp6_lib, dhcp6_tests_libs] + LIBS_BUILT_SO_FAR,
+)
+test('kea-dhcp6-tests', kea_dhcp6_tests, protocol: 'gtest', is_parallel: false, priority: -1)
+
+shared_library(
+    'co1',
+    'callout_library_1.cc',
+    dependencies: dhcp6_tests_deps,
+    include_directories: [include_directories('.')] + INCLUDES,
+    link_with: LIBS_BUILT_SO_FAR,
+    build_rpath: '/nowhere',
+    name_suffix: 'so',
+)
+shared_library(
+    'co2',
+    'callout_library_2.cc',
+    dependencies: dhcp6_tests_deps,
+    include_directories: [include_directories('.')] + INCLUDES,
+    link_with: LIBS_BUILT_SO_FAR,
+    build_rpath: '/nowhere',
+    name_suffix: 'so',
+)
+shared_library(
+    'co3',
+    'callout_library_3.cc',
+    dependencies: dhcp6_tests_deps,
+    include_directories: [include_directories('.')] + INCLUDES,
+    link_with: LIBS_BUILT_SO_FAR,
+    build_rpath: '/nowhere',
+    name_suffix: 'so',
+)
+shared_library(
+    'co4',
+    'callout_library_4.cc',
+    dependencies: dhcp6_tests_deps,
+    include_directories: [include_directories('.')] + INCLUDES,
+    link_with: LIBS_BUILT_SO_FAR,
+    build_rpath: '/nowhere',
+    name_suffix: 'so',
+)

diff --git a/src/bin/keactrl/meson.build b/src/bin/keactrl/meson.build
index e47c24aff7ea6247b0e0c0825e550f4b516bcaf2..06d5f83fa6c96329a402260985c8cf39351fc841 100644 (file)
--- a/src/bin/keactrl/meson.build
+++ b/src/bin/keactrl/meson.build
@@ -4,7 +4,7 @@ keactrl_conf_data.set('sysconfdir', '${prefix}/' + SYSCONFDIR)
 keactrl_conf_data.set('PACKAGE', 'kea')
 keactrl_conf_data.set('exec_prefix', '${prefix}')
 keactrl_conf_data.set('sbindir', '${prefix}/' + get_option('sbindir'))
-if netconf_deps_found
+if NETCONF_DEPS_FOUND
     keactrl_conf_data.set('HAVE_NETCONF', 'yes')
 else
     keactrl_conf_data.set('HAVE_NETCONF', 'no')
@@ -59,6 +59,6 @@ custom_target(
     input: 'kea-netconf.conf.pre',
     output: 'kea-netconf.conf',
     command: [path_replacer, '@INPUT@', '@OUTPUT@'],
-    install: netconf_deps_found,
+    install: NETCONF_DEPS_FOUND,
     install_dir: kea_configfiles_destdir,
 )

diff --git a/src/bin/lfc/tests/meson.build b/src/bin/lfc/tests/meson.build
index c0c5916040202aeeff8757d5960ac4adfdff43ae..3ea67825c18e9ce2194ae73174c4745d8ecc3f43 100644 (file)
--- a/src/bin/lfc/tests/meson.build
+++ b/src/bin/lfc/tests/meson.build
@@ -3,8 +3,8 @@ if not gtest.found()
 endif
 
 current_build_dir = meson.current_build_dir()
-lfc_unittests = executable(
-    'lfc-unittests',
+kea_lfc_tests = executable(
+    'kea-lfc-tests',
     'lfc_controller_unittests.cc',
     'lfc_unittests.cc',
     cpp_args: [f'-DTEST_DATA_BUILDDIR="@current_build_dir@"'],
@@ -12,4 +12,4 @@ lfc_unittests = executable(
     include_directories: [include_directories('.')] + INCLUDES,
     link_with: [lfc_lib] + LIBS_BUILT_SO_FAR,
 )
-test('lfc_unittests', lfc_unittests, protocol: 'gtest')
+test('kea-lfc-tests', kea_lfc_tests, protocol: 'gtest')

diff --git a/src/bin/netconf/meson.build b/src/bin/netconf/meson.build
new file mode 100644 (file)
index 0000000..8aae12c
--- /dev/null
+++ b/src/bin/netconf/meson.build
@@ -0,0 +1,33 @@
+if not NETCONF_DEPS_FOUND
+    subdir_done()
+endif
+
+netconf_lib = static_library(
+    'control_socket.cc',
+    'http_control_socket.cc',
+    'netconf.cc',
+    'netconf_cfg_mgr.cc',
+    'netconf_config.cc',
+    'netconf_controller.cc',
+    'netconf_lexer.cc',
+    'netconf_log.cc',
+    'netconf_messages.cc',
+    'netconf_parser.cc',
+    'netconf_process.cc',
+    'parser_context.cc',
+    'simple_parser.cc',
+    'stdout_control_socket.cc',
+    'unix_control_socket.cc',
+    include_directories: [include_directories('.')] + INCLUDES,
+    override_options: ['cpp_std=c++20'],
+)
+
+executable(
+    'kea-netconf',
+    'main.cc',
+    include_directories: [include_directories('.')] + INCLUDES,
+    install: true,
+    install_dir: 'sbin',
+    link_with: [netconf_lib] + LIBS_BUILT_SO_FAR,
+    override_options: ['cpp_std=c++20'],
+)

diff --git a/src/bin/netconf/tests/meson.build b/src/bin/netconf/tests/meson.build
new file mode 100644 (file)
index 0000000..f02ea77
--- /dev/null
+++ b/src/bin/netconf/tests/meson.build
@@ -0,0 +1,21 @@
+if not gtest.found() or not NETCONF_DEPS_FOUND
+    subdir_done()
+endif
+
+kea_netconf_tests = executable(
+    'kea-netconf-tests',
+    'basic_library.cc',
+    'control_socket_unittests.cc',
+    'get_config_unittest.cc',
+    'netconf_cfg_mgr_unittests.cc',
+    'netconf_controller_unittests.cc',
+    'netconf_process_unittests.cc',
+    'netconf_unittests.cc',
+    'parser_unittests.cc',
+    'run_unittests.cc',
+    dependencies: NETCONF_DEPS_ARRAY + [gtest],
+    include_directories: [include_directories('.')] + INCLUDES,
+    link_with: [kea_yang_tests_lib] + LIBS_BUILT_SO_FAR,
+    override_options: ['cpp_std=c++20'],
+)
+test('kea-netconf-tests', kea_netconf_tests, protocol: 'gtest')

diff --git a/src/bin/perfdhcp/tests/meson.build b/src/bin/perfdhcp/tests/meson.build
new file mode 100644 (file)
index 0000000..8d02b2b
--- /dev/null
+++ b/src/bin/perfdhcp/tests/meson.build
@@ -0,0 +1,24 @@
+if not gtest.found()
+    subdir_done()
+endif
+
+perfdhcp_tests = executable(
+    'perfdhcp-tests',
+    'avalanche_scen_unittest.cc',
+    'basic_scen_unittest.cc',
+    'command_options_unittest.cc',
+    'localized_option_unittest.cc',
+    'packet_storage_unittest.cc',
+    'perf_pkt4_unittest.cc',
+    'perf_pkt6_unittest.cc',
+    'perf_socket_unittest.cc',
+    'rate_control_unittest.cc',
+    'receiver_unittest.cc',
+    'run_unittests.cc',
+    'stats_mgr_unittest.cc',
+    'test_control_unittest.cc',
+    dependencies: [gtest],
+    include_directories: [include_directories('.')] + INCLUDES,
+    link_with: LIBS_BUILT_SO_FAR,
+)
+test('perfdhcp-tests', perfdhcp_tests, protocol: 'gtest')

diff --git a/src/hooks/dhcp/bootp/libloadtests/meson.build b/src/hooks/dhcp/bootp/libloadtests/meson.build
index 2216ac7c246021289740740ec654d828f858d076..46cb27aa0fe8cecf2585aff9a2b40e7225e6973b 100644 (file)
--- a/src/hooks/dhcp/bootp/libloadtests/meson.build
+++ b/src/hooks/dhcp/bootp/libloadtests/meson.build
@@ -13,4 +13,4 @@ dhcp_bootp_libload_tests = executable(
     include_directories: [include_directories('.'), include_directories('..')] + INCLUDES,
     link_with: LIBS_BUILT_SO_FAR,
 )
-test('dhcp_bootp_libload_tests', dhcp_bootp_libload_tests, protocol: 'gtest')
+test('dhcp-bootp-libload-tests', dhcp_bootp_libload_tests, protocol: 'gtest')

diff --git a/src/hooks/dhcp/bootp/tests/meson.build b/src/hooks/dhcp/bootp/tests/meson.build
index ea889a04ea9aacdc3be90820c1f1af6dc1a17bcd..efa912066e79ae8ea90d68e258c5201e6837aa89 100644 (file)
--- a/src/hooks/dhcp/bootp/tests/meson.build
+++ b/src/hooks/dhcp/bootp/tests/meson.build
@@ -13,4 +13,4 @@ dhcp_bootp_lib_tests = executable(
     include_directories: [include_directories('.'), include_directories('..')] + INCLUDES,
     link_with: [dhcp_bootp_archive] + LIBS_BUILT_SO_FAR,
 )
-test('dhcp_bootp_lib_tests', dhcp_bootp_lib_tests, protocol: 'gtest')
+test('dhcp-bootp-lib-tests', dhcp_bootp_lib_tests, protocol: 'gtest')

diff --git a/src/hooks/dhcp/flex_option/libloadtests/meson.build b/src/hooks/dhcp/flex_option/libloadtests/meson.build
index ce8f8887839ab525b3b4386ec566d279533c897c..3e25a1fa1f4b6466ed0f310188e25a17c35013fc 100644 (file)
--- a/src/hooks/dhcp/flex_option/libloadtests/meson.build
+++ b/src/hooks/dhcp/flex_option/libloadtests/meson.build
@@ -15,7 +15,7 @@ dhcp_flex_option_libload_tests = executable(
     link_with: LIBS_BUILT_SO_FAR,
 )
 test(
-    'dhcp_flex_option_libload_tests',
+    'dhcp-flex-option-libload-tests',
     dhcp_flex_option_libload_tests,
     protocol: 'gtest',
 )

diff --git a/src/hooks/dhcp/flex_option/tests/meson.build b/src/hooks/dhcp/flex_option/tests/meson.build
index f3432fccc03667feaeb798987d23e06f122ad29a..8d67b45a85f243fc073c561dbb4752e2ffcb73cc 100644 (file)
--- a/src/hooks/dhcp/flex_option/tests/meson.build
+++ b/src/hooks/dhcp/flex_option/tests/meson.build
@@ -14,4 +14,4 @@ dhcp_flex_option_lib_tests = executable(
     include_directories: [include_directories('.'), include_directories('..')] + INCLUDES,
     link_with: [dhcp_flex_option_archive] + LIBS_BUILT_SO_FAR,
 )
-test('dhcp_flex_option_lib_tests', dhcp_flex_option_lib_tests, protocol: 'gtest')
+test('dhcp-flex-option-lib-tests', dhcp_flex_option_lib_tests, protocol: 'gtest')

diff --git a/src/hooks/dhcp/high_availability/libloadtests/meson.build b/src/hooks/dhcp/high_availability/libloadtests/meson.build
index 99fbfaf553365797c91034ff29074cdee5d6c303..b7892a45831368fd73e105cceaef62be7fbded92 100644 (file)
--- a/src/hooks/dhcp/high_availability/libloadtests/meson.build
+++ b/src/hooks/dhcp/high_availability/libloadtests/meson.build
@@ -14,4 +14,4 @@ dhcp_ha_libload_tests = executable(
     include_directories: [include_directories('.'), include_directories('..')] + INCLUDES,
     link_with: LIBS_BUILT_SO_FAR,
 )
-test('dhcp_ha_libload_tests', dhcp_ha_libload_tests, protocol: 'gtest')
+test('dhcp-ha-libload-tests', dhcp_ha_libload_tests, protocol: 'gtest')

diff --git a/src/hooks/dhcp/high_availability/tests/meson.build b/src/hooks/dhcp/high_availability/tests/meson.build
index 7eadebd0a9b4ba273d6de9a1a5a1ae0fdda34a8b..70e38f750567f4af80096c24f43d47862d0b79d9 100644 (file)
--- a/src/hooks/dhcp/high_availability/tests/meson.build
+++ b/src/hooks/dhcp/high_availability/tests/meson.build
@@ -23,11 +23,13 @@ dhcp_ha_lib_tests = executable(
     ],
     dependencies: [gtest, crypto],
     include_directories: [include_directories('.'), include_directories('..')] + INCLUDES,
-    link_with: [dhcp_ha_archive] + [kea_testutils_lib] + LIBS_BUILT_SO_FAR,
+    link_with: [dhcp_ha_archive, [kea_testutils_lib]] + LIBS_BUILT_SO_FAR,
 )
 test(
-    'dhcp_ha_lib_tests',
+    'dhcp-ha-lib-tests',
     dhcp_ha_lib_tests,
     protocol: 'gtest',
     is_parallel: false,
+    priority: -1,
+    timeout: 60,
 )

diff --git a/src/hooks/dhcp/lease_cmds/libloadtests/meson.build b/src/hooks/dhcp/lease_cmds/libloadtests/meson.build
index 270d772e18b81981aab6ebb10ffe3f02ae27ceda..07639aff6670cabdf83a02ea3358a12151466c46 100644 (file)
--- a/src/hooks/dhcp/lease_cmds/libloadtests/meson.build
+++ b/src/hooks/dhcp/lease_cmds/libloadtests/meson.build
@@ -14,7 +14,7 @@ dhcp_lease_cmds_libload_tests = executable(
     link_with: LIBS_BUILT_SO_FAR,
 )
 test(
-    'dhcp_lease_cmds_libload_tests',
+    'dhcp-lease-cmds-libload-tests',
     dhcp_lease_cmds_libload_tests,
     protocol: 'gtest',
 )

diff --git a/src/hooks/dhcp/lease_cmds/tests/meson.build b/src/hooks/dhcp/lease_cmds/tests/meson.build
index cc0a7dff54d3d94a51c15193b6d9006bede17451..14a30efde86cdb89baf1547f0e3fce56102b8686 100644 (file)
--- a/src/hooks/dhcp/lease_cmds/tests/meson.build
+++ b/src/hooks/dhcp/lease_cmds/tests/meson.build
@@ -15,4 +15,4 @@ dhcp_lease_cmds_lib_tests = executable(
     include_directories: [include_directories('.'), include_directories('..')] + INCLUDES,
     link_with: [dhcp_lease_cmds_archive] + LIBS_BUILT_SO_FAR,
 )
-test('dhcp_lease_cmds_lib_tests', dhcp_lease_cmds_lib_tests, protocol: 'gtest')
+test('dhcp-lease-cmds-lib-tests', dhcp_lease_cmds_lib_tests, protocol: 'gtest')

diff --git a/src/hooks/dhcp/mysql/libloadtests/meson.build b/src/hooks/dhcp/mysql/libloadtests/meson.build
index dbddb3828d7eb6a1517c6997ea7077475d5491e3..8b11aef78fc7d8f1bc19399ba8bd86ae9f62fe0a 100644 (file)
--- a/src/hooks/dhcp/mysql/libloadtests/meson.build
+++ b/src/hooks/dhcp/mysql/libloadtests/meson.build
@@ -13,4 +13,4 @@ dhcp_mysql_libload_tests = executable(
     include_directories: [include_directories('.'), include_directories('..')] + INCLUDES,
     link_with: LIBS_BUILT_SO_FAR,
 )
-test('dhcp_mysql_libload_tests', dhcp_mysql_libload_tests, protocol: 'gtest')
+test('dhcp-mysql-libload-tests', dhcp_mysql_libload_tests, protocol: 'gtest')

diff --git a/src/hooks/dhcp/mysql/tests/meson.build b/src/hooks/dhcp/mysql/tests/meson.build
index 7c323617208bf39b8314be1db6b1ac9fc00e5399..27898329e0d31b043ff32b8adcaf57edbcb3d5b9 100644 (file)
--- a/src/hooks/dhcp/mysql/tests/meson.build
+++ b/src/hooks/dhcp/mysql/tests/meson.build
@@ -1,4 +1,4 @@
-if not gtest.found()
+if not gtest.found() or not mysql.found()
     subdir_done()
 endif
 
@@ -21,11 +21,13 @@ dhcp_mysql_lib_tests = executable(
     'run_unittests.cc',
     dependencies: [gtest, crypto, mysql],
     include_directories: [include_directories('.'), include_directories('..')] + INCLUDES,
-    link_with: [dhcp_mysql_archive] + libs_testutils + LIBS_BUILT_SO_FAR,
+    link_with: [dhcp_mysql_archive, libs_testutils] + LIBS_BUILT_SO_FAR,
 )
 test(
-    'dhcp_mysql_lib_tests',
+    'dhcp-mysql-lib-tests',
     dhcp_mysql_lib_tests,
     protocol: 'gtest',
     is_parallel: false,
+    priority: -1,
+    timeout: 120,
 )

diff --git a/src/hooks/dhcp/perfmon/libloadtests/meson.build b/src/hooks/dhcp/perfmon/libloadtests/meson.build
index f20c7146f38dcf277ebda04992df7ab25de668c9..1d0a2bbdef0ab095a38d0b3913ac18a4aa94f9db 100644 (file)
--- a/src/hooks/dhcp/perfmon/libloadtests/meson.build
+++ b/src/hooks/dhcp/perfmon/libloadtests/meson.build
@@ -13,4 +13,4 @@ dhcp_perfmon_libload_tests = executable(
     include_directories: [include_directories('.'), include_directories('..')] + INCLUDES,
     link_with: LIBS_BUILT_SO_FAR,
 )
-test('dhcp_perfmon_libload_tests', dhcp_perfmon_libload_tests, protocol: 'gtest')
+test('dhcp-perfmon-libload-tests', dhcp_perfmon_libload_tests, protocol: 'gtest')

diff --git a/src/hooks/dhcp/perfmon/tests/meson.build b/src/hooks/dhcp/perfmon/tests/meson.build
index 3f767f1947ce9fe4d08a97744fb5f31a1bf1a2ee..9e6ff8d0bc304661d6f0fed2d56bdbac2833acf7 100644 (file)
--- a/src/hooks/dhcp/perfmon/tests/meson.build
+++ b/src/hooks/dhcp/perfmon/tests/meson.build
@@ -17,6 +17,6 @@ dhcp_perfmon_lib_tests = executable(
     ],
     dependencies: [gtest, crypto],
     include_directories: [include_directories('.'), include_directories('..')] + INCLUDES,
-    link_with: [dhcp_perfmon_archive] + [kea_testutils_lib] + LIBS_BUILT_SO_FAR,
+    link_with: [dhcp_perfmon_archive, [kea_testutils_lib]] + LIBS_BUILT_SO_FAR,
 )
-test('dhcp_perfmon_lib_tests', dhcp_perfmon_lib_tests, protocol: 'gtest')
+test('dhcp-perfmon-lib-tests', dhcp_perfmon_lib_tests, protocol: 'gtest')

diff --git a/src/hooks/dhcp/pgsql/libloadtests/meson.build b/src/hooks/dhcp/pgsql/libloadtests/meson.build
index 67f9bf85819622f26a687dbe34c3926ffe280b22..7e9135a9dd6a69436485709becf33fb74546625b 100644 (file)
--- a/src/hooks/dhcp/pgsql/libloadtests/meson.build
+++ b/src/hooks/dhcp/pgsql/libloadtests/meson.build
@@ -13,4 +13,4 @@ dhcp_pgsql_libload_tests = executable(
     include_directories: [include_directories('.'), include_directories('..')] + INCLUDES,
     link_with: LIBS_BUILT_SO_FAR,
 )
-test('dhcp_pgsql_libload_tests', dhcp_pgsql_libload_tests, protocol: 'gtest')
+test('dhcp-pgsql-libload-tests', dhcp_pgsql_libload_tests, protocol: 'gtest')

diff --git a/src/hooks/dhcp/pgsql/tests/meson.build b/src/hooks/dhcp/pgsql/tests/meson.build
index 9e6f6fa71622c9c99b10272800061b66e6a57540..eeb97bec04696ccc60c0ee6166aa290035f5d2d0 100644 (file)
--- a/src/hooks/dhcp/pgsql/tests/meson.build
+++ b/src/hooks/dhcp/pgsql/tests/meson.build
@@ -1,4 +1,4 @@
-if not gtest.found()
+if not gtest.found() or not postgresql.found()
     subdir_done()
 endif
 
@@ -21,11 +21,13 @@ dhcp_pgsql_lib_tests = executable(
     'run_unittests.cc',
     dependencies: [gtest, crypto, postgresql],
     include_directories: [include_directories('.'), include_directories('..')] + INCLUDES,
-    link_with: [dhcp_pgsql_archive] + libs_testutils + LIBS_BUILT_SO_FAR,
+    link_with: [dhcp_pgsql_archive, libs_testutils] + LIBS_BUILT_SO_FAR,
 )
 test(
-    'dhcp_pgsql_lib_tests',
+    'dhcp-pgsql-lib-tests',
     dhcp_pgsql_lib_tests,
     protocol: 'gtest',
     is_parallel: false,
+    priority: -1,
+    timeout: 120,
 )

diff --git a/src/hooks/dhcp/run_script/libloadtests/meson.build b/src/hooks/dhcp/run_script/libloadtests/meson.build
index 571eb617cfe96246903be76eb843f376c7bbeb03..092a775a7787ee742cdc1778925f654cde784112 100644 (file)
--- a/src/hooks/dhcp/run_script/libloadtests/meson.build
+++ b/src/hooks/dhcp/run_script/libloadtests/meson.build
@@ -15,7 +15,7 @@ dhcp_run_script_libload_tests = executable(
     link_with: LIBS_BUILT_SO_FAR,
 )
 test(
-    'dhcp_run_script_libload_tests',
+    'dhcp-run-script-libload-tests',
     dhcp_run_script_libload_tests,
     protocol: 'gtest',
 )

diff --git a/src/hooks/dhcp/run_script/tests/meson.build b/src/hooks/dhcp/run_script/tests/meson.build
index 488e996c6cc5840dd66c09074135cd99ce4057f7..c0e5541e0dfb0afd957c7108c09f18b02bbcb680 100644 (file)
--- a/src/hooks/dhcp/run_script/tests/meson.build
+++ b/src/hooks/dhcp/run_script/tests/meson.build
@@ -24,4 +24,4 @@ dhcp_run_script_lib_tests = executable(
     include_directories: [include_directories('.'), include_directories('..')] + INCLUDES,
     link_with: [dhcp_run_script_archive] + LIBS_BUILT_SO_FAR,
 )
-test('dhcp_run_script_lib_tests', dhcp_run_script_lib_tests, protocol: 'gtest')
+test('dhcp-run-script-lib-tests', dhcp_run_script_lib_tests, protocol: 'gtest')

diff --git a/src/hooks/dhcp/stat_cmds/libloadtests/meson.build b/src/hooks/dhcp/stat_cmds/libloadtests/meson.build
index 8a46ac6388bd395115027fdeb3fe6514b232ccba..828bba0c95cb0304826a500bcc085571a7a1b025 100644 (file)
--- a/src/hooks/dhcp/stat_cmds/libloadtests/meson.build
+++ b/src/hooks/dhcp/stat_cmds/libloadtests/meson.build
@@ -14,7 +14,7 @@ dhcp_stat_cmds_libload_tests = executable(
     link_with: LIBS_BUILT_SO_FAR,
 )
 test(
-    'dhcp_stat_cmds_libload_tests',
+    'dhcp-stat-cmds-libload-tests',
     dhcp_stat_cmds_libload_tests,
     protocol: 'gtest',
 )

diff --git a/src/hooks/dhcp/stat_cmds/tests/meson.build b/src/hooks/dhcp/stat_cmds/tests/meson.build
index e5225dc191a7380f51d346e37ab98b0be44cc175..56002a58966c0a42116d99bb978b518703d93ffe 100644 (file)
--- a/src/hooks/dhcp/stat_cmds/tests/meson.build
+++ b/src/hooks/dhcp/stat_cmds/tests/meson.build
@@ -13,4 +13,4 @@ dhcp_stat_cmds_lib_tests = executable(
     include_directories: [include_directories('.'), include_directories('..')] + INCLUDES,
     link_with: [dhcp_stat_cmds_archive] + LIBS_BUILT_SO_FAR,
 )
-test('dhcp_stat_cmds_lib_tests', dhcp_stat_cmds_lib_tests, protocol: 'gtest')
+test('dhcp-stat-cmds-lib-tests', dhcp_stat_cmds_lib_tests, protocol: 'gtest')

diff --git a/src/hooks/dhcp/user_chk/tests/meson.build b/src/hooks/dhcp/user_chk/tests/meson.build
index e06d5ac807dc6f8bba338ac2ec2848b351f43b98..d37bf0220264513be72465dc769ed942d08bf26e 100644 (file)
--- a/src/hooks/dhcp/user_chk/tests/meson.build
+++ b/src/hooks/dhcp/user_chk/tests/meson.build
@@ -23,4 +23,4 @@ dhcp_user_chk_lib_tests = executable(
     include_directories: [include_directories('.'), include_directories('..')] + INCLUDES,
     link_with: [dhcp_user_chk_archive] + LIBS_BUILT_SO_FAR,
 )
-test('dhcp_user_chk_lib_tests', dhcp_user_chk_lib_tests, protocol: 'gtest')
+test('dhcp-user-chk-lib-tests', dhcp_user_chk_lib_tests, protocol: 'gtest')

diff --git a/src/lib/asiodns/tests/meson.build b/src/lib/asiodns/tests/meson.build
index d0e99f9be78d2d912d5ed0fd883db27e7434b7e1..a572aec8d8f71a3a04fa7302d052ee6313c2e14c 100644 (file)
--- a/src/lib/asiodns/tests/meson.build
+++ b/src/lib/asiodns/tests/meson.build
@@ -10,4 +10,4 @@ kea_asiodns_tests = executable(
     include_directories: [include_directories('.')] + INCLUDES,
     link_with: [kea_testutils_lib, kea_util_unittests_lib] + LIBS_BUILT_SO_FAR,
 )
-test('kea_asiodns_tests', kea_asiodns_tests, protocol: 'gtest')
+test('kea-asiodns-tests', kea_asiodns_tests, protocol: 'gtest')

diff --git a/src/lib/asiolink/tests/meson.build b/src/lib/asiolink/tests/meson.build
index a23b23d26155217430378fdcfe714fc3cfdabf5a..2e6fc766eb1b5f5ae17cbe65d8471b5524ed0078 100644 (file)
--- a/src/lib/asiolink/tests/meson.build
+++ b/src/lib/asiolink/tests/meson.build
@@ -41,4 +41,4 @@ kea_asiolink_tests = executable(
     include_directories: [include_directories('.')] + INCLUDES,
     link_with: [kea_asiolink_testutils_lib, kea_util_unittests_lib] + LIBS_BUILT_SO_FAR,
 )
-test('kea_asiolink_tests', kea_asiolink_tests, protocol: 'gtest')
+test('kea-asiolink-tests', kea_asiolink_tests, protocol: 'gtest')

diff --git a/src/lib/cc/tests/meson.build b/src/lib/cc/tests/meson.build
index f51220514b6bead2869b391ba954996a6657acae..d2c2ce18c9ed29a80b4da49476fb8e583a58dc5c 100644 (file)
--- a/src/lib/cc/tests/meson.build
+++ b/src/lib/cc/tests/meson.build
@@ -19,4 +19,4 @@ kea_cc_tests = executable(
     include_directories: [include_directories('.')] + INCLUDES,
     link_with: [kea_util_unittests_lib] + LIBS_BUILT_SO_FAR,
 )
-test('kea_cc_tests', kea_cc_tests, protocol: 'gtest')
+test('kea-cc-tests', kea_cc_tests, protocol: 'gtest')

diff --git a/src/lib/config/tests/meson.build b/src/lib/config/tests/meson.build
index 148365d3ed9f9c0fdfdfe085443d78ee9a113bed..456688cf830419d7f67425d3758ad1d4c3f78c91 100644 (file)
--- a/src/lib/config/tests/meson.build
+++ b/src/lib/config/tests/meson.build
@@ -24,6 +24,6 @@ kea_config_tests = executable(
         f'-DTEST_CA_DIR="@TEST_CA_DIR@"',
     ],
     include_directories: [include_directories('.')] + INCLUDES,
-    link_with: [kea_util_unittests_lib] + libs_testutils + LIBS_BUILT_SO_FAR,
+    link_with: [kea_util_unittests_lib, libs_testutils] + LIBS_BUILT_SO_FAR,
 )
-test('kea_config_tests', kea_config_tests, protocol: 'gtest')
+test('kea-config-tests', kea_config_tests, protocol: 'gtest')

diff --git a/src/lib/config_backend/tests/meson.build b/src/lib/config_backend/tests/meson.build
index eda6565cf6528e31de5490ab048649d273353a26..b631319233a10a3720e78c32f34bd86b06e64eeb 100644 (file)
--- a/src/lib/config_backend/tests/meson.build
+++ b/src/lib/config_backend/tests/meson.build
@@ -10,4 +10,4 @@ kea_config_backend_tests = executable(
     include_directories: [include_directories('.')] + INCLUDES,
     link_with: [kea_testutils_lib, kea_util_unittests_lib] + LIBS_BUILT_SO_FAR,
 )
-test('kea_config_backend_tests', kea_config_backend_tests, protocol: 'gtest')
+test('kea-config-backend-tests', kea_config_backend_tests, protocol: 'gtest')

diff --git a/src/lib/cryptolink/tests/meson.build b/src/lib/cryptolink/tests/meson.build
index aec940ae4f3a9035ebf47619b5e1b8ea7a4e7719..7dca395f576f9d07608e8f2bc1e422458641b81f 100644 (file)
--- a/src/lib/cryptolink/tests/meson.build
+++ b/src/lib/cryptolink/tests/meson.build
@@ -12,4 +12,4 @@ kea_cryptolink_tests = executable(
     include_directories: [include_directories('.')] + INCLUDES,
     link_with: [kea_util_unittests_lib] + LIBS_BUILT_SO_FAR,
 )
-test('kea_cryptolink_tests', kea_cryptolink_tests, protocol: 'gtest')
+test('kea-cryptolink-tests', kea_cryptolink_tests, protocol: 'gtest')

diff --git a/src/lib/d2srv/tests/meson.build b/src/lib/d2srv/tests/meson.build
index 8455e7902d34bbc1d9365cdf41a45c38c673e4e2..ea0ed7e2428987c55748befe0d06ac3b40ee36d8 100644 (file)
--- a/src/lib/d2srv/tests/meson.build
+++ b/src/lib/d2srv/tests/meson.build
@@ -13,6 +13,6 @@ kea_d2srv_tests = executable(
     'nc_trans_unittests.cc',
     dependencies: [crypto, gtest],
     include_directories: [include_directories('.')] + INCLUDES,
-    link_with: [kea_util_unittests_lib] + libs_testutils + LIBS_BUILT_SO_FAR,
+    link_with: [kea_util_unittests_lib, libs_testutils] + LIBS_BUILT_SO_FAR,
 )
-test('kea_d2srv_tests', kea_d2srv_tests, protocol: 'gtest')
+test('kea-d2srv-tests', kea_d2srv_tests, protocol: 'gtest')

diff --git a/src/lib/database/tests/meson.build b/src/lib/database/tests/meson.build
index 742fbf67813d976dc1d110de1993f94d441dfdb9..5f8e86833b2c39043d9399b8537f5b98dd1667eb 100644 (file)
--- a/src/lib/database/tests/meson.build
+++ b/src/lib/database/tests/meson.build
@@ -16,4 +16,4 @@ kea_database_tests = executable(
     include_directories: [include_directories('.')] + INCLUDES,
     link_with: [kea_testutils_lib, kea_util_unittests_lib] + LIBS_BUILT_SO_FAR,
 )
-test('kea_database_tests', kea_database_tests, protocol: 'gtest')
+test('kea-database-tests', kea_database_tests, protocol: 'gtest')

diff --git a/src/lib/dhcp/tests/meson.build b/src/lib/dhcp/tests/meson.build
index 1d1995167fd75969f879b3f706427ef8fc477702..2980fe56e796d213e6296d9afb1a48449518b69e 100644 (file)
--- a/src/lib/dhcp/tests/meson.build
+++ b/src/lib/dhcp/tests/meson.build
@@ -64,6 +64,6 @@ kea_dhcp_tests = executable(
     dependencies: [gtest, crypto],
     cpp_args: [f'-DTEST_DATA_BUILDDIR="@current_build_dir@"'],
     include_directories: [include_directories('.')] + INCLUDES,
-    link_with: [kea_util_unittests_lib] + libs_testutils + LIBS_BUILT_SO_FAR,
+    link_with: [kea_util_unittests_lib, libs_testutils] + LIBS_BUILT_SO_FAR,
 )
-test('kea_dhcp_tests', kea_dhcp_tests, protocol: 'gtest')
+test('kea-dhcp-tests', kea_dhcp_tests, protocol: 'gtest')

diff --git a/src/lib/dhcp_ddns/tests/meson.build b/src/lib/dhcp_ddns/tests/meson.build
index 6a632243fceebdf03647f645d4a02386c205fe56..8d343aa8d5df8850bfd3666ca794aaab1ffe558a 100644 (file)
--- a/src/lib/dhcp_ddns/tests/meson.build
+++ b/src/lib/dhcp_ddns/tests/meson.build
@@ -12,4 +12,4 @@ kea_dhcp_ddns_tests = executable(
     include_directories: [include_directories('.')] + INCLUDES,
     link_with: [kea_testutils_lib, kea_util_unittests_lib] + LIBS_BUILT_SO_FAR,
 )
-test('kea_dhcp_ddns_tests', kea_dhcp_ddns_tests, protocol: 'gtest')
+test('kea-dhcp-ddns-tests', kea_dhcp_ddns_tests, protocol: 'gtest')

diff --git a/src/lib/dhcpsrv/tests/meson.build b/src/lib/dhcpsrv/tests/meson.build
index d374d566b0ff3904fcedb4bbf24e7e14ef01c35f..7556bbd08a3243f6a450da568c5869039e564f07 100644 (file)
--- a/src/lib/dhcpsrv/tests/meson.build
+++ b/src/lib/dhcpsrv/tests/meson.build
@@ -103,13 +103,15 @@ kea_dhcpsrv_tests = executable(
     ],
     dependencies: [crypto],
     include_directories: [include_directories('.')] + INCLUDES,
-    link_with: [kea_util_unittests_lib] + libs_testutils + LIBS_BUILT_SO_FAR,
+    link_with: [kea_util_unittests_lib, libs_testutils] + LIBS_BUILT_SO_FAR,
 )
 test(
-    'kea_dhcpsrv_tests',
+    'kea-dhcpsrv-tests',
     kea_dhcpsrv_tests,
     protocol: 'gtest',
     is_parallel: false,
+    priority: -1,
+    timeout: 60,
 )
 
 shared_library(

diff --git a/src/lib/dns/tests/meson.build b/src/lib/dns/tests/meson.build
index 455d0c0af729ae6a917b6cc5824975bdc6307486..70c6502c0d5878df4a97d1a0ee71d5811548b1a8 100644 (file)
--- a/src/lib/dns/tests/meson.build
+++ b/src/lib/dns/tests/meson.build
@@ -54,4 +54,4 @@ kea_dns_tests = executable(
     include_directories: [include_directories('.')] + INCLUDES,
     link_with: [kea_util_unittests_lib] + LIBS_BUILT_SO_FAR,
 )
-test('kea_dns_tests', kea_dns_tests, protocol: 'gtest')
+test('kea-dns-tests', kea_dns_tests, protocol: 'gtest')

diff --git a/src/lib/eval/tests/meson.build b/src/lib/eval/tests/meson.build
index 2ebabb121c06fb34949e69d0c0f68ac10c4ece81..b603884768a2aadeafa14977d7ae3af40eb2694e 100644 (file)
--- a/src/lib/eval/tests/meson.build
+++ b/src/lib/eval/tests/meson.build
@@ -14,4 +14,4 @@ kea_eval_tests = executable(
     include_directories: [include_directories('.')] + INCLUDES,
     link_with: [kea_testutils_lib, kea_util_unittests_lib] + LIBS_BUILT_SO_FAR,
 )
-test('kea_eval_tests', kea_eval_tests, protocol: 'gtest')
+test('kea-eval-tests', kea_eval_tests, protocol: 'gtest')

diff --git a/src/lib/exceptions/tests/meson.build b/src/lib/exceptions/tests/meson.build
index 2349b2a29aa4a49fc4e229a49a378b8d0c99d1b2..b8432129f9964670b8b3b8607cc57341a7fa7377 100644 (file)
--- a/src/lib/exceptions/tests/meson.build
+++ b/src/lib/exceptions/tests/meson.build
@@ -10,4 +10,4 @@ kea_exceptions_tests = executable(
     include_directories: [include_directories('.')] + INCLUDES,
     link_with: LIBS_BUILT_SO_FAR,
 )
-test('kea_exceptions_tests', kea_exceptions_tests, protocol: 'gtest')
+test('kea-exceptions-tests', kea_exceptions_tests, protocol: 'gtest')

diff --git a/src/lib/hooks/tests/meson.build b/src/lib/hooks/tests/meson.build
index f05c2575b2ec3c934cd01e0a41cf35385d3a7596..f031f709d2aa18e1b8b9e43e113d84c0ee19a283 100644 (file)
--- a/src/lib/hooks/tests/meson.build
+++ b/src/lib/hooks/tests/meson.build
@@ -19,7 +19,7 @@ kea_hooks_tests = executable(
     include_directories: [include_directories('.')] + INCLUDES,
     link_with: [kea_util_unittests_lib] + LIBS_BUILT_SO_FAR,
 )
-test('kea_hooks_tests', kea_hooks_tests, protocol: 'gtest')
+test('kea-hooks-tests', kea_hooks_tests, protocol: 'gtest')
 
 kea_hooks_conf_data = configuration_data()
 kea_hooks_conf_data.set('abs_builddir', meson.current_build_dir())

diff --git a/src/lib/http/tests/meson.build b/src/lib/http/tests/meson.build
index 8f0f3cf726fe5d31d421224cf78fe865db0945a1..aca510d0d0e2b126cccee909e15bf8182e288c74 100644 (file)
--- a/src/lib/http/tests/meson.build
+++ b/src/lib/http/tests/meson.build
@@ -32,6 +32,12 @@ kea_http_tests = executable(
     ],
     dependencies: [gtest, crypto],
     include_directories: [include_directories('.')] + INCLUDES,
-    link_with: [kea_util_unittests_lib] + libs_testutils + LIBS_BUILT_SO_FAR,
+    link_with: [kea_util_unittests_lib, libs_testutils] + LIBS_BUILT_SO_FAR,
+)
+test(
+    'kea-http-tests',
+    kea_http_tests,
+    protocol: 'gtest',
+    is_parallel: false,
+    priority: -1,
 )
-test('kea_http_tests', kea_http_tests, protocol: 'gtest', is_parallel: false)

diff --git a/src/lib/log/interprocess/tests/meson.build b/src/lib/log/interprocess/tests/meson.build
index 90731658291a4354d332242c73e5c4e7ad2fc9e9..c0f0b1d00c9747ed891b41e3592938b42c2edd40 100644 (file)
--- a/src/lib/log/interprocess/tests/meson.build
+++ b/src/lib/log/interprocess/tests/meson.build
@@ -12,4 +12,4 @@ kea_log_interprocess_tests = executable(
     include_directories: [include_directories('.')] + INCLUDES,
     link_with: [kea_util_unittests_lib] + LIBS_BUILT_SO_FAR,
 )
-test('kea_log_interprocess_tests', kea_log_interprocess_tests, protocol: 'gtest')
+test('kea-log-interprocess-tests', kea_log_interprocess_tests, protocol: 'gtest')

diff --git a/src/lib/log/tests/meson.build b/src/lib/log/tests/meson.build
index 64dc87c494f3d8ef168ca123b8b84b8f2dcf9c4a..dd06b87b414be2bc907456409519f78262794076 100644 (file)
--- a/src/lib/log/tests/meson.build
+++ b/src/lib/log/tests/meson.build
@@ -23,7 +23,7 @@ kea_log_tests = executable(
     include_directories: [include_directories('.')] + INCLUDES,
     link_with: [kea_util_unittests_lib] + LIBS_BUILT_SO_FAR,
 )
-test('kea_log_tests', kea_log_tests, protocol: 'gtest')
+test('kea-log-tests', kea_log_tests, protocol: 'gtest')
 
 kea_log_init_tests = executable(
     'kea-log-init-tests',
@@ -34,7 +34,7 @@ kea_log_init_tests = executable(
     include_directories: [include_directories('.')] + INCLUDES,
     link_with: [kea_util_unittests_lib] + LIBS_BUILT_SO_FAR,
 )
-test('kea_log_init_tests', kea_log_init_tests, protocol: 'gtest')
+test('kea-log-init-tests', kea_log_init_tests, protocol: 'gtest')
 
 logger_example = executable(
     'logger_example',
@@ -80,6 +80,12 @@ foreach shtest : shtests
         output: shtest,
         configuration: shtests_conf_data,
     )
-    name = 'kea_log_' + shtest
-    test(name, shfile, workdir: current_build_dir, is_parallel: false)
+    name = 'kea-log-' + shtest
+    test(
+        name,
+        shfile,
+        workdir: current_build_dir,
+        is_parallel: false,
+        priority: -1,
+    )
 endforeach

diff --git a/src/lib/mysql/tests/meson.build b/src/lib/mysql/tests/meson.build
index 072ee040f1852762c06d9b504ead45c60bf40274..74b8be3aaf9767c0ab71a19f8eba3606ff8c58e1 100644 (file)
--- a/src/lib/mysql/tests/meson.build
+++ b/src/lib/mysql/tests/meson.build
@@ -1,4 +1,4 @@
-if not gtest.found()
+if not gtest.found() or not mysql.found()
     subdir_done()
 endif
 
@@ -15,6 +15,12 @@ kea_mysql_tests = executable(
     cpp_args: [f'-DTEST_CA_DIR="@TEST_CA_DIR@"', f'-DKEA_ADMIN="@KEA_ADMIN@"'],
     dependencies: [gtest, mysql],
     include_directories: [include_directories('.')] + INCLUDES,
-    link_with: [kea_util_unittests_lib] + libs_testutils + LIBS_BUILT_SO_FAR,
+    link_with: [kea_util_unittests_lib, libs_testutils] + LIBS_BUILT_SO_FAR,
+)
+test(
+    'kea-mysql-tests',
+    kea_mysql_tests,
+    protocol: 'gtest',
+    is_parallel: false,
+    priority: -1,
 )
-test('kea_mysql_tests', kea_mysql_tests, protocol: 'gtest')

diff --git a/src/lib/mysql/testutils/meson.build b/src/lib/mysql/testutils/meson.build
index 658c73c0b30733b5c3ef1bf014b92bcc35141d20..942b067e3d68d010a3fc00f088b353491a8021bb 100644 (file)
--- a/src/lib/mysql/testutils/meson.build
+++ b/src/lib/mysql/testutils/meson.build
@@ -1,4 +1,4 @@
-if not gtest.found()
+if not gtest.found() or not mysql.found()
     subdir_done()
 endif
 

diff --git a/src/lib/pgsql/tests/meson.build b/src/lib/pgsql/tests/meson.build
index 1ccd29f738d36628a3e84c84b9df0ac7a17b9beb..56ef940d246a9b5a2f2a33d78aeaf5c9abb54126 100644 (file)
--- a/src/lib/pgsql/tests/meson.build
+++ b/src/lib/pgsql/tests/meson.build
@@ -1,4 +1,4 @@
-if not gtest.found()
+if not gtest.found() or not postgresql.found()
     subdir_done()
 endif
 
@@ -16,6 +16,12 @@ kea_pgsql_tests = executable(
     cpp_args: [f'-DTEST_CA_DIR="@TEST_CA_DIR@"', f'-DKEA_ADMIN="@KEA_ADMIN@"'],
     dependencies: [gtest, postgresql],
     include_directories: [include_directories('.')] + INCLUDES,
-    link_with: [kea_util_unittests_lib] + libs_testutils + LIBS_BUILT_SO_FAR,
+    link_with: [kea_util_unittests_lib, libs_testutils] + LIBS_BUILT_SO_FAR,
+)
+test(
+    'kea-pgsql-tests',
+    kea_pgsql_tests,
+    protocol: 'gtest',
+    is_parallel: false,
+    priority: -1,
 )
-test('kea_pgsql_tests', kea_pgsql_tests, protocol: 'gtest')

diff --git a/src/lib/pgsql/testutils/meson.build b/src/lib/pgsql/testutils/meson.build
index 93e07c3232ba55e73cc9cc573328f8fbcfad3fa5..9966acc4928e6152e7ccf154b7893f4c2df4380e 100644 (file)
--- a/src/lib/pgsql/testutils/meson.build
+++ b/src/lib/pgsql/testutils/meson.build
@@ -1,4 +1,4 @@
-if not gtest.found()
+if not gtest.found() or not postgresql.found()
     subdir_done()
 endif
 

diff --git a/src/lib/process/cfgrpt/tests/meson.build b/src/lib/process/cfgrpt/tests/meson.build
index 1d62604d464e7b2fbda29dfcf27dc810771bfb5d..0cef9dc61650c089592f9d95fdd52a290869b537 100644 (file)
--- a/src/lib/process/cfgrpt/tests/meson.build
+++ b/src/lib/process/cfgrpt/tests/meson.build
@@ -10,4 +10,4 @@ kea_process_cfgrpt_tests = executable(
     include_directories: [include_directories('.')] + INCLUDES,
     link_with: [kea_util_unittests_lib] + LIBS_BUILT_SO_FAR,
 )
-test('kea_process_cfgrpt_tests', kea_process_cfgrpt_tests, protocol: 'gtest')
+test('kea-process-cfgrpt-tests', kea_process_cfgrpt_tests, protocol: 'gtest')

diff --git a/src/lib/process/tests/meson.build b/src/lib/process/tests/meson.build
index 7ea401c2a9c749d782d84e07afd47df20c501a9b..dcf605506add5f3c39302650d40a518677cedeb2 100644 (file)
--- a/src/lib/process/tests/meson.build
+++ b/src/lib/process/tests/meson.build
@@ -28,6 +28,6 @@ kea_process_tests = executable(
         f'-DDATA_DIR="@DHCP_DATA_DIR@"',
     ],
     include_directories: [include_directories('.')] + INCLUDES,
-    link_with: [kea_util_unittests_lib] + libs_testutils + LIBS_BUILT_SO_FAR,
+    link_with: [kea_util_unittests_lib, libs_testutils] + LIBS_BUILT_SO_FAR,
 )
-test('kea_process_tests', kea_process_tests, protocol: 'gtest')
+test('kea-process-tests', kea_process_tests, protocol: 'gtest')

diff --git a/src/lib/stats/tests/meson.build b/src/lib/stats/tests/meson.build
index 910360db442dd1c814dcde266c82d5dccd519327..dbba79be84ddc1564faf6b882ae87ff1dcb4506f 100644 (file)
--- a/src/lib/stats/tests/meson.build
+++ b/src/lib/stats/tests/meson.build
@@ -12,4 +12,4 @@ kea_stats_tests = executable(
     include_directories: [include_directories('.')] + INCLUDES,
     link_with: [kea_testutils_lib, kea_util_unittests_lib] + LIBS_BUILT_SO_FAR,
 )
-test('kea_stats_tests', kea_stats_tests, protocol: 'gtest')
+test('kea-stats-tests', kea_stats_tests, protocol: 'gtest')

diff --git a/src/lib/tcp/tests/meson.build b/src/lib/tcp/tests/meson.build
index 66595d95d40858b54ea6db766e0fcd81e752fc9b..80e98bbdf15ecdc3fc8775e1eb8cd6a726d656e0 100644 (file)
--- a/src/lib/tcp/tests/meson.build
+++ b/src/lib/tcp/tests/meson.build
@@ -12,4 +12,10 @@ kea_tcp_tests = executable(
     include_directories: [include_directories('.')] + INCLUDES,
     link_with: [kea_util_unittests_lib, kea_asiolink_testutils_lib] + LIBS_BUILT_SO_FAR,
 )
-test('kea_tcp_tests', kea_tcp_tests, protocol: 'gtest', is_parallel: false)
+test(
+    'kea-tcp-tests',
+    kea_tcp_tests,
+    protocol: 'gtest',
+    is_parallel: false,
+    priority: -1,
+)

diff --git a/src/lib/util/tests/meson.build b/src/lib/util/tests/meson.build
index cbfeb74bff0a4174969be74795d21650abb9ec44..190946a806f64d5e03f8785e211d56552e6a9c93 100644 (file)
--- a/src/lib/util/tests/meson.build
+++ b/src/lib/util/tests/meson.build
@@ -44,4 +44,4 @@ kea_util_tests = executable(
     include_directories: [include_directories('.')] + INCLUDES,
     link_with: [kea_util_unittests_lib] + LIBS_BUILT_SO_FAR,
 )
-test('kea_util_tests', kea_util_tests, protocol: 'gtest')
+test('kea-util-tests', kea_util_tests, protocol: 'gtest')

diff --git a/src/lib/yang/meson.build b/src/lib/yang/meson.build
index 220fcfe345d0d3bd58e6953e33dab8a42a55e844..4f5e27abd6efabc71ea5ad226133fcd47df56280 100644 (file)
--- a/src/lib/yang/meson.build
+++ b/src/lib/yang/meson.build
@@ -1,4 +1,4 @@
-if not netconf_deps_found
+if not NETCONF_DEPS_FOUND
     subdir_done()
 endif
 
@@ -23,7 +23,7 @@ kea_yang_lib = library(
     'translator_pool.cc',
     'translator_shared_network.cc',
     'translator_subnet.cc',
-    dependencies: netconf_deps_array,
+    dependencies: NETCONF_DEPS_ARRAY,
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
     install_dir: 'lib',

diff --git a/src/lib/yang/pretests/meson.build b/src/lib/yang/pretests/meson.build
index 45114e1a0fa0dfc760686b5eac25f9096dbefd03..406b8cf9c7b6683f9906818ddc1a4c463365746c 100644 (file)
--- a/src/lib/yang/pretests/meson.build
+++ b/src/lib/yang/pretests/meson.build
@@ -1,11 +1,12 @@
-if not gtest.found()
+if not gtest.found() or not NETCONF_DEPS_FOUND
     subdir_done()
 endif
 
 sysrepo_setup_tests = executable(
     'kea-sysrepo-setup-tests',
     'sysrepo_setup_tests.cc',
-    dependencies: netconf_deps_array,
+    dependencies: NETCONF_DEPS_ARRAY,
     include_directories: [include_directories('.')] + INCLUDES,
+    override_options: ['cpp_std=c++20'],
 )
-test('sysrepo_setup_tests', sysrepo_setup_tests)
+test('kea-sysrepo-setup-tests', sysrepo_setup_tests)

diff --git a/src/lib/yang/tests/meson.build b/src/lib/yang/tests/meson.build
index decc54621daf3c5e3e004cc1673e300a672deb4d..0f9e20fea4345f133e8ec0d4907e1a5193d76762 100644 (file)
--- a/src/lib/yang/tests/meson.build
+++ b/src/lib/yang/tests/meson.build
@@ -1,4 +1,4 @@
-if not gtest.found()
+if not gtest.found() or not NETCONF_DEPS_FOUND
     subdir_done()
 endif
 
@@ -31,8 +31,9 @@ kea_yang_tests = executable(
     'translator_unittests.cc',
     'translator_utils_unittests.cc',
     cpp_args: [f'-DCFG_EXAMPLES="@TOP_SOURCE_DIR@/doc/examples"'],
-    dependencies: netconf_deps_array + [gtest],
+    dependencies: NETCONF_DEPS_ARRAY + [gtest],
     include_directories: [include_directories('.')] + INCLUDES,
-    link_with: kea_yang_tests_libs + LIBS_BUILT_SO_FAR,
+    link_with: [kea_yang_tests_libs] + LIBS_BUILT_SO_FAR,
+    override_options: ['cpp_std=c++20'],
 )
-test('kea_yang_tests', kea_yang_tests, protocol: 'gtest')
+test('kea-yang-tests', kea_yang_tests, protocol: 'gtest')

diff --git a/src/lib/yang/testutils/meson.build b/src/lib/yang/testutils/meson.build
index fb0d880f3b6eeda27df7135d9a54f52d68e56c71..4db038eccc9b94329707caf87f89a8ad85a2e747 100644 (file)
--- a/src/lib/yang/testutils/meson.build
+++ b/src/lib/yang/testutils/meson.build
@@ -1,10 +1,11 @@
-if not gtest.found()
+if not gtest.found() or not NETCONF_DEPS_FOUND
     subdir_done()
 endif
 
 kea_yang_testutils_lib = static_library(
     'kea-yang-testutils',
     'translator_test.cc',
-    dependencies: netconf_deps_array + [gtest],
+    dependencies: NETCONF_DEPS_ARRAY + [gtest],
     include_directories: [include_directories('.')] + INCLUDES,
+    override_options: ['cpp_std=c++20'],
 )