Author: aconway
Date: Fri Feb 17 14:17:06 2012
New Revision: 1245554
URL: http://svn.apache.org/viewvc?rev=1245554&view=rev
Log:
Revert "QPID-3603: Disable federation cluster tests on qpid-3603 branch."
This reverts commit f68ce76fcaadf52b93f58140173a1f48a371e007.
Modified:
qpid/branches/qpid-3603-7/qpid/cpp/src/tests/run_federation_sys_tests
Modified: qpid/branches/qpid-3603-7/qpid/cpp/src/tests/run_federation_sys_tests
URL:
http://svn.apache.org/viewvc/qpid/branches/qpid-3603-7/qpid/cpp/src/tests/run_federation_sys_tests?rev=1245554&r1=1245553&r2=1245554&view=diff
==============================================================================
--- qpid/branches/qpid-3603-7/qpid/cpp/src/tests/run_federation_sys_tests
(original)
+++ qpid/branches/qpid-3603-7/qpid/cpp/src/tests/run_federation_sys_tests Fri
Feb 17 14:17:06 2012
@@ -25,16 +25,13 @@ source ./test_env.sh
MODULENAME=federation_sys
-# FIXME aconway 2011-12-15: Disable cluster-related tests on the qpid-3603
-# branch. See comment in cluster.mk for more details.
-#
-# # Test for clustering
-# ps -u root | grep 'aisexec\|corosync' > /dev/null
-# if (( $? == 0 )); then
-# CLUSTERING_ENABLED=1
-# else
-# echo "WARNING: No clustering detected; tests using it will be ignored."
-# fi
+# Test for clustering
+ps -u root | grep 'aisexec\|corosync' > /dev/null
+if (( $? == 0 )); then
+ CLUSTERING_ENABLED=1
+else
+ echo "WARNING: No clustering detected; tests using it will be ignored."
+fi
# Test for long test
if [[ "$1" == "LONG_TEST" ]]; then
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
