From: Andrei Pavel <andrei@isc.org>
Date: Thu, 20 Mar 2025 06:33:47 +0000 (+0200)
Subject: [#3731] Fix KEA_LFC_BUILD_DIR
X-Git-Tag: Kea-2.7.7~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a5710470ed655e13bdc794bc205fa964bfd6e4b0;p=thirdparty%2Fkea.git

[#3731] Fix KEA_LFC_BUILD_DIR
---

diff --git a/src/lib/dhcpsrv/tests/Makefile.am b/src/lib/dhcpsrv/tests/Makefile.am
index 20439888ca..d6b316a054 100644
--- a/src/lib/dhcpsrv/tests/Makefile.am
+++ b/src/lib/dhcpsrv/tests/Makefile.am
@@ -4,7 +4,7 @@ AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
 AM_CPPFLAGS += $(BOOST_INCLUDES) $(CRYPTO_CFLAGS) $(CRYPTO_INCLUDES)
 AM_CPPFLAGS += -DTEST_DATA_BUILDDIR=\"$(abs_top_builddir)/src/lib/dhcpsrv/tests\"
 AM_CPPFLAGS += -DDHCP_DATA_DIR=\"$(abs_top_builddir)/src/lib/dhcpsrv/tests\"
-AM_CPPFLAGS += -DKEA_LFC_BUILD_DIR=\"$(abs_top_builddir)/src/bin/lfc\"
+AM_CPPFLAGS += -DKEA_LFC_EXECUTABLE=\"$(abs_top_builddir)/src/bin/lfc/kea-lfc\"
 AM_CPPFLAGS += -DINSTALL_PROG=\"$(abs_top_srcdir)/install-sh\"
 AM_CPPFLAGS += -DDEFAULT_HOOKS_PATH=\"$(libdir)/kea/hooks\"
 
diff --git a/src/lib/dhcpsrv/tests/memfile_lease_mgr_unittest.cc b/src/lib/dhcpsrv/tests/memfile_lease_mgr_unittest.cc
index f22b5cdee0..66517ade30 100644
--- a/src/lib/dhcpsrv/tests/memfile_lease_mgr_unittest.cc
+++ b/src/lib/dhcpsrv/tests/memfile_lease_mgr_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2012-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2025 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -120,9 +120,7 @@ public:
         DatabaseConnection::setIOService(io_service_);
         ProcessSpawn::setIOService(io_service_);
 
-        std::ostringstream s;
-        s << KEA_LFC_BUILD_DIR << "/kea-lfc";
-        setenv("KEA_LFC_EXECUTABLE", s.str().c_str(), 1);
+        setenv("KEA_LFC_EXECUTABLE", KEA_LFC_EXECUTABLE, 1);
 
         // Remove lease files and products of Lease File Cleanup.
         removeFiles(getLeaseFilePath("leasefile4_0.csv"));
diff --git a/src/lib/dhcpsrv/tests/meson.build b/src/lib/dhcpsrv/tests/meson.build
index 1d2ebc2b87..17e3df9fc9 100644
--- a/src/lib/dhcpsrv/tests/meson.build
+++ b/src/lib/dhcpsrv/tests/meson.build
@@ -131,7 +131,7 @@ kea_dhcpsrv_tests = executable(
     cpp_args: [
         f'-DTEST_DATA_BUILDDIR="@current_build_dir@"',
         f'-DDHCP_DATA_DIR="@current_build_dir@"',
-        f'-DKEA_LFC_BUILD_DIR="@KEA_LFC_BUILT@"',
+        f'-DKEA_LFC_EXECUTABLE="@KEA_LFC_BUILT@"',
         f'-DDEFAULT_HOOKS_PATH="@DEFAULT_HOOKS_PATH@"',
     ],
     dependencies: [CRYPTO_DEP, GTEST_DEP],