From e81d11bfb94e63f56448d4984f2e2dca39d19f46 Mon Sep 17 00:00:00 2001
From: Kim van der Riet <kpvdr@apache.org>
Date: Tue, 2 Jun 2009 15:47:26 +0000
Subject: Fixes to cluster tests which enable them to be built and run outside
 the source tree.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@781070 13f79535-47bb-0310-9956-ffa450edef68
---
 cpp/src/tests/Makefile.am       |  1 +
 cpp/src/tests/run_cluster_tests | 13 ++++++-------
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'cpp/src')

diff --git a/cpp/src/tests/Makefile.am b/cpp/src/tests/Makefile.am
index 64cd713f1a..3563faf56a 100644
--- a/cpp/src/tests/Makefile.am
+++ b/cpp/src/tests/Makefile.am
@@ -231,6 +231,7 @@ DispatcherTest_LDADD=$(lib_common) $(SOCKLIBS)
 TESTS_ENVIRONMENT = \
     VALGRIND=$(VALGRIND) \
     srcdir=$(srcdir) \
+    top_builddir=$(top_builddir) \
     QPID_DATA_DIR= \
     QPID_LIB_DIR=../.libs \
     BOOST_TEST_SHOW_PROGRESS=yes \
diff --git a/cpp/src/tests/run_cluster_tests b/cpp/src/tests/run_cluster_tests
index 5a1935a91a..d2f7a77865 100755
--- a/cpp/src/tests/run_cluster_tests
+++ b/cpp/src/tests/run_cluster_tests
@@ -20,7 +20,7 @@
 #
 
 # Run the cluster tests.
-TEST_DIR=$srcdir
+TEST_DIR=${top_builddir}/src/tests
 
 # Check AIS requirements
 id -nG | grep '\<ais\>' >/dev/null || NOGROUP="You are not a member of the ais group."
@@ -45,12 +45,12 @@ fi
 
 export PYTHONPATH=$srcdir:$srcdir/../../../python
 export RUN_CLUSTER_TESTS=1
-export QPIDD_EXEC=$srcdir/../qpidd
-export CLUSTER_LIB=$srcdir/../.libs/cluster.so
+export QPIDD_EXEC=${top_builddir}/src/qpidd
+export CLUSTER_LIB=${top_builddir}/src/.libs/cluster.so
 export QPID_CONFIG_EXEC=$srcdir/../../../python/commands/qpid-config
 export QPID_ROUTE_EXEC=$srcdir/../../../python/commands/qpid-route
-export RECEIVER_EXEC=$srcdir/receiver
-export SENDER_EXEC=$srcdir/sender
+export RECEIVER_EXEC=${top_builddir}/src/tests/receiver
+export SENDER_EXEC=${top_builddir}/src/tests/sender
 
 #Make sure temp dir exists if this is the first to use it
 TMP_STORE_DIR=${TEST_DIR}/test_tmp
@@ -64,8 +64,7 @@ fi
 export TMP_STORE_DIR
 
 
-AMQP_SPEC=${TEST_DIR}/../../../specs/amqp.0-10-qpid-errata.xml
-sg ais -c "${TEST_DIR}/cluster.py -v"
+sg ais -c "${srcdir}/cluster.py -v"
 RETCODE=$?
 if test x$RETCODE != x0; then 
     echo "FAIL cluster tests"; exit 1;
-- 
cgit v1.2.1