[#1961] set lock and pid dirs to path inside repo

to avoid deleting your entire repo

diff --git a/src/bin/admin/tests/memfile_tests.sh.in b/src/bin/admin/tests/memfile_tests.sh.in
index c307860e5725d32e70d9d85584b384db08f86bcb..6591297ebfc7dac71211d2e3ceda25f7f37f3124 100644 (file)
--- a/src/bin/admin/tests/memfile_tests.sh.in
+++ b/src/bin/admin/tests/memfile_tests.sh.in
@@ -122,6 +122,8 @@ memfile_init_test() {
             clean_up
             clean_exit 1
         fi
+        mkdir -p "${KEA_LOCKFILE_DIR}"
+        mkdir -p "${KEA_PIDFILE_DIR}"
         start_kea_dhcp "${v}"
         # This assumes that the CSV creation + writing to CSV is atomic. Not
         # sure if it is, but if this ever fails on the comparison further below,

diff --git a/src/lib/testutils/dhcp_test_lib.sh.in b/src/lib/testutils/dhcp_test_lib.sh.in
index fc45b331de8eb324aaaec96a989b5700a6a0a19e..f0a7544cb2b0c5d9c6f43fafdcb399b6ae88ab7e 100644 (file)
--- a/src/lib/testutils/dhcp_test_lib.sh.in
+++ b/src/lib/testutils/dhcp_test_lib.sh.in
@@ -38,8 +38,9 @@ EXPECTED_VERSION="@PACKAGE_VERSION@"
 
 # Kea environment variables for shell tests.
 # KEA_LOGGER_DESTINATION is set per test with set_logger.
-export KEA_LOCKFILE_DIR="@abs_top_builddir@"
-export KEA_PIDFILE_DIR="@abs_top_builddir@"
+export KEA_LFC_EXECUTABLE="@abs_top_builddir@/src/bin/lfc/kea-lfc"
+export KEA_LOCKFILE_DIR="@abs_top_builddir@/test_lockfile_dir"
+export KEA_PIDFILE_DIR="@abs_top_builddir@/test_pidfile_dir"
 
 # A list of Kea processes, mainly used by the cleanup functions.
 KEA_PROCS="kea-dhcp4 kea-dhcp6 kea-dhcp-ddns kea-ctrl-agent"