2:51 p.m.
Author: kpvdr
Date: 2009-07-17 15:51:39 -0400 (Fri, 17 Jul 2009)
New Revision: 3510
Modified:
store/trunk/cpp/tests/cluster/run_cluster_tests
Log:
Further refinements to run_cluster_test
Modified: store/trunk/cpp/tests/cluster/run_cluster_tests
===================================================================
--- store/trunk/cpp/tests/cluster/run_cluster_tests 2009-07-17 18:22:09 UTC (rev 3509)
+++ store/trunk/cpp/tests/cluster/run_cluster_tests 2009-07-17 19:51:39 UTC (rev 3510)
@@ -22,7 +22,10 @@
# The GNU Lesser General Public License is available in the file COPYING.
# Check that an environment var is set (ie non-zero length)
-checkvar()
+# Params: $1 - env var to be checked
+# Returns: 0 = env var is set (ie non-zero length)
+# 1 = env var is not set
+func_checkvar ()
{
local loc_VAR=$1
if test -z ${!loc_VAR}; then
@@ -33,11 +36,13 @@
}
# Check a list of paths (each can contain ':'-separated sub-list) is set and
valid (ie each path exists as a dir)
-checkpaths()
+# Params: $@ - List of path env vars to be checked
+# Returns: Nothing
+func_checkpaths ()
{
local loc_PATHS=$@
for path in ${loc_PATHS}; do
- checkvar ${path}
+ func_checkvar ${path}
if test $? == 0; then
local temp_IFS=${IFS}
IFS=":"
@@ -53,11 +58,13 @@
}
# Check that a list of libs is set and valid (ie each lib exists as an executable file)
-checklibs()
+# Params: $@ - List of lib values to be checked
+# Returns: Nothing
+func_checklibs ()
{
local loc_LIBS=$@
for lib in ${loc_LIBS[@]}; do
- checkvar ${lib}
+ func_checkvar ${lib}
if test $? == 0; then
if test ! -x ${!lib}; then
echo "WARNING: Library ${lib}=${!lib} not found."
@@ -67,11 +74,13 @@
}
# Check that a list of executable is set and valid (ie each exec exists as an executable
file)
-checkexecs()
+# Params: $@ - List of exec values to be checked
+# Returns: Nothing
+func_checkexecs ()
{
local loc_EXECS=$@
for exec in ${loc_EXECS[@]}; do
- checkvar ${exec}
+ func_checkvar ${exec}
if test $? == 0; then
if test ! -x ${!exec}; then
echo "WARNING: Executable ${exec}=${!exec} not found or is not
executable."
@@ -84,6 +93,7 @@
srcdir=`dirname $0`
+# If this script is run using parameter $1 = "LONG_TEST", then run the long
test scripts
if test x$1 == x"LONG_TEST"; then
echo "Running long tests..."
LONG_TEST=1
@@ -114,56 +124,56 @@
# QPID_DIR is defined for source tree builds because of the --with-qpid-checkout config
parameter
# If set, then set all the env vars from the correct places in the svn source tree.
-if test "${QPID_DIR}" -a -d ${QPID_DIR} ; then
+if test "${QPID_DIR}" -a -d "${QPID_DIR}" ; then
# Paths and dirs
- export PYTHONPATH=${QPID_DIR}/python:${abs_srcdir}
+ export PYTHONPATH="${QPID_DIR}/python":"${abs_srcdir}"
# Libraries
- export CLUSTER_LIB=${QPID_DIR}/cpp/src/.libs/cluster.so
- export TEST_STORE_LIB=${QPID_DIR}/cpp/src/tests/.libs/test_store.so
+ export CLUSTER_LIB="${QPID_DIR}/cpp/src/.libs/cluster.so"
+ export TEST_STORE_LIB="${QPID_DIR}/cpp/src/tests/.libs/test_store.so"
# Executables
- CPP_CLUSTER_EXEC=${QPID_DIR}/cpp/src/tests/cluster_test
+ CPP_CLUSTER_EXEC="${QPID_DIR}/cpp/src/tests/cluster_test"
if test ${LONG_TEST}; then
- PYTHON_CLUSTER_EXEC=${QPID_DIR}/cpp/src/tests/long_cluster_tests.py
+ PYTHON_CLUSTER_EXEC="${QPID_DIR}/cpp/src/tests/long_cluster_tests.py"
else
- PYTHON_CLUSTER_EXEC=${QPID_DIR}/cpp/src/tests/cluster_tests.py
+ PYTHON_CLUSTER_EXEC="${QPID_DIR}/cpp/src/tests/cluster_tests.py"
fi
- export QPIDD_EXEC=${QPID_DIR}/cpp/src/qpidd
- export QPID_CONFIG_EXEC=${QPID_DIR}/python/commands/qpid-config
- export QPID_ROUTE_EXEC=${QPID_DIR}/python/commands/qpid-route
- export RECEIVER_EXEC=${QPID_DIR}/cpp/src/tests/receiver
- export SENDER_EXEC=${QPID_DIR}/cpp/src/tests/sender
+ export QPIDD_EXEC="${QPID_DIR}/cpp/src/qpidd"
+ export QPID_CONFIG_EXEC="${QPID_DIR}/python/commands/qpid-config"
+ export QPID_ROUTE_EXEC="${QPID_DIR}/python/commands/qpid-route"
+ export RECEIVER_EXEC="${QPID_DIR}/cpp/src/tests/receiver"
+ export SENDER_EXEC="${QPID_DIR}/cpp/src/tests/sender"
else
# These four env vars must be set prior to calling this script
- checkpaths QPID_BIN_DIR QPID_SBIN_DIR QPID_LIB_DIR QPID_LIBEXEC_DIR
+ func_checkpaths QPID_BIN_DIR QPID_SBIN_DIR QPID_LIB_DIR QPID_LIBEXEC_DIR
# Paths and dirs
- export PYTHONPATH=${QPID_LIB_DIR}/python:${QPID_LIB_DIR}/python2.4
+ export
PYTHONPATH="${QPID_LIB_DIR}/python":"${QPID_LIB_DIR}/python2.4"
# Libraries
- export CLUSTER_LIB=${QPID_LIB_DIR}/cluster.so
- export TEST_STORE_LIB=${QPID_LIB_DIR}/test_store.so
+ export CLUSTER_LIB="${QPID_LIB_DIR}/cluster.so"
+ export TEST_STORE_LIB="${QPID_LIB_DIR}/test_store.so"
# Executables
- CPP_CLUSTER_EXEC=${QPID_LIBEXEC_DIR}/cluster_test
+ CPP_CLUSTER_EXEC="${QPID_LIBEXEC_DIR}/cluster_test"
if test ${LONG_TEST}; then
- PYTHON_CLUSTER_EXEC=${QPID_LIBEXEC_DIR}/long_cluster_tests.py
+ PYTHON_CLUSTER_EXEC="${QPID_LIBEXEC_DIR}/long_cluster_tests.py"
else
- PYTHON_CLUSTER_EXEC=${QPID_LIBEXEC_DIR}/cluster_tests.py
+ PYTHON_CLUSTER_EXEC="${QPID_LIBEXEC_DIR}/cluster_tests.py"
fi
- export QPIDD_EXEC=${QPID_SBIN_DIR}/qpidd
- export QPID_CONFIG_EXEC=${QPID_BIN_DIR}/qpid-config
- export QPID_ROUTE_EXEC=${QPID_BIN_DIR}/qpid-route
- export RECEIVER_EXEC=${QPID_LIBEXEC_DIR}/receiver
- export SENDER_EXEC=${QPID_LIBEXEC_DIR}/sender
+ export QPIDD_EXEC="${QPID_SBIN_DIR}/qpidd"
+ export QPID_CONFIG_EXEC="${QPID_BIN_DIR}/qpid-config"
+ export QPID_ROUTE_EXEC="${QPID_BIN_DIR}/qpid-route"
+ export RECEIVER_EXEC="${QPID_LIBEXEC_DIR}/receiver"
+ export SENDER_EXEC="${QPID_LIBEXEC_DIR}/sender"
fi
-export STORE_LIB=${abs_srcdir}/../../lib/.libs/msgstore.so
+export STORE_LIB="${abs_srcdir}/../../lib/.libs/msgstore.so"
# Check expected environment vars are set
-checkpaths PYTHONPATH
-checklibs CLUSTER_LIB TEST_STORE_LIB STORE_LIB
-checkexecs CPP_CLUSTER_EXEC PYTHON_CLUSTER_EXEC QPIDD_EXEC QPID_CONFIG_EXEC
QPID_ROUTE_EXEC RECEIVER_EXEC SENDER_EXEC
+func_checkpaths PYTHONPATH TMP_DATA_DIR
+func_checklibs CLUSTER_LIB TEST_STORE_LIB STORE_LIB
+func_checkexecs CPP_CLUSTER_EXEC PYTHON_CLUSTER_EXEC QPIDD_EXEC QPID_CONFIG_EXEC
QPID_ROUTE_EXEC RECEIVER_EXEC SENDER_EXEC
# Run the C++ cluster tests
if test ! ${LONG_TEST}; then
@@ -179,7 +189,7 @@
if python -c "import qpid" ; then
PYTHON_TESTS=python_tests
- FAILING_PYTHON_TESTS=${abs_srcdir}/failing_python_tests.txt
+ FAILING_PYTHON_TESTS="${abs_srcdir}/failing_python_tests.txt"
else
cat <<EOF
@@ -196,12 +206,12 @@
fi
#Make sure temp dir exists if this is the first to use it
-if ! test -d ${TMP_DATA_DIR} ; then
- mkdir -p ${TMP_DATA_DIR}/cluster
+if ! test -d "${TMP_DATA_DIR}" ; then
+ mkdir -p "${TMP_DATA_DIR}/cluster"
else
# Delete old cluster test dirs
- rm -rf ${TMP_DATA_DIR}/cluster
- mkdir -p ${TMP_DATA_DIR}/cluster
+ rm -rf "${TMP_DATA_DIR}/cluster"
+ mkdir -p "${TMP_DATA_DIR}/cluster"
fi
export TMP_DATA_DIR