svn commit: r779262 - in /qpid/trunk/qpid/cpp/src/tests: run_cluster_tests testlib.py

[kp...@apache.org]

Author: kpvdr
Date: Wed May 27 18:09:02 2009
New Revision: 779262

URL: http://svn.apache.org/viewvc?rev=779262&view=rev
Log:
Fix from gsim for python path; also changed name of QPID_CONFIG environment variable which clashes with previous definition and made others more consistent in naming.

Modified:
    qpid/trunk/qpid/cpp/src/tests/run_cluster_tests
    qpid/trunk/qpid/cpp/src/tests/testlib.py

Modified: qpid/trunk/qpid/cpp/src/tests/run_cluster_tests
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/run_cluster_tests?rev=779262&r1=779261&r2=779262&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/run_cluster_tests (original)
+++ qpid/trunk/qpid/cpp/src/tests/run_cluster_tests Wed May 27 18:09:02 2009
@@ -43,12 +43,14 @@
 	exit 0
 fi
 
-export PYTHONPATH=$srcdir
+export PYTHONPATH=$srcdir:$srcdir/../../../python
 export RUN_CLUSTER_TESTS=1
-export QPIDD=$srcdir/../qpidd
-export LIBCLUSTER=$srcdir/../.libs/cluster.so
-export RECEIVER=$srcdir/receiver
-export SENDER=$srcdir/sender
+export QPIDD_EXEC=$srcdir/../qpidd
+export CLUSTER_LIB=$srcdir/../.libs/cluster.so
+export QPID_CONFIG_EXEC=$srcdir/../../../python/commands/qpid-config
+export QPID_ROUTE_EXEC=$srcdir/../../../python/commands/qpid-config
+export RECEIVER_EXEC=$srcdir/receiver
+export SENDER_EXEC=$srcdir/sender
 
 #Make sure temp dir exists if this is the first to use it
 TMP_STORE_DIR=${TEST_DIR}/test_tmp

Modified: qpid/trunk/qpid/cpp/src/tests/testlib.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/testlib.py?rev=779262&r1=779261&r2=779262&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/testlib.py (original)
+++ qpid/trunk/qpid/cpp/src/tests/testlib.py Wed May 27 18:09:02 2009
@@ -33,8 +33,8 @@
     executables/libs are to be found.
     """
     _storeEnable = os.getenv("STORE_ENABLE") != None # Must be True for durability to be enabled during the test
-    _storeLib = os.getenv("LIBSTORE")
-    _qpiddExec = os.getenv("QPIDD", "/usr/sbin/qpidd")
+    _storeLib = os.getenv("STORE_LIB")
+    _qpiddExec = os.getenv("QPIDD_EXEC", "/usr/sbin/qpidd")
     _tempStoreDir = os.path.abspath(os.getenv("TMP_STORE_DIR", "/tmp/qpid"))
     
     """Global message counter ensures unique messages"""
@@ -139,11 +139,11 @@
     executables/libs are to be found.
     """
     _runClusterTests = os.getenv("RUN_CLUSTER_TESTS") != None # Must be True for these cluster tests to run
-    _clusterLib = os.getenv("LIBCLUSTER")
-    _qpidConfigExec = os.getenv("QPID_CONFIG", "/usr/bin/qpid-config")
-    _qpidRouteExec = os.getenv("QPID_ROUTE", "/usr/bin/qpid-route")
-    _receiverExec = os.getenv("RECEIVER", "/usr/libexec/qpid/test/receiver")
-    _senderExec = os.getenv("SENDER", "/usr/libexec/qpid/test/sender")
+    _clusterLib = os.getenv("CLUSTER_LIB")
+    _qpidConfigExec = os.getenv("QPID_CONFIG_EXEC", "/usr/bin/qpid-config")
+    _qpidRouteExec = os.getenv("QPID_ROUTE_EXEC", "/usr/bin/qpid-route")
+    _receiverExec = os.getenv("RECEIVER_EXEC", "/usr/libexec/qpid/test/receiver")
+    _senderExec = os.getenv("SENDER_EXEC", "/usr/libexec/qpid/test/sender")
     
     
     """
@@ -486,3 +486,4 @@
         rxMsgs = self.receiveMsgs(nodeNumber, clusterName, queueName, numMsgs, wait)
         if txMsgs != rxMsgs:
             self.fail("Send - receive message mismatch")
+            
\ No newline at end of file



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org