[#4483] fixed valgrind warnings

diff --git a/src/bin/lfc/tests/lfc_controller_unittests.cc b/src/bin/lfc/tests/lfc_controller_unittests.cc
index b09e47e5ab5c928ce99903459fb0cab4aeeae362..5f9b1f8b6060a77569f679bec4a901fa1116adba 100644 (file)
--- a/src/bin/lfc/tests/lfc_controller_unittests.cc
+++ b/src/bin/lfc/tests/lfc_controller_unittests.cc
@@ -738,6 +738,9 @@ TEST_F(LFCControllerTest, alreadyRunning) {
         ASSERT_NE(-1, child_pid);
         if (child_pid == 0) {
             launch(lfc_controller, argc, argv);
+            char* sh_argv[] = { const_cast<char*>(TEST_SCRIPT_SH), 0 };
+            char* sh_env[] = { 0 };
+            execve(TEST_SCRIPT_SH, sh_argv, sh_env);
             _exit(0);
         }
     }

diff --git a/src/bin/lfc/tests/meson.build b/src/bin/lfc/tests/meson.build
index d096cdee7ce3e93d21005b5c64d1e3f070e76f21..41a34429339c8bdf052cf020cb73209b60b4fbd8 100644 (file)
--- a/src/bin/lfc/tests/meson.build
+++ b/src/bin/lfc/tests/meson.build
@@ -3,11 +3,17 @@ if not TESTS_OPT.enabled()
 endif
 
 current_build_dir = meson.current_build_dir()
+configure_file(
+    input: 'process_test.sh.in',
+    output: 'process_test.sh',
+    copy: true,
+)
 kea_lfc_tests = executable(
     'kea-lfc-tests',
     'lfc_controller_unittests.cc',
     'lfc_unittests.cc',
-    cpp_args: [f'-DTEST_DATA_BUILDDIR="@current_build_dir@"'],
+    cpp_args: [f'-DTEST_DATA_BUILDDIR="@current_build_dir@"',
+               f'-DTEST_SCRIPT_SH="@current_build_dir@/process_test.sh"',],
     dependencies: [GTEST_DEP],
     include_directories: [include_directories('.')] + INCLUDES,
     link_with: [lfc_lib] + LIBS_BUILT_SO_FAR,

diff --git a/src/bin/lfc/tests/process_test.sh.in b/src/bin/lfc/tests/process_test.sh.in
new file mode 100755 (executable)
index 0000000..1a24852
--- /dev/null
+++ b/src/bin/lfc/tests/process_test.sh.in
@@ -0,0 +1 @@
+#!/bin/sh

diff --git a/src/hooks/d2/gss_tsig/libloadtests/meson.build b/src/hooks/d2/gss_tsig/libloadtests/meson.build
index d570cb80b434a2632cca11508a48bc5fed927e19..c3e51e852a67ead149e47acd6124994368f41ad3 100644 (file)
--- a/src/hooks/d2/gss_tsig/libloadtests/meson.build
+++ b/src/hooks/d2/gss_tsig/libloadtests/meson.build
@@ -16,7 +16,7 @@ ddns_gss_tsig_libloadtests = executable(
     link_with: LIBS_BUILT_SO_FAR,
 )
 test(
-    'ddns-gss-tsig-libloadtests',
+    'ddns-gss-tsig-libload-tests',
     ddns_gss_tsig_libloadtests,
     depends: [ddns_gss_tsig_lib],
     protocol: 'gtest',

diff --git a/src/hooks/dhcp/class_cmds/libloadtests/meson.build b/src/hooks/dhcp/class_cmds/libloadtests/meson.build
index 17b95eb480420a66fc94f58b6949c8a5579e4f1c..8eb42a0717ea336673059c3a888e1a3d1554bb57 100644 (file)
--- a/src/hooks/dhcp/class_cmds/libloadtests/meson.build
+++ b/src/hooks/dhcp/class_cmds/libloadtests/meson.build
@@ -14,7 +14,7 @@ dhcp_class_cmds_libloadtests = executable(
     link_with: LIBS_BUILT_SO_FAR,
 )
 test(
-    'dhcp-class-cmds-libloadtests',
+    'dhcp-class-cmds-libload-tests',
     dhcp_class_cmds_libloadtests,
     depends: [dhcp_class_cmds_lib],
     protocol: 'gtest',

diff --git a/src/hooks/dhcp/ddns_tuning/libloadtests/meson.build b/src/hooks/dhcp/ddns_tuning/libloadtests/meson.build
index b0b6a2cf180a2f2ca2178ebcbe19fc09f8bb8039..8d0766a336330dd5fce6eecc6eb5497f7dfadd88 100644 (file)
--- a/src/hooks/dhcp/ddns_tuning/libloadtests/meson.build
+++ b/src/hooks/dhcp/ddns_tuning/libloadtests/meson.build
@@ -17,7 +17,7 @@ dhcp_ddns_tuning_libloadtests = executable(
     link_with: LIBS_BUILT_SO_FAR,
 )
 test(
-    'dhcp-ddns-tuning-libloadtests',
+    'dhcp-ddns-tuning-libload-tests',
     dhcp_ddns_tuning_libloadtests,
     depends: [dhcp_ddns_tuning_lib],
     protocol: 'gtest',

diff --git a/src/hooks/dhcp/flex_id/libloadtests/meson.build b/src/hooks/dhcp/flex_id/libloadtests/meson.build
index 997c9fad1f5c9bace6fb7cbc0bb0a6abafbf8bb3..b59723e763f3141f94e3f9de6e93c385d3e5ca48 100644 (file)
--- a/src/hooks/dhcp/flex_id/libloadtests/meson.build
+++ b/src/hooks/dhcp/flex_id/libloadtests/meson.build
@@ -16,7 +16,7 @@ dhcp_flex_id_libloadtests = executable(
     link_with: LIBS_BUILT_SO_FAR,
 )
 test(
-    'dhcp-flex-id-libloadtests',
+    'dhcp-flex-id-libload-tests',
     dhcp_flex_id_libloadtests,
     depends: [dhcp_flex_id_lib],
     protocol: 'gtest',

diff --git a/src/hooks/dhcp/forensic_log/libloadtests/meson.build b/src/hooks/dhcp/forensic_log/libloadtests/meson.build
index cabbd128a25629aaa291e5a5809cdf1a4501eb7a..1cdfb439cbcf5031e982980429f8deb07b1d611e 100644 (file)
--- a/src/hooks/dhcp/forensic_log/libloadtests/meson.build
+++ b/src/hooks/dhcp/forensic_log/libloadtests/meson.build
@@ -35,7 +35,7 @@ dhcp_forensic_log_libloadtests = executable(
 )
 
 test(
-    'dhcp-forensic-log-libloadtests',
+    'dhcp-forensic-log-libload-tests',
     dhcp_forensic_log_libloadtests,
     depends: [dhcp_forensic_log_lib],
     protocol: 'gtest',

diff --git a/src/hooks/dhcp/host_cache/libloadtests/meson.build b/src/hooks/dhcp/host_cache/libloadtests/meson.build
index a4951124833164d4c3ab7a1b20a6324a1e47f891..9671b55a6b615806e3f399adc6cd9f1e5dbdbf93 100644 (file)
--- a/src/hooks/dhcp/host_cache/libloadtests/meson.build
+++ b/src/hooks/dhcp/host_cache/libloadtests/meson.build
@@ -16,7 +16,7 @@ dhcp_host_cache_libloadtests = executable(
     link_with: LIBS_BUILT_SO_FAR,
 )
 test(
-    'dhcp-host-cache-libloadtests',
+    'dhcp-host-cache-libload-tests',
     dhcp_host_cache_libloadtests,
     depends: [dhcp_host_cache_lib],
     protocol: 'gtest',

diff --git a/src/hooks/dhcp/host_cmds/libloadtests/meson.build b/src/hooks/dhcp/host_cmds/libloadtests/meson.build
index 0ac17168411df530191a4e6922a30802c6383565..6ff8d3e0bfceba3d5d3b81e17d64bf2a0a246cd2 100644 (file)
--- a/src/hooks/dhcp/host_cmds/libloadtests/meson.build
+++ b/src/hooks/dhcp/host_cmds/libloadtests/meson.build
@@ -14,7 +14,7 @@ dhcp_host_cmds_libloadtests = executable(
     link_with: LIBS_BUILT_SO_FAR,
 )
 test(
-    'dhcp-host-cmds-libloadtests',
+    'dhcp-host-cmds-libload-tests',
     dhcp_host_cmds_libloadtests,
     depends: [dhcp_host_cmds_lib],
     protocol: 'gtest',

diff --git a/src/hooks/dhcp/lease_query/libloadtests/meson.build b/src/hooks/dhcp/lease_query/libloadtests/meson.build
index c27818439be6506e4268c930f87661a0c506f56b..4b85074aa3466bfe8b5ce7bdc923bbd6d75dc61a 100644 (file)
--- a/src/hooks/dhcp/lease_query/libloadtests/meson.build
+++ b/src/hooks/dhcp/lease_query/libloadtests/meson.build
@@ -16,7 +16,7 @@ dhcp_lease_query_libloadtests = executable(
     link_with: LIBS_BUILT_SO_FAR,
 )
 test(
-    'dhcp-lease-query-libloadtests',
+    'dhcp-lease-query-libload-tests',
     dhcp_lease_query_libloadtests,
     depends: [dhcp_lease_query_lib],
     protocol: 'gtest',

diff --git a/src/hooks/dhcp/limits/libloadtests/meson.build b/src/hooks/dhcp/limits/libloadtests/meson.build
index e1458420b2a20426883e3dcabbeeeee13a766826..89f9165fa68ecec06895e9b7ac82548a82860739 100644 (file)
--- a/src/hooks/dhcp/limits/libloadtests/meson.build
+++ b/src/hooks/dhcp/limits/libloadtests/meson.build
@@ -14,7 +14,7 @@ dhcp_limits_libloadtests = executable(
     link_with: LIBS_BUILT_SO_FAR,
 )
 test(
-    'dhcp-limits-libloadtests',
+    'dhcp-limits-libload-tests',
     dhcp_limits_libloadtests,
     depends: [dhcp_limits_lib],
     protocol: 'gtest',

diff --git a/src/hooks/dhcp/ping_check/libloadtests/meson.build b/src/hooks/dhcp/ping_check/libloadtests/meson.build
index 05d5fde2e13b97c3a92c2b0c5b6ac683fd258a42..6f5b6735f31135bbb2184a9a71f076d6c3067757 100644 (file)
--- a/src/hooks/dhcp/ping_check/libloadtests/meson.build
+++ b/src/hooks/dhcp/ping_check/libloadtests/meson.build
@@ -15,7 +15,7 @@ dhcp_ping_check_libloadtests = executable(
     link_with: [kea_testutils_lib] + LIBS_BUILT_SO_FAR,
 )
 test(
-    'dhcp-ping-check-libloadtests',
+    'dhcp-ping-check-libload-tests',
     dhcp_ping_check_libloadtests,
     depends: [dhcp_ping_check_lib],
     protocol: 'gtest',

diff --git a/src/hooks/dhcp/radius/libloadtests/meson.build b/src/hooks/dhcp/radius/libloadtests/meson.build
index 9514cea7e9fb44ca7419fff60309b2705efc3893..17f35aa0cc1a4ebdf1533210249ee5c5200fc9e8 100644 (file)
--- a/src/hooks/dhcp/radius/libloadtests/meson.build
+++ b/src/hooks/dhcp/radius/libloadtests/meson.build
@@ -16,7 +16,7 @@ dhcp_radius_libloadtests = executable(
     link_with: LIBS_BUILT_SO_FAR,
 )
 test(
-    'dhcp-radius-libloadtests',
+    'dhcp-radius-libload-tests',
     dhcp_radius_libloadtests,
     depends: [dhcp_radius_lib],
     protocol: 'gtest',

diff --git a/src/hooks/dhcp/subnet_cmds/libloadtests/meson.build b/src/hooks/dhcp/subnet_cmds/libloadtests/meson.build
index 154de07935f1b7c65f15e0e81d8d07ea4a0f9bd0..ec3273c5ad9e6bb7b3bf33a5f9a548d4b47ebcf5 100644 (file)
--- a/src/hooks/dhcp/subnet_cmds/libloadtests/meson.build
+++ b/src/hooks/dhcp/subnet_cmds/libloadtests/meson.build
@@ -14,7 +14,7 @@ dhcp_subnet_cmds_libloadtests = executable(
     link_with: LIBS_BUILT_SO_FAR,
 )
 test(
-    'dhcp-subnet-cmds-libloadtests',
+    'dhcp-subnet-cmds-libload-tests',
     dhcp_subnet_cmds_libloadtests,
     depends: [dhcp_subnet_cmds_lib],
     protocol: 'gtest',

diff --git a/src/lib/asiolink/tests/tls_unittest.cc b/src/lib/asiolink/tests/tls_unittest.cc
index e386ced181fcba831a980f4339b56074d65125c4..451efab31e910b97c0d0bb7c46a100b75b95f99c 100644 (file)
--- a/src/lib/asiolink/tests/tls_unittest.cc
+++ b/src/lib/asiolink/tests/tls_unittest.cc
@@ -387,7 +387,7 @@ public:
                 }
             }
             // Should have failed but did not: bad.
-            ADD_FAILURE() << party << " did not failed as expected";
+            ADD_FAILURE() << party << " did not fail as expected";
             return;
         }
 

diff --git a/src/lib/hooks/tests/hooks_manager_unittest.cc b/src/lib/hooks/tests/hooks_manager_unittest.cc
index 776103e2c550618e4782783d24533124fc4c863f..7885a5f60dcc005c5419b37b14e8b5c4c4c47451 100644 (file)
--- a/src/lib/hooks/tests/hooks_manager_unittest.cc
+++ b/src/lib/hooks/tests/hooks_manager_unittest.cc
@@ -1120,11 +1120,11 @@ TEST_F(HooksParserTest, getHooksPath) {
 }
 
 TEST_F(HooksParserTest, getHooksPathWithEnv) {
-    std::string evar("KEA_HOOKS_PATH=/tmp");
-    putenv(const_cast<char*>(evar.c_str()));
+    std::string evar("/tmp");
+    setenv("KEA_HOOKS_PATH", evar.c_str(), 1);
     ASSERT_TRUE(std::getenv("KEA_HOOKS_PATH"));
     auto hooks_path = HooksLibrariesParser::getHooksPath(true);
-    EXPECT_EQ(hooks_path, "/tmp");
+    EXPECT_EQ(hooks_path, evar);
 }
 
 TEST_F(HooksParserTest, getHooksPathExplicit) {