From bb081a780bd307b09ad1c773a700233b54e4be48 Mon Sep 17 00:00:00 2001 From: Kim van der Riet Date: Fri, 17 Apr 2009 18:23:06 +0000 Subject: Small change to ClusterFixture which allows a different path to the cluster.so lib for persistence testing git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@766110 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/tests/ClusterFixture.h | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'cpp/src/tests/ClusterFixture.h') diff --git a/cpp/src/tests/ClusterFixture.h b/cpp/src/tests/ClusterFixture.h index 75d39fc7e5..353ec0c88d 100644 --- a/cpp/src/tests/ClusterFixture.h +++ b/cpp/src/tests/ClusterFixture.h @@ -60,32 +60,32 @@ using qpid::broker::Broker; 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 { public: typedef std::vector 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 updateArgs); + ClusterFixture(size_t n, int localIndex, boost::function 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 @@ class ClusterFixture : public vector { 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 @@ class ClusterFixture : public vector { std::vector > forkedBrokers; Args userArgs; boost::function updateArgs; + string clusterLib; }; /** -- cgit v1.2.1