Author: kpvdr Date: 2009-06-25 16:04:53 -0400 (Thu, 25 Jun 2009) New Revision: 3464 Modified: store/trunk/cpp/tests/cluster/run_cluster_tests Log: New environment handling for run_cluster_tests running in installed environment Modified: store/trunk/cpp/tests/cluster/run_cluster_tests =================================================================== --- store/trunk/cpp/tests/cluster/run_cluster_tests 2009-06-25 18:14:02 UTC (rev 3463) +++ store/trunk/cpp/tests/cluster/run_cluster_tests 2009-06-25 20:04:53 UTC (rev 3464) @@ -60,21 +60,13 @@ export RECEIVER_EXEC=${QPID_DIR}/cpp/src/tests/receiver export SENDER_EXEC=${QPID_DIR}/cpp/src/tests/sender else - # Path from known installed locations - CLUSTER_PATH=/libexec/qpid/tests/${CPP_CLUSTER_EXEC} - if test -z ${CLUSTER_PATH} ; then - echo "No executable \"${CPP_CLUSTER_EXEC}\" found in path" - exit 1 - else - CLUSTER_DIR=${CLUSTER_PATH%/*} - fi - export PYTHONPATH=${abs_srcdir} - export QPIDD_EXEC=/usr/sbin/qpidd - export CLUSTER_LIB=/usr/lib/qpid/daemon/cluster.so - export QPID_CONFIG_EXEC=/usr/bin/qpid-config - export QPID_ROUTE_EXEC=/usr/bin/qpid-route - export RECEIVER_EXEC=/libexec/qpid/tests/receiver - export SENDER_EXEC=/libexec/qpid/tests/sender + # Check expected environment vars are set + VARS=(CLUSTER_DIR CPP_CLUSTER_EXEC PYTHONPATH QPIDD_EXEC CLUSTER_LIB QPID_CONFIG_EXEC QPID_ROUTE_EXEC RECEIVER_EXEC SENDER_EXEC) + for var in ${VARS[@]}; do + if test -z ${!var}; then + echo "WARNING: environment variable ${var} not set." + fi + done fi export STORE_LIB=${abs_srcdir}/../../lib/.libs/msgstore.so