diff options
| author | Andrei Pavel <andrei@isc.org> | 2021-07-02 12:10:49 +0200 |
|---|---|---|
| committer | Andrei Pavel <andrei@isc.org> | 2021-07-02 12:10:49 +0200 |
| commit | 95e81afb62d6102772b3170ee557c6aae883bdc5 (patch) | |
| tree | 5c790889c5a96a3b8ed87f5a75e4a7b72363b4ef /src | |
| parent | [#1692] Gitlab CI: fix "test: too many arguments" (diff) | |
| download | kea-95e81afb62d6102772b3170ee557c6aae883bdc5.tar.xz kea-95e81afb62d6102772b3170ee557c6aae883bdc5.zip | |
[#1961] set lock and pid dirs to path inside repo
to avoid deleting your entire repo
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/admin/tests/memfile_tests.sh.in | 2 | ||||
| -rw-r--r-- | src/lib/testutils/dhcp_test_lib.sh.in | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/bin/admin/tests/memfile_tests.sh.in b/src/bin/admin/tests/memfile_tests.sh.in index c307860e57..6591297ebf 100644 --- 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 fc45b331de..f0a7544cb2 100644 --- 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" |