Author: kpvdr Date: 2012-11-16 10:19:09 -0500 (Fri, 16 Nov 2012) New Revision: 4519 Modified: store/trunk/cpp/tests/.valgrind.supp store/trunk/cpp/tests/OrderingTest.cpp store/trunk/cpp/tests/SimpleTest.cpp store/trunk/cpp/tests/TransactionalTest.cpp store/trunk/cpp/tests/TwoPhaseCommitTest.cpp Log: Fixed compile problems introduced by qpid r.1400177 "QPID-4368: Allow pluggable protocol implementations". Also suppressed some valgrind possible memory leak errors in OrderingTest. Modified: store/trunk/cpp/tests/.valgrind.supp =================================================================== --- store/trunk/cpp/tests/.valgrind.supp 2012-10-30 17:46:55 UTC (rev 4518) +++ store/trunk/cpp/tests/.valgrind.supp 2012-11-16 15:19:09 UTC (rev 4519) @@ -1,40 +1,35 @@ { - Benign error in libcpg. - Memcheck:Param - socketcall.sendmsg(msg.msg_iov[i]) - obj:*/libpthread-2.5.so - obj:*/libcpg.so.2.0.0 + <insert_a_suppression_name_here> + Memcheck:Leak + fun:_Znwm + fun:_ZNSs4_Rep9_S_createEmmRKSaIcE + fun:_ZNSs12_S_constructIPKcEEPcT_S3_RKSaIcESt20forward_iterator_tag + fun:_ZNSsC1EPKcRKSaIcE } { - Uninitialised value problem in _dl_relocate (F7, F8) - Memcheck:Cond - fun:_dl_relocate_object - fun:*dl_* + <insert_a_suppression_name_here> + Memcheck:Leak + fun:_Znwm + fun:_ZNSs4_Rep9_S_createEmmRKSaIcE + fun:_ZNSs4_Rep8_M_cloneERKSaIcEm + fun:_ZNSs7reserveEm } { - False "possibly leaked" in boost program_options - global std::string var. + <insert_a_suppression_name_here> Memcheck:Leak - fun:_Znwj - fun:_ZNSs4_Rep9_S_createEjjRKSaIcE - obj:/usr/lib/libstdc++.so.6.0.8 - fun:_ZNSsC1EPKcRKSaIcE - obj:/usr/lib/libboost_program_options.so.1.33.1 + fun:_Znwm + fun:_ZNSs4_Rep9_S_createEmmRKSaIcE + fun:_ZNSs9_M_mutateEmmm + fun:_ZNSs15_M_replace_safeEmmPKcm } { - Probable use after delete problem in boost::unit_test - Memcheck:Addr8 - fun:_ZN5boost9unit_test14framework_implD1Ev - fun:exit - fun:(below main) -} - -{ <insert_a_suppression_name_here> - Memcheck:Addr4 - fun:_ZN5boost9unit_test14framework_implD1Ev - fun:exit - fun:(below main) + Memcheck:Leak + fun:_Znwm + fun:_ZNSs4_Rep9_S_createEmmRKSaIcE + fun:_ZNSsC1IPcEET_S1_RKSaIcE } + Modified: store/trunk/cpp/tests/OrderingTest.cpp =================================================================== --- store/trunk/cpp/tests/OrderingTest.cpp 2012-10-30 17:46:55 UTC (rev 4518) +++ store/trunk/cpp/tests/OrderingTest.cpp 2012-11-16 15:19:09 UTC (rev 4519) @@ -33,6 +33,7 @@ #include "qpid/sys/Timer.h" qpid::sys::Timer timer; +qpid::broker::ProtocolRegistry pr; #define SET_LOG_LEVEL(level) \ qpid::log::Options opts(""); \ @@ -118,7 +119,7 @@ sys::Timer t; DtxManager mgr(t); mgr.setStore (store.get()); - RecoveryManagerImpl recoveryMgr(queues, exchanges, links, mgr); + RecoveryManagerImpl recoveryMgr(queues, exchanges, links, mgr, pr); store->recover(recoveryMgr); queue = queues.find(name); Modified: store/trunk/cpp/tests/SimpleTest.cpp =================================================================== --- store/trunk/cpp/tests/SimpleTest.cpp 2012-10-30 17:46:55 UTC (rev 4518) +++ store/trunk/cpp/tests/SimpleTest.cpp 2012-11-16 15:19:09 UTC (rev 4519) @@ -37,6 +37,7 @@ #include "qpid/sys/Timer.h" qpid::sys::Timer timer; +qpid::broker::ProtocolRegistry pr; #define SET_LOG_LEVEL(level) \ qpid::log::Options opts(""); \ @@ -75,7 +76,7 @@ sys::Timer t; DtxManager mgr(t); mgr.setStore (&store); - RecoveryManagerImpl recovery(queues, exchanges, links, mgr); + RecoveryManagerImpl recovery(queues, exchanges, links, mgr, pr); store.recover(recovery); } Modified: store/trunk/cpp/tests/TransactionalTest.cpp =================================================================== --- store/trunk/cpp/tests/TransactionalTest.cpp 2012-10-30 17:46:55 UTC (rev 4518) +++ store/trunk/cpp/tests/TransactionalTest.cpp 2012-11-16 15:19:09 UTC (rev 4519) @@ -35,6 +35,7 @@ #include "qpid/sys/Timer.h" qpid::sys::Timer timer; +qpid::broker::ProtocolRegistry pr; #define SET_LOG_LEVEL(level) \ qpid::log::Options opts(""); \ @@ -138,7 +139,7 @@ sys::Timer t; DtxManager mgr(t); mgr.setStore (store.get()); - RecoveryManagerImpl recovery(*queues, exchanges, links, mgr); + RecoveryManagerImpl recovery(*queues, exchanges, links, mgr, pr); store->recover(recovery); queueA = queues->find(nameA); Modified: store/trunk/cpp/tests/TwoPhaseCommitTest.cpp =================================================================== --- store/trunk/cpp/tests/TwoPhaseCommitTest.cpp 2012-10-30 17:46:55 UTC (rev 4518) +++ store/trunk/cpp/tests/TwoPhaseCommitTest.cpp 2012-11-16 15:19:09 UTC (rev 4519) @@ -35,6 +35,7 @@ #include "qpid/sys/Timer.h" qpid::sys::Timer timer; +qpid::broker::ProtocolRegistry pr; #define SET_LOG_LEVEL(level) \ qpid::log::Options opts(""); \ @@ -384,7 +385,7 @@ links = std::auto_ptr<LinkRegistry>(new LinkRegistry); dtxmgr = std::auto_ptr<DtxManager>(new DtxManager(t)); dtxmgr->setStore (store.get()); - RecoveryManagerImpl recovery(*queues, exchanges, *links, *dtxmgr); + RecoveryManagerImpl recovery(*queues, exchanges, *links, *dtxmgr, pr); store->recover(recovery); queueA = queues->find(nameA);