[rhmessaging-commits] rhmessaging commits: r3859 - store/trunk/cpp/tests/cluster.
Author: aconway
Date: 2010-02-25 15:55:31 -0500 (Thu, 25 Feb 2010)
New Revision: 3859
Modified:
store/trunk/cpp/tests/cluster/cluster_tests_env.sh
Log:
Fix test scripts to reflect changes in qpid directory layout.
Modified: store/trunk/cpp/tests/cluster/cluster_tests_env.sh
===================================================================
--- store/trunk/cpp/tests/cluster/cluster_tests_env.sh 2010-02-25 20:54:34 UTC (rev 3858)
+++ store/trunk/cpp/tests/cluster/cluster_tests_env.sh 2010-02-25 20:55:31 UTC (rev 3859)
@@ -130,27 +130,9 @@
if test -z ${QPID_BLD}; then
QPID_BLD="${QPID_DIR}/cpp"
fi
-
- # Paths and dirs
- PYTHON_DIR="${QPID_DIR}/python"
- export
PYTHONPATH="${PYTHON_DIR}":"${QPID_DIR}/cpp/src/tests":"${abs_srcdir}"
-
- # Libraries
- export CLUSTER_LIB="${QPID_BLD}/src/.libs/cluster.so"
- export ACL_LIB="${QPID_BLD}/src/.libs/acl.so"
- export TEST_STORE_LIB="${QPID_BLD}/src/tests/.libs/test_store.so"
-
- # Executables
+ source $QPID_BLD/src/tests/test_env.sh
CPP_CLUSTER_EXEC="${QPID_BLD}/src/tests/cluster_test"
PYTHON_CLUSTER_EXEC="${QPID_DIR}/cpp/src/tests/$PYTHON_TESTNAME"
- export QPIDD_EXEC="${QPID_BLD}/src/qpidd"
- export QPID_CONFIG_EXEC="${QPID_DIR}/python/commands/qpid-config"
- export QPID_ROUTE_EXEC="${QPID_DIR}/python/commands/qpid-route"
- export QPID_CLUSTER_EXEC="${QPID_DIR}/python/commands/qpid-cluster"
- export RECEIVER_EXEC="${QPID_BLD}/src/tests/receiver"
- export SENDER_EXEC="${QPID_BLD}/src/tests/sender"
-
- # Test data
CLUSTER_TESTS_FAIL="${QPID_DIR}/cpp/src/tests/cluster_tests.fail"
else
# Set up the environment based on value of ${QPID_PREFIX} for testing against an
installed qpid
@@ -312,9 +294,9 @@
FAILING_PYTHON_TESTS="${abs_srcdir}/../failing_python_tests.txt"
if test -z $1; then
- CLUSTER_TEST="${PYTHON_DIR}/qpid-python-test -m cluster_tests -I
${CLUSTER_TESTS_FAIL}"
+ CLUSTER_TEST="${QPID_PYTHON_TEST} -m cluster_tests -I ${CLUSTER_TESTS_FAIL}"
else
- CLUSTER_TEST="${PYTHON_DIR}/qpid-python-test -m cluster_tests -I
${CLUSTER_TESTS_FAIL} cluster_tests.LongTests.*"
+ CLUSTER_TEST="${QPID_PYTHON_TEST} -m cluster_tests -I ${CLUSTER_TESTS_FAIL}
cluster_tests.LongTests.*"
LONG_TEST=1
fi