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

[rhmessaging-commits at lists.jboss.org]

Author: aconway
Date: 2009-11-19 12:49:57 -0500 (Thu, 19 Nov 2009)
New Revision: 3718

Modified:
   store/trunk/cpp/lib/MessageStoreImpl.cpp
   store/trunk/cpp/lib/MessageStoreImpl.h
   store/trunk/cpp/tests/cluster/cluster_tests_env.sh
   store/trunk/cpp/tests/cluster/run_cluster_tests
Log:
Added getStoreDir() to MessageStore

Modified: store/trunk/cpp/lib/MessageStoreImpl.cpp
===================================================================
--- store/trunk/cpp/lib/MessageStoreImpl.cpp	2009-11-18 19:49:32 UTC (rev 3717)
+++ store/trunk/cpp/lib/MessageStoreImpl.cpp	2009-11-19 17:49:57 UTC (rev 3718)
@@ -1869,6 +1869,8 @@
     return dir.str();
 }
 
+std::string MessageStoreImpl::getStoreDir() const { return storeDir; }
+
 MessageStoreImpl::StoreOptions::StoreOptions(const std::string& name) :
                                              qpid::Options(name),
                                              numJrnlFiles(defNumJrnlFiles),

Modified: store/trunk/cpp/lib/MessageStoreImpl.h
===================================================================
--- store/trunk/cpp/lib/MessageStoreImpl.h	2009-11-18 19:49:32 UTC (rev 3717)
+++ store/trunk/cpp/lib/MessageStoreImpl.h	2009-11-19 17:49:57 UTC (rev 3718)
@@ -381,6 +381,8 @@
 
     inline qpid::management::Manageable::status_t ManagementMethod (u_int32_t, qpid::management::Args&)
         { return qpid::management::Manageable::STATUS_OK; }
+
+    std::string getStoreDir() const;
 }; // class MessageStoreImpl
 
 } // namespace msgstore

Modified: store/trunk/cpp/tests/cluster/cluster_tests_env.sh
===================================================================
--- store/trunk/cpp/tests/cluster/cluster_tests_env.sh	2009-11-18 19:49:32 UTC (rev 3717)
+++ store/trunk/cpp/tests/cluster/cluster_tests_env.sh	2009-11-19 17:49:57 UTC (rev 3718)
@@ -133,6 +133,7 @@
 	    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"
 
@@ -153,8 +154,8 @@
 	    func_checkpaths QPID_BIN_DIR QPID_SBIN_DIR QPID_LIB_DIR QPID_LIBEXEC_DIR
 	
 	    # 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 PYTHON_DIR="${QPID_BIN_DIR}"
+	    export PYTHONPATH="${PYTHONPATH}":"${QPID_LIB_DIR}/python":"${QPID_LIBEXEC_DIR}/qpid/tests":"${QPID_LIB_DIR}/python2.4"
 
 	
 	    # Libraries

Modified: store/trunk/cpp/tests/cluster/run_cluster_tests
===================================================================
--- store/trunk/cpp/tests/cluster/run_cluster_tests	2009-11-18 19:49:32 UTC (rev 3717)
+++ store/trunk/cpp/tests/cluster/run_cluster_tests	2009-11-19 17:49:57 UTC (rev 3718)
@@ -29,10 +29,11 @@
 echo "Running Python cluster tests..."
 OUTDIR=brokertest.tmp
 rm -rf $OUTDIR
-CLUSTER_TEST="${PYTHON_DIR}/qpid-python-test -m cluster_tests -I ${CLUSTER_TESTS_FAIL} -DOUTDIR=$OUTDIR"
+# Ignore tests requiring a store by default. 
+CLUSTER_TESTS_IGNORE=${CLUSTER_TESTS_IGNORE:-I ${CLUSTER_TESTS_FAIL}}
+CLUSTER_TESTS=${CLUSTER_TESTS:-$*}
 
-
-sg ais -c "${CLUSTER_TEST}"
+sg ais -c "${PYTHON_DIR}/qpid-python-test -m cluster_tests ${CLUSTER_TESTS_IGNORE} ${CLUSTER_TESTS} -DOUTDIR=$OUTDIR"
 RETCODE=$?
 
 if test x${RETCODE} != x0; then