From 6bb0134ca322b6e50e6ec76a242f89259cd12274 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Mon, 30 Nov 2009 19:34:36 +0000 Subject: Clean up test environment variables, prepare for running more tests in cmake. - consolidate test env vars in test_env.sh, also useful from command line. - generate test_env.sh with autoconf/cmake to cover library location differences. - Remove explicit mention of .libs, use $QPID_MODULE_DIR to load modules. - Fix run_test to run valgrind under cmake git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@885557 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/tests/reliable_replication_test | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'qpid/cpp/src/tests/reliable_replication_test') diff --git a/qpid/cpp/src/tests/reliable_replication_test b/qpid/cpp/src/tests/reliable_replication_test index db06259f0c..165ece82e0 100755 --- a/qpid/cpp/src/tests/reliable_replication_test +++ b/qpid/cpp/src/tests/reliable_replication_test @@ -21,8 +21,8 @@ # Test reliability of the replication feature in the face of link # failures: -MY_DIR=`dirname \`which $0\`` -. ${MY_DIR}/python_env.sh + +source ./test_env.sh trap stop_brokers EXIT @@ -39,19 +39,18 @@ stop_brokers() { setup() { rm -f replication-source.log replication-dest.log - ../qpidd --daemon --port 0 --no-data-dir --no-module-dir --auth no --load-module ../.libs/replicating_listener.so --replication-queue replication --create-replication-queue true --log-enable trace+ --log-to-file replication-source.log --log-to-stderr 0 > qpidd-repl.port + ../qpidd --daemon --port 0 --no-data-dir --no-module-dir --auth no --load-module $QPID_MODULE_DIR/replicating_listener.so --replication-queue replication --create-replication-queue true --log-enable trace+ --log-to-file replication-source.log --log-to-stderr 0 > qpidd-repl.port BROKER_A=`cat qpidd-repl.port` - ../qpidd --daemon --port 0 --no-data-dir --no-module-dir --auth no --load-module ../.libs/replication_exchange.so --log-enable info+ --log-to-file replication-dest.log --log-to-stderr 0 > qpidd-repl.port + ../qpidd --daemon --port 0 --no-data-dir --no-module-dir --auth no --load-module $QPID_MODULE_DIR/replication_exchange.so --log-enable info+ --log-to-file replication-dest.log --log-to-stderr 0 > qpidd-repl.port BROKER_B=`cat qpidd-repl.port` - #../qpidd --port 5555 --no-data-dir --no-module-dir --auth no --load-module ../.libs/replicating_listener.so --replication-queue replication --create-replication-queue true --log-enable trace+ --log-to-file replication-source.log --log-to-stderr 0 & + #../qpidd --port 5555 --no-data-dir --no-module-dir --auth no --load-module $QPID_MODULE_DIR/replicating_listener.so --replication-queue replication --create-replication-queue true --log-enable trace+ --log-to-file replication-source.log --log-to-stderr 0 & #BROKER_A=5555 - #../qpidd --port 6666 --no-data-dir --no-module-dir --auth no --load-module ../.libs/replication_exchange.so --log-enable info+ --log-to-file replication-dest.log --log-to-stderr 0 & + #../qpidd --port 6666 --no-data-dir --no-module-dir --auth no --load-module $QPID_MODULE_DIR/replication_exchange.so --log-enable info+ --log-to-file replication-dest.log --log-to-stderr 0 & #BROKER_B=6666 echo "Testing replication from port $BROKER_A to port $BROKER_B" - export PYTHONPATH=$PYTHON_DIR $PYTHON_COMMANDS/qpid-config -a "localhost:$BROKER_B" add exchange replication replication $PYTHON_COMMANDS/qpid-route --ack 500 queue add "localhost:$BROKER_B" "localhost:$BROKER_A" replication replication @@ -79,7 +78,7 @@ bounce_link() { echo "Route re-established" } -if test -d ${PYTHON_DIR} && test -e ../.libs/replicating_listener.so && test -e ../.libs/replication_exchange.so ; then +if test -d ${PYTHON_DIR} && test -e $QPID_MODULE_DIR/replicating_listener.so && test -e $QPID_MODULE_DIR/replication_exchange.so ; then setup for i in `seq 1 100000`; do echo Message $i; done > replicated.expected send & -- cgit v1.2.1