[rhmessaging-commits] rhmessaging commits: r3466 - in store/trunk/cpp/tests: cluster and 1 other directory.

[rhmessaging-commits at lists.jboss.org]

Author: kpvdr
Date: 2009-07-01 12:06:19 -0400 (Wed, 01 Jul 2009)
New Revision: 3466

Modified:
   store/trunk/cpp/tests/Makefile.am
   store/trunk/cpp/tests/cluster/Makefile.am
   store/trunk/cpp/tests/cluster/run_cluster_tests
   store/trunk/cpp/tests/run_python_tests
   store/trunk/cpp/tests/system_test.sh
Log:
Minor changes to keep consistent with qpid cluster testing conventions

Modified: store/trunk/cpp/tests/Makefile.am
===================================================================
--- store/trunk/cpp/tests/Makefile.am	2009-06-29 16:00:07 UTC (rev 3465)
+++ store/trunk/cpp/tests/Makefile.am	2009-07-01 16:06:19 UTC (rev 3466)
@@ -80,6 +80,6 @@
   QPID_DIR=$(QPID_DIR) \
   VALGRIND=$(VALGRIND) \
   abs_srcdir=$(abs_srcdir) \
-  LIBSTORE=$(abs_builddir)/../lib/.libs/msgstore.so \
+  STORE_LIB=$(abs_builddir)/../lib/.libs/msgstore.so \
   TMP_DATA_DIR=$(TMP_DATA_DIR) \
   $(srcdir)/run_test

Modified: store/trunk/cpp/tests/cluster/Makefile.am
===================================================================
--- store/trunk/cpp/tests/cluster/Makefile.am	2009-06-29 16:00:07 UTC (rev 3465)
+++ store/trunk/cpp/tests/cluster/Makefile.am	2009-07-01 16:06:19 UTC (rev 3466)
@@ -47,7 +47,7 @@
   STORE_ENABLE=1 \
   QPID_DIR=$(QPID_DIR) \
   VALGRIND=$(VALGRIND) \
-  LIBSTORE=$(abs_builddir)/../../lib/.libs/msgstore.so \
+  STORE_LIB=$(abs_builddir)/../../lib/.libs/msgstore.so \
   TMP_DATA_DIR=$(TMP_DATA_DIR) \
   abs_srcdir=$(abs_srcdir)
 

Modified: store/trunk/cpp/tests/cluster/run_cluster_tests
===================================================================
--- store/trunk/cpp/tests/cluster/run_cluster_tests	2009-06-29 16:00:07 UTC (rev 3465)
+++ store/trunk/cpp/tests/cluster/run_cluster_tests	2009-07-01 16:06:19 UTC (rev 3466)
@@ -55,13 +55,14 @@
 	export PYTHONPATH=${QPID_DIR}/python:${abs_srcdir}
 	export QPIDD_EXEC=${QPID_DIR}/cpp/src/qpidd
 	export CLUSTER_LIB=${QPID_DIR}/cpp/src/.libs/cluster.so
+	export TEST_STORE_LIB=${QPID_DIR}/cpp/src/tests/.libs/test_store.so
 	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
 	# Check expected environment vars are set
-	VARS=(CLUSTER_DIR PYTHONPATH QPIDD_EXEC CLUSTER_LIB QPID_CONFIG_EXEC QPID_ROUTE_EXEC RECEIVER_EXEC SENDER_EXEC)
+	VARS=(CLUSTER_DIR PYTHONPATH QPIDD_EXEC CLUSTER_LIB TEST_STORE_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."

Modified: store/trunk/cpp/tests/run_python_tests
===================================================================
--- store/trunk/cpp/tests/run_python_tests	2009-06-29 16:00:07 UTC (rev 3465)
+++ store/trunk/cpp/tests/run_python_tests	2009-07-01 16:06:19 UTC (rev 3466)
@@ -57,7 +57,7 @@
 fi
 
 STORE_DIR=${TMP_DATA_DIR}/python
-BROKER_OPTS="--no-module-dir --load-module=${LIBSTORE} --data-dir=${STORE_DIR} --auth=no --log-enable info+ --log-to-file ${STORE_DIR}/broker.python-test.log"
+BROKER_OPTS="--no-module-dir --load-module=${STORE_LIB} --data-dir=${STORE_DIR} --auth=no --log-enable info+ --log-to-file ${STORE_DIR}/broker.python-test.log"
 AMQP_SPEC=0-10-errata
 
 #Make sure temp dir exists if this is the first to use it

Modified: store/trunk/cpp/tests/system_test.sh
===================================================================
--- store/trunk/cpp/tests/system_test.sh	2009-06-29 16:00:07 UTC (rev 3465)
+++ store/trunk/cpp/tests/system_test.sh	2009-07-01 16:06:19 UTC (rev 3466)
@@ -39,7 +39,7 @@
 fail=0
 
 # Run the tests with a given set of flags
-BROKER_OPTS="--no-module-dir --load-module=$LIBSTORE --data-dir=$TMP_DATA_DIR --auth=no --wcache-page-size 16"
+BROKER_OPTS="--no-module-dir --load-module=$STORE_LIB --data-dir=$TMP_DATA_DIR --auth=no --wcache-page-size 16"
 run_tests() {
     for p in `seq 1 8`; do
 	$abs_srcdir/start_broker "$@" ${BROKER_OPTS} || { echo "FAIL broker start";  return 1; }