Author: aconway Date: 2010-05-04 15:21:42 -0400 (Tue, 04 May 2010) New Revision: 3945 Modified: store/trunk/cpp/tests/cluster/cluster_tests_env.sh Log: Set PATH in tests scripts to locate test executables. Modified: store/trunk/cpp/tests/cluster/cluster_tests_env.sh =================================================================== --- store/trunk/cpp/tests/cluster/cluster_tests_env.sh 2010-04-30 16:47:11 UTC (rev 3944) +++ store/trunk/cpp/tests/cluster/cluster_tests_env.sh 2010-05-04 19:21:42 UTC (rev 3945) @@ -22,7 +22,6 @@ # --- Function definitions --- - func_check_required_env () #------------------------- # Check that EITHER: @@ -143,6 +142,7 @@ QPID_SBIN_DIR=${QPID_PREFIX}/sbin QPID_LIB_DIR=${QPID_PREFIX}/lib QPID_LIBEXEC_DIR=${QPID_PREFIX}/libexec + export PATH="$QPID_BIN_DIR:$QPID_SBIN_DIR:$QPID_LIBEXEC_DIR/qpid/tests:$PATH" fi # These four env vars must be set prior to calling this script @@ -150,9 +150,7 @@ # Paths and dirs export PYTHON_DIR="${QPID_BIN_DIR}" - export PYTHONPATH="${PYTHONPATH}":"${QPID_LIB_DIR}/python":"${QPID_LIBEXEC_DIR}/qpid/tests":"${QPID_LIB_DIR}/python2.4" - - + export PYTHONPATH="${QPID_LIB_DIR}/python:${QPID_LIBEXEC_DIR}/qpid/tests:${QPID_LIB_DIR}/python2.4:${QPID_LIB_DIR}/python2.4/site-packages:${PYTHONPATH}" # Libraries export CLUSTER_LIB="${QPID_LIB_DIR}/qpid/daemon/cluster.so" export ACL_LIB="${QPID_LIB_DIR}/qpid/daemon/acl.so"