From 344067e253c58f6ee2ed985752d184d00667b8c1 Mon Sep 17 00:00:00 2001 From: Kim van der Riet Date: Wed, 1 Jul 2009 15:21:54 +0000 Subject: Fix for cluster_test problems: a) When not started from within test dir, qpidd is not found, and a process cascade results in which each forked process continues and runs all tests after its own instead of terminating; b) Hard-coded paths and names of libs, which have been moved into Makefile.am; c) Some tests use ScopedSuppressLogging, these tests are modified so the scope of the logging suppression does not include the broker/cluster startup. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@790215 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/tests/ClusterFailover.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'cpp/src/tests/ClusterFailover.cpp') diff --git a/cpp/src/tests/ClusterFailover.cpp b/cpp/src/tests/ClusterFailover.cpp index 7d49ed5cda..9ce9c4a36b 100644 --- a/cpp/src/tests/ClusterFailover.cpp +++ b/cpp/src/tests/ClusterFailover.cpp @@ -7,9 +7,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -51,7 +51,7 @@ const sys::Duration TIMEOUT=sys::TIME_SEC/4; // Test re-connecting with same session name after a failure. QPID_AUTO_TEST_CASE(testReconnectSameSessionName) { ostringstream clusterLib; - clusterLib << getLibPath("QPID_LIB_DIR", "../.libs") << "/cluster.so"; + clusterLib << getLibPath("CLUSTER_LIB", "../.libs/cluster.so"); ClusterFixture::Args args = list_of("--auth")("no")("--no-module-dir")("--no-data-dir")("--load-module")(clusterLib.str()); ClusterFixture cluster(2, args, -1); Client c0(cluster[0], "foo"); -- cgit v1.2.1