From 3636ab74638f78ec8014a5d2596d46e92a94433d Mon Sep 17 00:00:00 2001 From: Francesco Chemolli Date: Thu, 24 Oct 2013 09:11:49 -0600 Subject: [PATCH] Have testRock use cachemgr stubs --- src/Makefile.am | 4 ++-- src/tests/stub_libmgr.cc | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index cfe1bf0ac4..40a62cffc2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3346,8 +3346,8 @@ tests_testRock_SOURCES = \ cache_cf.h \ YesNoNone.h \ tests/stub_cache_cf.cc \ - tests/stub_cache_manager.cc \ client_db.h \ + tests/stub_cache_manager.cc \ tests/stub_client_db.cc \ tests/stub_client_side_request.cc \ tests/stub_debug.cc \ @@ -3361,6 +3361,7 @@ tests_testRock_SOURCES = \ tests/stub_libeui.cc \ tests/stub_libformat.cc \ tests/stub_libicmp.cc \ + tests/stub_libmgr.cc \ tests/stub_MemStore.cc \ mime.h \ tests/stub_mime.cc \ @@ -3402,7 +3403,6 @@ tests_testRock_LDADD = \ acl/libapi.la \ acl/libstate.la \ ipc/libipc.la \ - mgr/libmgr.la \ base/libbase.la \ $(SSL_LIBS) \ $(top_builddir)/lib/libmisccontainers.la \ diff --git a/src/tests/stub_libmgr.cc b/src/tests/stub_libmgr.cc index ab9727de18..5849fb2a37 100644 --- a/src/tests/stub_libmgr.cc +++ b/src/tests/stub_libmgr.cc @@ -27,8 +27,8 @@ StoreEntry * Mgr::Action::createStoreEntry() const STUB_RETVAL(NULL) static Mgr::Action::Pointer dummyAction; #include "mgr/ActionParams.h" -Mgr::ActionParams::ActionParams() STUB -Mgr::ActionParams::ActionParams(const Ipc::TypedMsgHdr &msg) STUB +Mgr::ActionParams::ActionParams() STUB_NOP +Mgr::ActionParams::ActionParams(const Ipc::TypedMsgHdr &msg) STUB_NOP void Mgr::ActionParams::pack(Ipc::TypedMsgHdr &msg) const STUB std::ostream &operator <<(std::ostream &os, const Mgr::ActionParams ¶ms) STUB_RETVAL(os) @@ -174,8 +174,8 @@ Mgr::QueryParam::Pointer Mgr::QueryParams::CreateParam(QueryParam::Type aType) S bool Mgr::QueryParams::ParseParam(const String& paramStr, Param& param) STUB_RETVAL(false) #include "mgr/Registration.h" -void Mgr::RegisterAction(char const * action, char const * desc, OBJH * handler, int pw_req_flag, int atomic); -void Mgr::RegisterAction(char const * action, char const * desc, ClassActionCreationHandler *handler, int pw_req_flag, int atomic); +//void Mgr::RegisterAction(char const * action, char const * desc, OBJH * handler, int pw_req_flag, int atomic); +//void Mgr::RegisterAction(char const * action, char const * desc, ClassActionCreationHandler *handler, int pw_req_flag, int atomic); #include "mgr/Request.h" //Mgr::Request::Request(int aRequestorId, unsigned int aRequestId, int aFd, const Mgr::ActionParams &aParams) STUB -- 2.47.2