diff --git a/src/bin/agent/tests/ca_process_tests.sh.in b/src/bin/agent/tests/ca_process_tests.sh.in index f01fff23f5..426d89762e 100755 --- a/src/bin/agent/tests/ca_process_tests.sh.in +++ b/src/bin/agent/tests/ca_process_tests.sh.in @@ -19,7 +19,7 @@ CFG_FILE="@abs_top_builddir@/src/bin/agent/tests/test_config.json" # Path to the Control Agent log file. LOG_FILE="@abs_top_builddir@/src/bin/agent/tests/test.log" # Set env KEA_HOOKS_PATH to override DEFAULT_HOOKS_PATH -export KEA_HOOKS_PATH="@abs_top_builddir@/src/bin/agent/tests/@dotlibs@" +export KEA_HOOKS_PATH="@abs_top_builddir@/src/bin/agent/tests" # Set env KEA_LOG_FILE_DIR to override default log path export KEA_LOG_FILE_DIR="@abs_top_builddir@/src/bin/agent/tests" diff --git a/src/bin/agent/tests/test_callout_libraries.h.in b/src/bin/agent/tests/test_callout_libraries.h.in index 362155a2d8..6590966fd7 100644 --- a/src/bin/agent/tests/test_callout_libraries.h.in +++ b/src/bin/agent/tests/test_callout_libraries.h.in @@ -20,7 +20,7 @@ namespace { 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@"; +static const char* CA_HOOKS_TEST_PATH = "@abs_builddir@"; } // anonymous namespace diff --git a/src/bin/d2/tests/d2_process_tests.sh.in b/src/bin/d2/tests/d2_process_tests.sh.in index 614d1c3695..d909006f5f 100755 --- a/src/bin/d2/tests/d2_process_tests.sh.in +++ b/src/bin/d2/tests/d2_process_tests.sh.in @@ -16,7 +16,7 @@ CFG_FILE="@abs_top_builddir@/src/bin/d2/tests/test_config.json" LOG_FILE="@abs_top_builddir@/src/bin/d2/tests/test.log" # Set env KEA_HOOKS_PATH to override DEFAULT_HOOKS_PATH -export KEA_HOOKS_PATH="@abs_top_builddir@/src/bin/d2/tests/@dotlibs@" +export KEA_HOOKS_PATH="@abs_top_builddir@/src/bin/d2/tests" # Set env KEA_LOG_FILE_DIR to override default log path export KEA_LOG_FILE_DIR="@abs_top_builddir@/src/bin/d2/tests" diff --git a/src/bin/d2/tests/test_callout_libraries.h.in b/src/bin/d2/tests/test_callout_libraries.h.in index f15ccf6182..6302280a47 100644 --- a/src/bin/d2/tests/test_callout_libraries.h.in +++ b/src/bin/d2/tests/test_callout_libraries.h.in @@ -20,7 +20,7 @@ namespace { 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@"; +static const char* D2_HOOKS_TEST_PATH = "@abs_builddir@"; } // anonymous namespace diff --git a/src/bin/d2/tests/test_configured_libraries.h.in b/src/bin/d2/tests/test_configured_libraries.h.in index cb26a9b4c1..56f53343f3 100644 --- a/src/bin/d2/tests/test_configured_libraries.h.in +++ b/src/bin/d2/tests/test_configured_libraries.h.in @@ -22,7 +22,7 @@ namespace { 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@"; +static const char* D2_HOOKS_TEST_PATH = "@abs_builddir@"; } // anonymous namespace diff --git a/src/bin/dhcp4/tests/test_libraries.h.in b/src/bin/dhcp4/tests/test_libraries.h.in index ce0f8daec4..0d525873d7 100644 --- a/src/bin/dhcp4/tests/test_libraries.h.in +++ b/src/bin/dhcp4/tests/test_libraries.h.in @@ -28,7 +28,7 @@ const char* const CALLOUT_LIBRARY_4 = "@abs_builddir@/libco4.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@"; +static const char* DHCP4_HOOKS_TEST_PATH = "@abs_builddir@"; } // anonymous namespace diff --git a/src/bin/dhcp6/tests/test_libraries.h.in b/src/bin/dhcp6/tests/test_libraries.h.in index e191637da9..a9c3dbfa65 100644 --- a/src/bin/dhcp6/tests/test_libraries.h.in +++ b/src/bin/dhcp6/tests/test_libraries.h.in @@ -26,7 +26,7 @@ const char* const CALLOUT_LIBRARY_4 = "@abs_builddir@/libco4.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@"; +static const char* DHCP6_HOOKS_TEST_PATH = "@abs_builddir@"; } // anonymous namespace diff --git a/src/lib/dhcpsrv/tests/test_libraries.h.in b/src/lib/dhcpsrv/tests/test_libraries.h.in index f0d0ce8ee4..833b7ecfd0 100644 --- a/src/lib/dhcpsrv/tests/test_libraries.h.in +++ b/src/lib/dhcpsrv/tests/test_libraries.h.in @@ -30,7 +30,7 @@ static const char* CALLOUT_PARAMS_LIBRARY = "@abs_builddir@/libco3.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@"; +static const char* DHCPSRV_HOOKS_TEST_PATH = "@abs_builddir@"; } // anonymous namespace