svn commit: r781070 - in /qpid/trunk/qpid/cpp/src/tests: Makefile.am run_cluster_tests

[kp...@apache.org]

Author: kpvdr
Date: Tue Jun  2 15:47:26 2009
New Revision: 781070

URL: http://svn.apache.org/viewvc?rev=781070&view=rev
Log:
Fixes to cluster tests which enable them to be built and run outside the source tree.

Modified:
    qpid/trunk/qpid/cpp/src/tests/Makefile.am
    qpid/trunk/qpid/cpp/src/tests/run_cluster_tests

Modified: qpid/trunk/qpid/cpp/src/tests/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/Makefile.am?rev=781070&r1=781069&r2=781070&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/src/tests/Makefile.am Tue Jun  2 15:47:26 2009
@@ -231,6 +231,7 @@
 TESTS_ENVIRONMENT = \
     VALGRIND=$(VALGRIND) \
     srcdir=$(srcdir) \
+    top_builddir=$(top_builddir) \
     QPID_DATA_DIR= \
     QPID_LIB_DIR=../.libs \
     BOOST_TEST_SHOW_PROGRESS=yes \

Modified: qpid/trunk/qpid/cpp/src/tests/run_cluster_tests
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/run_cluster_tests?rev=781070&r1=781069&r2=781070&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/run_cluster_tests (original)
+++ qpid/trunk/qpid/cpp/src/tests/run_cluster_tests Tue Jun  2 15:47:26 2009
@@ -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 @@
 
 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 @@
 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;



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org