------------------------------------------------------------ revno: 12644 revision-id: squid3@treenet.co.nz-20131024154536-d539m43t9zs92cw0 parent: squid3@treenet.co.nz-20131024154501-0b2q9eov7isfr68a author: Francesco Chemolli committer: Amos Jeffries branch nick: 3.3 timestamp: Thu 2013-10-24 09:45:36 -0600 message: Have testRock use cachemgr stubs ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20131024154536-d539m43t9zs92cw0 # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.3 # testament_sha1: 951e18507d70cd25a0e6308e6bc527487b8d5652 # timestamp: 2013-10-24 15:47:05 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.3 # base_revision_id: squid3@treenet.co.nz-20131024154501-\ # 0b2q9eov7isfr68a # # Begin patch === modified file 'src/Makefile.am' --- src/Makefile.am 2013-10-24 15:45:01 +0000 +++ src/Makefile.am 2013-10-24 15:45:36 +0000 @@ -3275,8 +3275,8 @@ cache_cf.h \ YesNoNone.h \ tests/stub_cache_cf.cc \ + client_db.h \ tests/stub_cache_manager.cc \ - client_db.h \ tests/stub_client_db.cc \ tests/stub_client_side_request.cc \ tests/stub_debug.cc \ @@ -3289,6 +3289,7 @@ tests/stub_ipcache.cc \ tests/stub_libformat.cc \ tests/stub_libicmp.cc \ + tests/stub_libmgr.cc \ tests/stub_MemStore.cc \ mime.h \ tests/stub_mime.cc \ @@ -3330,7 +3331,6 @@ acl/libstate.la \ eui/libeui.la \ ipc/libipc.la \ - mgr/libmgr.la \ base/libbase.la \ $(SSL_LIBS) \ $(top_builddir)/lib/libmisccontainers.la \ === modified file 'src/tests/stub_libmgr.cc' --- src/tests/stub_libmgr.cc 2012-08-01 12:51:45 +0000 +++ src/tests/stub_libmgr.cc 2013-10-24 15:45:36 +0000 @@ -27,8 +27,8 @@ 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 @@ 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