qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kp...@apache.org
Subject svn commit: r766110 - in /qpid/trunk/qpid/cpp/src/tests: ClusterFixture.cpp ClusterFixture.h
Date Fri, 17 Apr 2009 18:23:08 GMT
Author: kpvdr
Date: Fri Apr 17 18:23:06 2009
New Revision: 766110

URL: http://svn.apache.org/viewvc?rev=766110&view=rev
Log:
Small change to ClusterFixture which allows a different path to the cluster.so lib for persistence
testing

Modified:
    qpid/trunk/qpid/cpp/src/tests/ClusterFixture.cpp
    qpid/trunk/qpid/cpp/src/tests/ClusterFixture.h

Modified: qpid/trunk/qpid/cpp/src/tests/ClusterFixture.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/ClusterFixture.cpp?rev=766110&r1=766109&r2=766110&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/ClusterFixture.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/ClusterFixture.cpp Fri Apr 17 18:23:06 2009
@@ -61,14 +61,14 @@
 
 #include "ClusterFixture.h"
 
-ClusterFixture::ClusterFixture(size_t n, int localIndex_, const Args& args_)
-    : name(Uuid(true).str()), localIndex(localIndex_), userArgs(args_)
+ClusterFixture::ClusterFixture(size_t n, int localIndex_, const Args& args_, const string&
clusterLib_)
+    : name(Uuid(true).str()), localIndex(localIndex_), userArgs(args_), clusterLib(clusterLib_)
 {
     add(n);
 }
 
-ClusterFixture::ClusterFixture(size_t n, int localIndex_, boost::function<void (Args&,
size_t)> updateArgs_)
-    : name(Uuid(true).str()), localIndex(localIndex_), updateArgs(updateArgs_)
+ClusterFixture::ClusterFixture(size_t n, int localIndex_, boost::function<void (Args&,
size_t)> updateArgs_, const string& clusterLib_)
+    : name(Uuid(true).str()), localIndex(localIndex_), updateArgs(updateArgs_), clusterLib(clusterLib_)
 {
     add(n);
 }
@@ -77,10 +77,10 @@
     list_of<string>("--auth=no")("--no-data-dir");
 
 ClusterFixture::Args ClusterFixture::makeArgs(const std::string& prefix, size_t index)
{
-    Args args = list_of<string>("qpidd " __FILE__)
+    Args args = list_of<string>("qpidd ")
         ("--no-module-dir")
-        ("--load-module=../.libs/cluster.so")
-        ("--cluster-name")(name) 
+        ("--load-module")(clusterLib)
+        ("--cluster-name")(name)
         ("--log-prefix")(prefix);
     args.insert(args.end(), userArgs.begin(), userArgs.end());
     if (updateArgs) updateArgs(args, index);
@@ -123,7 +123,7 @@
 }
 
 bool ClusterFixture::hasLocal() const { return localIndex >= 0 && size_t(localIndex)
< size(); }
-    
+
 /** Kill a forked broker with sig, or shutdown localBroker if n==0. */
 void ClusterFixture::kill(size_t n, int sig) {
     if (n == size_t(localIndex))
@@ -153,7 +153,7 @@
         }
     }
     std::set<int> s;
-    for (std::vector<qpid::Url>::const_iterator i = urls.begin(); i != urls.end();
++i) 
+    for (std::vector<qpid::Url>::const_iterator i = urls.begin(); i != urls.end();
++i)
         s.insert((*i)[0].get<qpid::TcpAddress>()->port);
     return s;
 }

Modified: qpid/trunk/qpid/cpp/src/tests/ClusterFixture.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/ClusterFixture.h?rev=766110&r1=766109&r2=766110&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/ClusterFixture.h (original)
+++ qpid/trunk/qpid/cpp/src/tests/ClusterFixture.h Fri Apr 17 18:23:06 2009
@@ -60,32 +60,32 @@
 using boost::shared_ptr;
 using qpid::cluster::Cluster;
 
-
+#define DEFAULT_CLUSTER_LIB "../.libs/cluster.so"
 
 /** Cluster fixture is a vector of ports for the replicas.
- * 
+ *
  * At most one replica (by default replica 0) is in the current
  * process, all others are forked as children.
  */
 class ClusterFixture : public vector<uint16_t>  {
   public:
     typedef std::vector<std::string> Args;
-    static const Args DEFAULT_ARGS; 
+    static const Args DEFAULT_ARGS;
 
     /** @param localIndex can be -1 meaning don't automatically start a local broker.
      * A local broker can be started with addLocal().
      */
-    ClusterFixture(size_t n, int localIndex=0, const Args& args=DEFAULT_ARGS);
+    ClusterFixture(size_t n, int localIndex=0, const Args& args=DEFAULT_ARGS, const string&
clusterLib = DEFAULT_CLUSTER_LIB);
 
     /**@param updateArgs function is passed the index of the cluster member and can update
the arguments. */
-    ClusterFixture(size_t n, int localIndex, boost::function<void (Args&, size_t)>
updateArgs);
+    ClusterFixture(size_t n, int localIndex, boost::function<void (Args&, size_t)>
updateArgs, const string& clusterLib = DEFAULT_CLUSTER_LIB);
 
     void add(size_t n) { for (size_t i=0; i < n; ++i) add(); }
     void add();                 // Add a broker.
     void setup();
 
     bool hasLocal() const;
-    
+
     /** Kill a forked broker with sig, or shutdown localBroker. */
     void kill(size_t n, int sig=SIGINT);
 
@@ -93,7 +93,7 @@
     void killWithSilencer(size_t n, client::Connection& c, int sig=SIGINT);
 
   private:
-    
+
     void addLocal();            // Add a local broker.
     Args makeArgs(const std::string& prefix, size_t index);
     string name;
@@ -102,6 +102,7 @@
     std::vector<shared_ptr<ForkedBroker> > forkedBrokers;
     Args userArgs;
     boost::function<void (Args&, size_t)> updateArgs;
+    string clusterLib;
 };
 
 /**



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org


Mime
View raw message