[#3729] Finished log tests

diff --git a/src/lib/log/tests/buffer_logger_test.sh.in b/src/lib/log/tests/buffer_logger_test.sh.in
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/src/lib/log/tests/console_test.sh.in b/src/lib/log/tests/console_test.sh.in
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/src/lib/log/tests/destination_test.sh.in b/src/lib/log/tests/destination_test.sh.in
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/src/lib/log/tests/init_logger_test.sh.in b/src/lib/log/tests/init_logger_test.sh.in
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/src/lib/log/tests/local_file_test.sh.in b/src/lib/log/tests/local_file_test.sh.in
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/src/lib/log/tests/logger_lock_test.sh.in b/src/lib/log/tests/logger_lock_test.sh.in
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/src/lib/log/tests/meson.build b/src/lib/log/tests/meson.build
index 433e3d717c724f1616ecc37f387e864aac6dc8fb..1c668310305a8f2cffcf7331e73be08755081dc1 100644 (file)
--- a/src/lib/log/tests/meson.build
+++ b/src/lib/log/tests/meson.build
@@ -24,3 +24,66 @@ kea_log_tests = executable(
     link_with: [kea_util_unittests_lib] + LIBS_BUILT_SO_FAR,
 )
 test('kea_log_tests', kea_log_tests, protocol: 'gtest')
+
+kea_log_init_tests = executable(
+    'kea-log-init-tests',
+    'run_initializer_unittests.cc',
+    'message_initializer_1_unittest.cc',
+    'message_initializer_1a_unittest.cc',
+    dependencies: [boost, gtest, log4cplus],
+    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')
+
+logger_example = executable(
+    'logger_example',
+    'logger_example.cc',
+    dependencies: [boost],
+    include_directories: [include_directories('.')] + INCLUDES,
+    link_with: [kea_util_unittests_lib] + LIBS_BUILT_SO_FAR,
+)
+init_logger_test = executable(
+    'init_logger_test',
+    'init_logger_test.cc',
+    dependencies: [boost],
+    include_directories: [include_directories('.')] + INCLUDES,
+    link_with: [kea_util_unittests_lib] + LIBS_BUILT_SO_FAR,
+)
+buffer_logger_test = executable(
+    'buffer_logger_test',
+    'buffer_logger_test.cc',
+    dependencies: [boost],
+    include_directories: [include_directories('.')] + INCLUDES,
+    link_with: [kea_util_unittests_lib] + LIBS_BUILT_SO_FAR,
+)
+logger_lock_test = executable(
+    'logger_lock_test',
+    'logger_lock_test.cc',
+    'log_test_messages.cc',
+    dependencies: [boost],
+    include_directories: [include_directories('.')] + INCLUDES,
+    link_with: [kea_util_unittests_lib] + LIBS_BUILT_SO_FAR,
+)
+shtests = [
+    'buffer_logger_test.sh',
+    'console_test.sh',
+    'destination_test.sh',
+    'init_logger_test.sh',
+    'local_file_test.sh',
+    'logger_lock_test.sh',
+    'severity_test.sh',
+]
+shtests_conf_data = configuration_data()
+shtests_conf_data.set('abs_top_builddir', TOP_BUILD_DIR)
+CURRENT_BUILD_DIR = meson.current_build_dir()
+shtests_conf_data.set('abs_builddir', CURRENT_BUILD_DIR)
+foreach shtest : shtests
+    shfile = configure_file(
+        input: shtest + '.in',
+        output: shtest,
+        configuration: shtests_conf_data,
+    )
+    name = 'kea_log_' + shtest
+    test(name, shfile, workdir: CURRENT_BUILD_DIR, is_parallel: false)
+endforeach

diff --git a/src/lib/log/tests/severity_test.sh.in b/src/lib/log/tests/severity_test.sh.in
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/src/lib/testutils/dhcp_test_lib.sh.in b/src/lib/testutils/dhcp_test_lib.sh.in
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/src/lib/testutils/meson.build b/src/lib/testutils/meson.build
index bb8a2fc6cd080b434f39f92ff980cefc6fa54d84..ea79a045608b5b735b9a9ad882b19c903e9b6c78 100644 (file)
--- a/src/lib/testutils/meson.build
+++ b/src/lib/testutils/meson.build
@@ -14,3 +14,18 @@ kea_testutils_lib = static_library(
     include_directories: [include_directories('.')] + INCLUDES,
     link_with: [kea_util_unittests_lib] + LIBS_BUILT_SO_FAR,
 )
+
+dhcp_test_lib_conf_data = configuration_data()
+dhcp_test_lib_conf_data.set('abs_top_builddir', TOP_BUILD_DIR)
+dhcp_test_lib_conf_data.set('prefix', PREFIX)
+dhcp_test_lib_conf_data.set('PACKAGE_VERSION', project_version)
+configure_file(
+    input: 'dhcp_test_lib.sh.in',
+    output: 'dhcp_test_lib.sh',
+    configuration: dhcp_test_lib_conf_data,
+)
+configure_file(
+    input: 'xml_reporting_test_lib.sh.in',
+    output: 'xml_reporting_test_lib.sh',
+    copy: true,
+)

diff --git a/src/lib/testutils/xml_reporting_test_lib.sh.in b/src/lib/testutils/xml_reporting_test_lib.sh.in
old mode 100644 (file)
new mode 100755 (executable)