Tagging the M2 branch for the final release

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/tags/M2/Final@586656 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 9 insertions, 0 deletions

diff --git a/cpp/tests/interop_runner.cpp b/cpp/tests/interop_runner.cpp
index 3dd87a0735..7cb9f1ead5 100644
--- a/cpp/tests/interop_runner.cpp
+++ b/cpp/tests/interop_runner.cpp
@@ -33,6 +33,8 @@
 #include <memory>
 #include "BasicP2PTest.h"
 #include "BasicPubSubTest.h"
+#include "P2PMessageSizeTest.h"
+#include "PubSubMessageSizeTest.h"
 #include "TestCase.h"
 #include <boost/ptr_container/ptr_map.hpp>
 
@@ -92,6 +94,7 @@ public:
 };
 
 /**
+ * TODO: Add clock synching. CLOCK_SYNCH command is currently ignored.
  */
 int main(int argc, char** argv){
     TestOptions options;
@@ -111,6 +114,8 @@ int main(int argc, char** argv){
             listener.registerTest("TC1_DummyRun", new DummyRun());
             listener.registerTest("TC2_BasicP2P", new qpid::BasicP2PTest());
             listener.registerTest("TC3_BasicPubSub", new qpid::BasicPubSubTest());
+            listener.registerTest("TC4_P2PMessageSize", new qpid::P2PMessageSizeTest());
+            listener.registerTest("TC5_PubSubMessageSize", new qpid::PubSubMessageSizeTest());
 
             listener.bindAndConsume();
             
@@ -184,10 +189,12 @@ void Listener::received(Message& message)
         std::string name(message.getHeaders().getString("TEST_NAME"));
         if (name.empty() || invite(name)) {
             sendSimpleResponse("ENLIST", message);
+  	    //std::cout << "Enlisting in test '" << name << "'" << std::endl;
         } else {
             std::cout << "Can't take part in '" << name << "'" << std::endl;
         }
     } else if (type == "ASSIGN_ROLE") {        
+        //std::cout << "Got role assignment request for '" << name << "'" << std::endl;
         test->assign(message.getHeaders().getString("ROLE"), message.getHeaders(), options);
         sendSimpleResponse("ACCEPT_ROLE", message);
     } else if (type == "START") {        
@@ -202,6 +209,8 @@ void Listener::received(Message& message)
     } else if (type == "TERMINATE") {
         if (test != tests.end()) test->stop();
         shutdown();
+    } else if (type == "CLOCK_SYNCH") {
+        // Just ignore for now.
     } else {        
         std::cerr <<"ERROR!: Received unknown control message: " << type << std::endl;
         shutdown();