[rhmessaging-commits] rhmessaging commits: r3722 - store/trunk/cpp/tests/cluster.

[rhmessaging-commits at lists.jboss.org]

Author: aconway
Date: 2009-11-24 17:00:48 -0500 (Tue, 24 Nov 2009)
New Revision: 3722

Modified:
   store/trunk/cpp/tests/cluster/run_cluster_test
   store/trunk/cpp/tests/cluster/run_cluster_tests
Log:
Update for changes to cluster_tests.py in qpid.


Modified: store/trunk/cpp/tests/cluster/run_cluster_test
===================================================================
--- store/trunk/cpp/tests/cluster/run_cluster_test	2009-11-24 16:55:58 UTC (rev 3721)
+++ store/trunk/cpp/tests/cluster/run_cluster_test	2009-11-24 22:00:48 UTC (rev 3722)
@@ -22,16 +22,4 @@
 # The GNU Lesser General Public License is available in the file COPYING.
 
 . `dirname $0`/cluster_tests_env.sh
-
-
-
-# Run the C++ cluster tests (which are by definition short tests)
-if test ! ${LONG_TEST} ; then
-	echo "Running C++ cluster tests..."
-	sg ais -c "${CPP_CLUSTER_EXEC}"
-	RETCODE=$?
-	if test x${RETCODE} != x0; then 
-		exit 1;
-	fi
-fi
-exit 0
+sg ais -c "${CPP_CLUSTER_EXEC}"

Modified: store/trunk/cpp/tests/cluster/run_cluster_tests
===================================================================
--- store/trunk/cpp/tests/cluster/run_cluster_tests	2009-11-24 16:55:58 UTC (rev 3721)
+++ store/trunk/cpp/tests/cluster/run_cluster_tests	2009-11-24 22:00:48 UTC (rev 3722)
@@ -23,14 +23,13 @@
 
 . `dirname $0`/cluster_tests_env.sh
 
-
 func_check_qpid_python || exit 0           # A warning, not a failure.
 
 echo "Running Python cluster tests..."
 OUTDIR=brokertest.tmp
 rm -rf $OUTDIR
 # Ignore tests requiring a store by default. 
-CLUSTER_TESTS_IGNORE=${CLUSTER_TESTS_IGNORE:-I ${CLUSTER_TESTS_FAIL}}
+CLUSTER_TESTS_IGNORE=${CLUSTER_TESTS_IGNORE:-"-I ${CLUSTER_TESTS_FAIL}"}
 CLUSTER_TESTS=${CLUSTER_TESTS:-$*}
 
 sg ais -c "${PYTHON_DIR}/qpid-python-test -m cluster_tests ${CLUSTER_TESTS_IGNORE} ${CLUSTER_TESTS} -DOUTDIR=$OUTDIR"