summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cpp/tests/.vg-supp93
-rw-r--r--cpp/tests/InProcessBroker.h4
2 files changed, 95 insertions, 2 deletions
diff --git a/cpp/tests/.vg-supp b/cpp/tests/.vg-supp
index e69de29bb2..5ea6ed1223 100644
--- a/cpp/tests/.vg-supp
+++ b/cpp/tests/.vg-supp
@@ -0,0 +1,93 @@
+{
+ <insert a suppression name here>
+ Memcheck:Leak
+ fun:_Znwj
+ fun:_ZN4qpid7framing14ChannelAdapter4sendEN5boost10shared_ptrINS0_7AMQBodyEEE
+ fun:_ZN4qpid7framing14ChannelAdapter4sendEPNS0_7AMQBodyE
+ fun:_ZN4qpid7framing16AMQP_ClientProxy10Connection5startEhhRKNS0_10FieldTableERKSsS7_
+ fun:_ZN4qpid6broker10Connection9initiatedERKNS_7framing18ProtocolInitiationE
+ fun:_ZN17BrokerChannelTestC1Ev
+ fun:_ZN7CppUnit25ConcretTestFixtureFactoryI17BrokerChannelTestE11makeFixtureEv
+ fun:_ZNK7CppUnit27TestSuiteBuilderContextBase15makeTestFixtureEv
+ fun:_ZNK7CppUnit23TestSuiteBuilderContextI17BrokerChannelTestE11makeFixtureEv
+ fun:_ZN17BrokerChannelTest15addTestsToSuiteERN7CppUnit27TestSuiteBuilderContextBaseE
+ fun:_ZN17BrokerChannelTest5suiteEv
+ fun:_ZN7CppUnit16TestSuiteFactoryI17BrokerChannelTestE8makeTestEv
+ fun:_ZN7CppUnit19TestFactoryRegistry14addTestToSuiteEPNS_9TestSuiteE
+ fun:_ZN7CppUnit19TestFactoryRegistry8makeTestEv
+ obj:/usr/bin/DllPlugInTester
+ obj:/usr/bin/DllPlugInTester
+ fun:(below main)
+}
+{
+ <insert a suppression name here>
+ Memcheck:Leak
+ fun:_Znwj
+ fun:_ZN4qpid6broker17ReferenceRegistry4openERKSs
+ fun:_ZN13ReferenceTestC1Ev
+ fun:_ZN7CppUnit25ConcretTestFixtureFactoryI13ReferenceTestE11makeFixtureEv
+ fun:_ZNK7CppUnit27TestSuiteBuilderContextBase15makeTestFixtureEv
+ fun:_ZNK7CppUnit23TestSuiteBuilderContextI13ReferenceTestE11makeFixtureEv
+ fun:_ZN13ReferenceTest15addTestsToSuiteERN7CppUnit27TestSuiteBuilderContextBaseE
+ fun:_ZN13ReferenceTest5suiteEv
+ fun:_ZN7CppUnit16TestSuiteFactoryI13ReferenceTestE8makeTestEv
+ fun:_ZN7CppUnit19TestFactoryRegistry14addTestToSuiteEPNS_9TestSuiteE
+ fun:_ZN7CppUnit19TestFactoryRegistry8makeTestEv
+ obj:/usr/bin/DllPlugInTester
+ obj:/usr/bin/DllPlugInTester
+ fun:(below main)
+}
+{
+ <insert a suppression name here>
+ Memcheck:Leak
+ fun:_Znwj
+ fun:_ZN4qpid6broker12BasicMessage7deliverERNS_7framing14ChannelAdapterERKSsyj
+ fun:_ZN4qpid6broker7Channel7deliverERN5boost10shared_ptrINS0_7MessageEEERKSsRNS3_INS0_5QueueEEEb
+ fun:_ZN4qpid6broker7Channel12ConsumerImpl7deliverERN5boost10shared_ptrINS0_7MessageEEE
+ fun:_ZN4qpid6broker5Queue8dispatchERN5boost10shared_ptrINS0_7MessageEEE
+ fun:_ZN4qpid6broker5Queue7processERN5boost10shared_ptrINS0_7MessageEEE
+ fun:_ZN4qpid6broker5Queue7deliverERN5boost10shared_ptrINS0_7MessageEEE
+ fun:_ZN17BrokerChannelTest23testDeliveryAndRecoveryEv
+ fun:_ZN7CppUnit10TestCallerI17BrokerChannelTestE7runTestEv
+ fun:_ZNK7CppUnit21TestCaseMethodFunctorclEv
+ fun:_ZN7CppUnit16DefaultProtector7protectERKNS_7FunctorERKNS_16ProtectorContextE
+ fun:_ZNK7CppUnit14ProtectorChain14ProtectFunctorclEv
+ fun:_ZN7CppUnit14ProtectorChain7protectERKNS_7FunctorERKNS_16ProtectorContextE
+ fun:_ZN7CppUnit10TestResult7protectERKNS_7FunctorEPNS_4TestERKSs
+ fun:_ZN7CppUnit8TestCase3runEPNS_10TestResultE
+ fun:_ZN7CppUnit13TestComposite15doRunChildTestsEPNS_10TestResultE
+ fun:_ZN7CppUnit13TestComposite3runEPNS_10TestResultE
+ fun:_ZN7CppUnit13TestComposite15doRunChildTestsEPNS_10TestResultE
+ fun:_ZN7CppUnit13TestComposite3runEPNS_10TestResultE
+ fun:_ZN7CppUnit10TestRunner13WrappingSuite3runEPNS_10TestResultE
+ fun:_ZN7CppUnit10TestResult7runTestEPNS_4TestE
+ fun:_ZN7CppUnit10TestRunner3runERNS_10TestResultERKSs
+ obj:/usr/bin/DllPlugInTester
+ obj:/usr/bin/DllPlugInTester
+}
+{
+ <insert a suppression name here>
+ Memcheck:Leak
+ fun:_Znwj
+ fun:_ZNSs4_Rep9_S_createEjjRKSaIcE
+ obj:/usr/lib/libstdc++.so.6.0.8
+ fun:_ZNSsC1EPKcRKSaIcE
+ fun:_ZN17BrokerChannelTest23testDeliveryAndRecoveryEv
+ fun:_ZN7CppUnit10TestCallerI17BrokerChannelTestE7runTestEv
+ fun:_ZNK7CppUnit21TestCaseMethodFunctorclEv
+ fun:_ZN7CppUnit16DefaultProtector7protectERKNS_7FunctorERKNS_16ProtectorContextE
+ fun:_ZNK7CppUnit14ProtectorChain14ProtectFunctorclEv
+ fun:_ZN7CppUnit14ProtectorChain7protectERKNS_7FunctorERKNS_16ProtectorContextE
+ fun:_ZN7CppUnit10TestResult7protectERKNS_7FunctorEPNS_4TestERKSs
+ fun:_ZN7CppUnit8TestCase3runEPNS_10TestResultE
+ fun:_ZN7CppUnit13TestComposite15doRunChildTestsEPNS_10TestResultE
+ fun:_ZN7CppUnit13TestComposite3runEPNS_10TestResultE
+ fun:_ZN7CppUnit13TestComposite15doRunChildTestsEPNS_10TestResultE
+ fun:_ZN7CppUnit13TestComposite3runEPNS_10TestResultE
+ fun:_ZN7CppUnit10TestRunner13WrappingSuite3runEPNS_10TestResultE
+ fun:_ZN7CppUnit10TestResult7runTestEPNS_4TestE
+ fun:_ZN7CppUnit10TestRunner3runERNS_10TestResultERKSs
+ obj:/usr/bin/DllPlugInTester
+ obj:/usr/bin/DllPlugInTester
+ fun:(below main)
+}
diff --git a/cpp/tests/InProcessBroker.h b/cpp/tests/InProcessBroker.h
index 56bce7d54a..2882ab28e8 100644
--- a/cpp/tests/InProcessBroker.h
+++ b/cpp/tests/InProcessBroker.h
@@ -120,9 +120,9 @@ class InProcessBroker : public client::Connector {
};
std::ostream& operator<<(
- std::ostream& out, const InProcessBroker::TaggedFrame& frame)
+ std::ostream& out, const InProcessBroker::TaggedFrame& tf)
{
- return out << (frame.fromBroker()? "BROKER: ":"CLIENT: ") << frame;
+ return out << (tf.fromBroker()? "BROKER: ":"CLIENT: ") << *tf.frame;
}
std::ostream& operator<<(