From: Andrei Pavel Date: Thu, 15 May 2025 06:38:46 +0000 (+0300) Subject: [#3734] Remove dotlibs from Meson which was only about compatiblity with Autotools X-Git-Tag: Kea-3.0.0~167 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ce808ef3487e597b6b7e0176e82ac20b9bb15271;p=thirdparty%2Fkea.git [#3734] Remove dotlibs from Meson which was only about compatiblity with Autotools --- diff --git a/src/bin/agent/tests/meson.build b/src/bin/agent/tests/meson.build index 7a4376bfd0..679e4379fd 100644 --- a/src/bin/agent/tests/meson.build +++ b/src/bin/agent/tests/meson.build @@ -7,7 +7,6 @@ kea_agent_tests_data = configuration_data() kea_agent_tests_data.set('abs_top_builddir', TOP_BUILD_DIR) kea_agent_tests_data.set('abs_top_srcdir', TOP_SOURCE_DIR) kea_agent_tests_data.set('abs_builddir', current_build_dir) -kea_agent_tests_data.set('dotlibs', '') ca_process_tests = configure_file( input: 'ca_process_tests.sh.in', output: 'ca_process_tests.sh', diff --git a/src/bin/agent/tests/test_basic_auth_libraries.h.in b/src/bin/agent/tests/test_basic_auth_libraries.h.in index ec378cedb1..547aff1441 100644 --- a/src/bin/agent/tests/test_basic_auth_libraries.h.in +++ b/src/bin/agent/tests/test_basic_auth_libraries.h.in @@ -17,7 +17,7 @@ namespace { // like to the real shared library. // Basic HTTP authentication as a callout library. -static const char* BASIC_AUTH_LIBRARY = "@abs_builddir@/@dotlibs@libbasicauth.so"; +static const char* BASIC_AUTH_LIBRARY = "@abs_builddir@/libbasicauth.so"; } // anonymous namespace diff --git a/src/bin/agent/tests/test_callout_libraries.h.in b/src/bin/agent/tests/test_callout_libraries.h.in index a8142dd216..362155a2d8 100644 --- a/src/bin/agent/tests/test_callout_libraries.h.in +++ b/src/bin/agent/tests/test_callout_libraries.h.in @@ -17,7 +17,7 @@ namespace { // like to the real shared library. // Basic callout library with context_create and three "standard" callouts. -static const char* CALLOUT_LIBRARY = "@abs_builddir@/@dotlibs@libcallout.so"; +static const char* CALLOUT_LIBRARY = "@abs_builddir@/libcallout.so"; // Test path to use for in place of DEFAULT_HOOKS_PATH static const char* CA_HOOKS_TEST_PATH = "@abs_builddir@/@dotlibs@"; diff --git a/src/bin/d2/tests/meson.build b/src/bin/d2/tests/meson.build index 10a806b219..166aaf15e7 100644 --- a/src/bin/d2/tests/meson.build +++ b/src/bin/d2/tests/meson.build @@ -7,7 +7,6 @@ kea_d2_tests_data = configuration_data() kea_d2_tests_data.set('abs_top_builddir', TOP_BUILD_DIR) kea_d2_tests_data.set('abs_top_srcdir', TOP_SOURCE_DIR) kea_d2_tests_data.set('abs_builddir', current_build_dir) -kea_d2_tests_data.set('dotlibs', '') d2_process_tests = configure_file( input: 'd2_process_tests.sh.in', output: 'd2_process_tests.sh', diff --git a/src/bin/d2/tests/test_callout_libraries.h.in b/src/bin/d2/tests/test_callout_libraries.h.in index bb5c183313..f15ccf6182 100644 --- a/src/bin/d2/tests/test_callout_libraries.h.in +++ b/src/bin/d2/tests/test_callout_libraries.h.in @@ -17,7 +17,7 @@ namespace { // like to the real shared library. // Basic callout library with context_create and three "standard" callouts. -static const char* CALLOUT_LIBRARY = "@abs_builddir@/@dotlibs@libcallout.so"; +static const char* CALLOUT_LIBRARY = "@abs_builddir@/libcallout.so"; // Test path to use for in place of DEFAULT_HOOKS_PATH static const char* D2_HOOKS_TEST_PATH = "@abs_builddir@/@dotlibs@"; diff --git a/src/bin/d2/tests/test_configured_libraries.h.in b/src/bin/d2/tests/test_configured_libraries.h.in index c7ec506409..cb26a9b4c1 100644 --- a/src/bin/d2/tests/test_configured_libraries.h.in +++ b/src/bin/d2/tests/test_configured_libraries.h.in @@ -19,7 +19,7 @@ namespace { // Configured library with d2_srv_configured testing: if there is a toplevel // user context with an error entry the returned status is DROP with the // content of the error entry. -static const char* CONFIGURED_LIBRARY = "@abs_builddir@/@dotlibs@libconfigured.so"; +static const char* CONFIGURED_LIBRARY = "@abs_builddir@/libconfigured.so"; // Test path to use for in place of DEFAULT_HOOKS_PATH static const char* D2_HOOKS_TEST_PATH = "@abs_builddir@/@dotlibs@"; diff --git a/src/bin/dhcp4/tests/dhcp4_process_tests.sh.in b/src/bin/dhcp4/tests/dhcp4_process_tests.sh.in index 2b3f76f15b..63a06e829e 100755 --- a/src/bin/dhcp4/tests/dhcp4_process_tests.sh.in +++ b/src/bin/dhcp4/tests/dhcp4_process_tests.sh.in @@ -20,12 +20,12 @@ LEASE_FILE="@abs_top_builddir@/src/bin/dhcp4/tests/test_leases.csv" # Path to the Kea LFC application export KEA_LFC_EXECUTABLE="@abs_top_builddir@/src/bin/lfc/kea-lfc" # Path to test hooks library -HOOK_FAIL_LOAD_PATH="@abs_top_builddir@/src/bin/dhcp4/tests/@dotlibs@libco3.so" +HOOK_FAIL_LOAD_PATH="@abs_top_builddir@/src/bin/dhcp4/tests/libco3.so" # Path to test hooks library -HOOK_FAIL_POLL_PATH="@abs_top_builddir@/src/bin/dhcp4/tests/@dotlibs@libco4.so" +HOOK_FAIL_POLL_PATH="@abs_top_builddir@/src/bin/dhcp4/tests/libco4.so" # Set env KEA_HOOKS_PATH to override DEFAULT_HOOKS_PATH -export KEA_HOOKS_PATH="@abs_top_builddir@/src/bin/dhcp4/tests/@dotlibs@" +export KEA_HOOKS_PATH="@abs_top_builddir@/src/bin/dhcp4/tests" # Set env KEA_LOG_FILE_DIR to override default log path. export KEA_LOG_FILE_DIR="@abs_top_builddir@/src/bin/dhcp4/tests" diff --git a/src/bin/dhcp4/tests/meson.build b/src/bin/dhcp4/tests/meson.build index ab970c324e..d7657f94d4 100644 --- a/src/bin/dhcp4/tests/meson.build +++ b/src/bin/dhcp4/tests/meson.build @@ -34,7 +34,6 @@ dhcp4_tests_conf_data = configuration_data() dhcp4_tests_conf_data.set('abs_top_builddir', TOP_BUILD_DIR) dhcp4_tests_conf_data.set('abs_top_srcdir', TOP_SOURCE_DIR) dhcp4_tests_conf_data.set('abs_builddir', current_build_dir) -dhcp4_tests_conf_data.set('dotlibs', '') dhcp4_process_tests = configure_file( input: 'dhcp4_process_tests.sh.in', output: 'dhcp4_process_tests.sh', diff --git a/src/bin/dhcp4/tests/test_libraries.h.in b/src/bin/dhcp4/tests/test_libraries.h.in index bd3df2f9df..ce0f8daec4 100644 --- a/src/bin/dhcp4/tests/test_libraries.h.in +++ b/src/bin/dhcp4/tests/test_libraries.h.in @@ -19,13 +19,13 @@ namespace { // Library with load/unload functions creating marker files to check their // operation. -const char* const CALLOUT_LIBRARY_1 = "@abs_builddir@/@dotlibs@libco1.so"; -const char* const CALLOUT_LIBRARY_2 = "@abs_builddir@/@dotlibs@libco2.so"; -const char* const CALLOUT_LIBRARY_3 = "@abs_builddir@/@dotlibs@libco3.so"; -const char* const CALLOUT_LIBRARY_4 = "@abs_builddir@/@dotlibs@libco4.so"; +const char* const CALLOUT_LIBRARY_1 = "@abs_builddir@/libco1.so"; +const char* const CALLOUT_LIBRARY_2 = "@abs_builddir@/libco2.so"; +const char* const CALLOUT_LIBRARY_3 = "@abs_builddir@/libco3.so"; +const char* const CALLOUT_LIBRARY_4 = "@abs_builddir@/libco4.so"; // Name of a library which is not present. -const char* const NOT_PRESENT_LIBRARY = "@abs_builddir@/@dotlibs@libnothere.so"; +const char* const NOT_PRESENT_LIBRARY = "@abs_builddir@/libnothere.so"; // Test path to use for in place of DEFAULT_HOOKS_PATH static const char* DHCP4_HOOKS_TEST_PATH = "@abs_builddir@/@dotlibs@"; diff --git a/src/bin/dhcp6/tests/dhcp6_process_tests.sh.in b/src/bin/dhcp6/tests/dhcp6_process_tests.sh.in index 0f170b8565..a32550bffd 100755 --- a/src/bin/dhcp6/tests/dhcp6_process_tests.sh.in +++ b/src/bin/dhcp6/tests/dhcp6_process_tests.sh.in @@ -20,12 +20,12 @@ LEASE_FILE="@abs_top_builddir@/src/bin/dhcp6/tests/test_leases.csv" # Path to the Kea LFC application export KEA_LFC_EXECUTABLE="@abs_top_builddir@/src/bin/lfc/kea-lfc" # Path to test hooks library -HOOK_FAIL_LOAD_PATH="@abs_top_builddir@/src/bin/dhcp6/tests/@dotlibs@libco3.so" +HOOK_FAIL_LOAD_PATH="@abs_top_builddir@/src/bin/dhcp6/tests/libco3.so" # Path to test hooks library -HOOK_FAIL_POLL_PATH="@abs_top_builddir@/src/bin/dhcp6/tests/@dotlibs@libco4.so" +HOOK_FAIL_POLL_PATH="@abs_top_builddir@/src/bin/dhcp6/tests/libco4.so" # Set env KEA_HOOKS_PATH to override DEFAULT_HOOKS_PATH -export KEA_HOOKS_PATH="@abs_top_builddir@/src/bin/dhcp6/tests/@dotlibs@" +export KEA_HOOKS_PATH="@abs_top_builddir@/src/bin/dhcp6/tests" # Set env KEA_LOG_FILE_DIR to override default log path export KEA_LOG_FILE_DIR="@abs_top_builddir@/src/bin/dhcp6/tests" diff --git a/src/bin/dhcp6/tests/meson.build b/src/bin/dhcp6/tests/meson.build index 7d70e979cc..56cb1a9c8d 100644 --- a/src/bin/dhcp6/tests/meson.build +++ b/src/bin/dhcp6/tests/meson.build @@ -34,7 +34,6 @@ dhcp6_tests_conf_data = configuration_data() dhcp6_tests_conf_data.set('abs_top_builddir', TOP_BUILD_DIR) dhcp6_tests_conf_data.set('abs_top_srcdir', TOP_SOURCE_DIR) dhcp6_tests_conf_data.set('abs_builddir', current_build_dir) -dhcp6_tests_conf_data.set('dotlibs', '') dhcp6_process_tests = configure_file( input: 'dhcp6_process_tests.sh.in', output: 'dhcp6_process_tests.sh', diff --git a/src/bin/dhcp6/tests/test_libraries.h.in b/src/bin/dhcp6/tests/test_libraries.h.in index 2dac850059..e191637da9 100644 --- a/src/bin/dhcp6/tests/test_libraries.h.in +++ b/src/bin/dhcp6/tests/test_libraries.h.in @@ -17,13 +17,13 @@ namespace { // Library with load/unload functions creating marker files to check their // operation. -const char* const CALLOUT_LIBRARY_1 = "@abs_builddir@/@dotlibs@libco1.so"; -const char* const CALLOUT_LIBRARY_2 = "@abs_builddir@/@dotlibs@libco2.so"; -const char* const CALLOUT_LIBRARY_3 = "@abs_builddir@/@dotlibs@libco3.so"; -const char* const CALLOUT_LIBRARY_4 = "@abs_builddir@/@dotlibs@libco4.so"; +const char* const CALLOUT_LIBRARY_1 = "@abs_builddir@/libco1.so"; +const char* const CALLOUT_LIBRARY_2 = "@abs_builddir@/libco2.so"; +const char* const CALLOUT_LIBRARY_3 = "@abs_builddir@/libco3.so"; +const char* const CALLOUT_LIBRARY_4 = "@abs_builddir@/libco4.so"; // Name of a library which is not present. -const char* const NOT_PRESENT_LIBRARY = "@abs_builddir@/@dotlibs@libnothere.so"; +const char* const NOT_PRESENT_LIBRARY = "@abs_builddir@/libnothere.so"; // Test path to use for in place of DEFAULT_HOOKS_PATH static const char* DHCP6_HOOKS_TEST_PATH = "@abs_builddir@/@dotlibs@"; diff --git a/src/lib/dhcpsrv/tests/meson.build b/src/lib/dhcpsrv/tests/meson.build index 040fbe72d9..6b5604a7fb 100644 --- a/src/lib/dhcpsrv/tests/meson.build +++ b/src/lib/dhcpsrv/tests/meson.build @@ -16,7 +16,6 @@ configure_file( ) kea_dhcpsrv_conf_data = configuration_data() kea_dhcpsrv_conf_data.set('abs_builddir', current_build_dir) -kea_dhcpsrv_conf_data.set('dotlibs', '') configure_file( input: 'test_libraries.h.in', output: 'test_libraries.h', diff --git a/src/lib/dhcpsrv/tests/test_libraries.h.in b/src/lib/dhcpsrv/tests/test_libraries.h.in index a92d439764..f0d0ce8ee4 100644 --- a/src/lib/dhcpsrv/tests/test_libraries.h.in +++ b/src/lib/dhcpsrv/tests/test_libraries.h.in @@ -17,17 +17,17 @@ namespace { // Library with load/unload functions creating marker files to check their // operation. -static const char* CALLOUT_LIBRARY_1 = "@abs_builddir@/@dotlibs@libco1.so"; -static const char* CALLOUT_LIBRARY_2 = "@abs_builddir@/@dotlibs@libco2.so"; +static const char* CALLOUT_LIBRARY_1 = "@abs_builddir@/libco1.so"; +static const char* CALLOUT_LIBRARY_2 = "@abs_builddir@/libco2.so"; // This library will try to get the following parameters: // - svalue (and will expect its value to be "string value") // - ivalue (and will expect its value to be 42) // - bvalue (and will expect its value to be true) -static const char* CALLOUT_PARAMS_LIBRARY = "@abs_builddir@/@dotlibs@libco3.so"; +static const char* CALLOUT_PARAMS_LIBRARY = "@abs_builddir@/libco3.so"; // Name of a library which is not present. -static const char* NOT_PRESENT_LIBRARY = "@abs_builddir@/@dotlibs@libnothere.so"; +static const char* NOT_PRESENT_LIBRARY = "@abs_builddir@/libnothere.so"; // Test path to use for in place of DEFAULT_HOOKS_PATH static const char* DHCPSRV_HOOKS_TEST_PATH = "@abs_builddir@/@dotlibs@"; diff --git a/src/lib/hooks/tests/meson.build b/src/lib/hooks/tests/meson.build index e6dd9fe91c..bc38fcac4b 100644 --- a/src/lib/hooks/tests/meson.build +++ b/src/lib/hooks/tests/meson.build @@ -4,7 +4,6 @@ endif kea_hooks_conf_data = configuration_data() kea_hooks_conf_data.set('abs_builddir', meson.current_build_dir()) -kea_hooks_conf_data.set('dotlibs', '') configure_file( input: 'marker_file.h.in', output: 'marker_file.h', diff --git a/src/lib/hooks/tests/test_libraries.h.in b/src/lib/hooks/tests/test_libraries.h.in index 00cc2f12b2..bfdbaffe0d 100644 --- a/src/lib/hooks/tests/test_libraries.h.in +++ b/src/lib/hooks/tests/test_libraries.h.in @@ -17,42 +17,42 @@ namespace { // like to the real shared library. // Basic library with context_create and three "standard" callouts. -static const char* BASIC_CALLOUT_LIBRARY = "@abs_builddir@/@dotlibs@libbcl.so"; +static const char* BASIC_CALLOUT_LIBRARY = "@abs_builddir@/libbcl.so"; // Library with context_create and three "standard" callouts, as well as // load() and unload() functions. -static const char* FULL_CALLOUT_LIBRARY = "@abs_builddir@/@dotlibs@libfcl.so"; +static const char* FULL_CALLOUT_LIBRARY = "@abs_builddir@/libfcl.so"; // Library where the all framework functions throw an exception -static const char* FRAMEWORK_EXCEPTION_LIBRARY = "@abs_builddir@/@dotlibs@libfxl.so"; +static const char* FRAMEWORK_EXCEPTION_LIBRARY = "@abs_builddir@/libfxl.so"; // Library where the version() function returns an incorrect result. -static const char* INCORRECT_VERSION_LIBRARY = "@abs_builddir@/@dotlibs@libivl.so"; +static const char* INCORRECT_VERSION_LIBRARY = "@abs_builddir@/libivl.so"; // Library where some of the callout registration is done with the load() // function. -static const char* LOAD_CALLOUT_LIBRARY = "@abs_builddir@/@dotlibs@liblcl.so"; +static const char* LOAD_CALLOUT_LIBRARY = "@abs_builddir@/liblcl.so"; // Library where the load() function returns an error. static const char* LOAD_ERROR_CALLOUT_LIBRARY = - "@abs_builddir@/@dotlibs@liblecl.so"; + "@abs_builddir@/liblecl.so"; // Name of a library which is not present. -static const char* NOT_PRESENT_LIBRARY = "@abs_builddir@/@dotlibs@libnothere.so"; +static const char* NOT_PRESENT_LIBRARY = "@abs_builddir@/libnothere.so"; // Library that does not include a version function. -static const char* NO_VERSION_LIBRARY = "@abs_builddir@/@dotlibs@libnvl.so"; +static const char* NO_VERSION_LIBRARY = "@abs_builddir@/libnvl.so"; // Library where there is an unload() function. -static const char* UNLOAD_CALLOUT_LIBRARY = "@abs_builddir@/@dotlibs@libucl.so"; +static const char* UNLOAD_CALLOUT_LIBRARY = "@abs_builddir@/libucl.so"; // Library where parameters are checked. -static const char* CALLOUT_PARAMS_LIBRARY = "@abs_builddir@/@dotlibs@libpcl.so"; +static const char* CALLOUT_PARAMS_LIBRARY = "@abs_builddir@/libpcl.so"; // Library which tests objects parking. // Used only by hooks_manager_unittest.cc. #ifdef TEST_ASYNC_CALLOUT -static const char* ASYNC_CALLOUT_LIBRARY = "@abs_builddir@/@dotlibs@libacl.so"; +static const char* ASYNC_CALLOUT_LIBRARY = "@abs_builddir@/libacl.so"; #endif } // anonymous namespace diff --git a/src/lib/testutils/dhcp_test_lib.sh.in b/src/lib/testutils/dhcp_test_lib.sh.in index ba2b9a359c..65edb299a2 100755 --- a/src/lib/testutils/dhcp_test_lib.sh.in +++ b/src/lib/testutils/dhcp_test_lib.sh.in @@ -1133,7 +1133,7 @@ kea_dhcp_config() { }, "hooks-libraries": [ { - "library": "@abs_top_builddir@/src/bin/dhcp%s/tests/@dotlibs@libco1.so", + "library": "@abs_top_builddir@/src/bin/dhcp%s/tests/libco1.so", "parameters": { "password": "sensitive", "user": "keatest", diff --git a/src/lib/testutils/meson.build b/src/lib/testutils/meson.build index c7466d27e7..11de1d46a0 100644 --- a/src/lib/testutils/meson.build +++ b/src/lib/testutils/meson.build @@ -19,7 +19,6 @@ 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) -dhcp_test_lib_conf_data.set('dotlibs', '') configure_file( input: 'dhcp_test_lib.sh.in', output: 'dhcp_test_lib.sh',