summaryrefslogtreecommitdiff
path: root/cpp/src/tests/ClusterFixture.h
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/tests/ClusterFixture.h')
-rw-r--r--cpp/src/tests/ClusterFixture.h8
1 files changed, 2 insertions, 6 deletions
diff --git a/cpp/src/tests/ClusterFixture.h b/cpp/src/tests/ClusterFixture.h
index 353ec0c88d..08b314499e 100644
--- a/cpp/src/tests/ClusterFixture.h
+++ b/cpp/src/tests/ClusterFixture.h
@@ -60,8 +60,6 @@ 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
@@ -70,15 +68,14 @@ using qpid::cluster::Cluster;
class ClusterFixture : public vector<uint16_t> {
public:
typedef std::vector<std::string> 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, const string& clusterLib = DEFAULT_CLUSTER_LIB);
+ ClusterFixture(size_t n, const Args& args, int localIndex=0);
/**@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, const string& clusterLib = DEFAULT_CLUSTER_LIB);
+ ClusterFixture(size_t n, boost::function<void (Args&, size_t)> updateArgs, int localIndex);
void add(size_t n) { for (size_t i=0; i < n; ++i) add(); }
void add(); // Add a broker.
@@ -102,7 +99,6 @@ class ClusterFixture : public vector<uint16_t> {
std::vector<shared_ptr<ForkedBroker> > forkedBrokers;
Args userArgs;
boost::function<void (Args&, size_t)> updateArgs;
- string clusterLib;
};
/**