diff options
| author | Rajesh Gangam <rajeshgangam@gmail.com> | 2023-07-14 02:56:06 +0200 |
|---|---|---|
| committer | Rajesh Gangam <rajeshgangam@gmail.com> | 2023-07-14 03:17:35 +0200 |
| commit | 509c7e5cd9d0482ac790660e14124b2259bdf860 (patch) | |
| tree | 30a08e3d5be23c3912c32b1227f480a4b07827fb /tests | |
| parent | Merge pull request #13717 from anlancs/fix/pimd-igmp-prot-back-2 (diff) | |
| download | frr-509c7e5cd9d0482ac790660e14124b2259bdf860.tar.xz frr-509c7e5cd9d0482ac790660e14124b2259bdf860.zip | |
tests: Fix Compilation Error and RuntimePath changes for test_grpc
The runtime path for grpc.so has been changed for test_grpc.cpp
and also there were couple of definitions which are duplicate,
hence renamed them.
Signed-off-by: Rajesh Gangam <rajeshgangam@gmail.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/lib/test_grpc.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/lib/test_grpc.cpp b/tests/lib/test_grpc.cpp index 87530d41d..182c1d338 100644 --- a/tests/lib/test_grpc.cpp +++ b/tests/lib/test_grpc.cpp @@ -34,8 +34,8 @@ #include <grpcpp/security/credentials.h> #include "grpc/frr-northbound.grpc.pb.h" -DEFINE_HOOK(frr_late_init, (struct event_loop * tm), (tm)); -DEFINE_KOOH(frr_fini, (), ()); +DEFINE_HOOK(test_grpc_late_init, (struct event_loop * tm), (tm)); +DEFINE_KOOH(test_grpc_fini, (), ()); struct vty *vty; @@ -85,7 +85,7 @@ static void static_startup(void) zprivs_init(&static_privs); /* Load the server side module -- check libtool path first */ - std::string modpath = std::string(binpath) + std::string("../../../lib/.libs"); + std::string modpath = std::string(binpath) + std::string("../../lib/.libs"); grpc_module = frrmod_load("grpc:50051", modpath.c_str(), 0, 0); if (!grpc_module) { modpath = std::string(binpath) + std::string("../../lib"); @@ -127,12 +127,12 @@ static void static_startup(void) frr_pthread_init(); // frr_config_fork(); - hook_call(frr_late_init, master); + hook_call(test_grpc_late_init, master); } static void static_shutdown(void) { - hook_call(frr_fini); + hook_call(test_grpc_fini); vty_close(vty); vrf_terminate(); vty_terminate(); |