summaryrefslogtreecommitdiff
path: root/qpid/cpp/src
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2009-04-16 16:53:22 +0000
committerAlan Conway <aconway@apache.org>2009-04-16 16:53:22 +0000
commitb53a41a5badefac56b9251ee643ea59c577fc7d2 (patch)
treedc3182a3119ff4786cc775feecae00af4bc7b066 /qpid/cpp/src
parent7fd7ccd72e8d609534610016760598336d5ea5a7 (diff)
downloadqpid-python-b53a41a5badefac56b9251ee643ea59c577fc7d2.tar.gz
Override the executable used by ForkedBroker by setting an env. var.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@765685 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
-rw-r--r--qpid/cpp/src/tests/ForkedBroker.cpp3
-rwxr-xr-xqpid/cpp/src/tests/run_failover_soak4
2 files changed, 4 insertions, 3 deletions
diff --git a/qpid/cpp/src/tests/ForkedBroker.cpp b/qpid/cpp/src/tests/ForkedBroker.cpp
index 24ada12739..12175d3287 100644
--- a/qpid/cpp/src/tests/ForkedBroker.cpp
+++ b/qpid/cpp/src/tests/ForkedBroker.cpp
@@ -102,7 +102,8 @@ void ForkedBroker::init(const Args& userArgs) {
::close(pipeFds[0]);
int fd = ::dup2(pipeFds[1], 1); // pipe stdout to the parent.
if (fd < 0) throw ErrnoException("dup2 failed");
- const char* prog = "../qpidd";
+ const char* prog = ::getenv("QPID_FORKED_BROKER");
+ if (!prog) prog = "../qpidd";
Args args(userArgs);
args.push_back("--port=0");
// Keep quiet except for errors.
diff --git a/qpid/cpp/src/tests/run_failover_soak b/qpid/cpp/src/tests/run_failover_soak
index 333dd0be23..3c9a5589c4 100755
--- a/qpid/cpp/src/tests/run_failover_soak
+++ b/qpid/cpp/src/tests/run_failover_soak
@@ -45,11 +45,11 @@ fi
host=127.0.0.1
-MODULES=../.libs
+MODULES=${MODULES:-../.libs}
MESSAGES=${MESSAGES:-300000}
REPORT_FREQUENCY=${REPORT_FREQUENCY:-`expr $MESSAGES / 20`}
VERBOSITY=${VERBOSITY:-1}
-DURABILITY=${DURABILITY:-0}
+DURABILITY=${DURABILITY:-1}
rm -f soak-*.log
exec ./failover_soak $MODULES ./declare_queues ./replaying_sender ./resuming_receiver $MESSAGES $REPORT_FREQUENCY $VERBOSITY $DURABILITY