[#3953] Remove @dotlibs@ leftover from autotools removal

diff --git a/src/bin/agent/tests/ca_process_tests.sh.in b/src/bin/agent/tests/ca_process_tests.sh.in
index f01fff23f58f1072d569c1c25874c4da19079854..426d89762e1c5016ea6b2ab04d3ac22a9c85da82 100755 (executable)
--- 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 362155a2d88ae39b6e8e240cbfe5de671815ea1b..6590966fd76bc96d0843ea30e8ecfde9d05f8dec 100644 (file)
--- 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 614d1c3695ce0375fd46ceedc95514659e34814d..d909006f5f297af4b282146b6d72ebeebe4871e7 100755 (executable)
--- 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 f15ccf6182e65c00f8b4a6374f53e581ddc23b28..6302280a474022fecdfbfd902dea4a3e66b5e9a6 100644 (file)
--- 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 cb26a9b4c1fed9e4dfed9bef255ee59fc1ffae63..56f53343f369c49741f13ac17bd79e779518ea33 100644 (file)
--- 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 ce0f8daec4c79ab6436fa81cf181491d3e680060..0d525873d71d6e0bf23b7d490cbb3005fddc6189 100644 (file)
--- 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 e191637da960f4c6fcd7486a9d19bb212d0207e6..a9c3dbfa65fb462b50bcb05b735358527a9b9b68 100644 (file)
--- 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 f0d0ce8ee47772899e793da6b057b04f35f95982..833b7ecfd08a5f524997c2950412da742ebedb79 100644 (file)
--- 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