diff options
| author | Kim van der Riet <kpvdr@apache.org> | 2009-05-27 18:09:02 +0000 |
|---|---|---|
| committer | Kim van der Riet <kpvdr@apache.org> | 2009-05-27 18:09:02 +0000 |
| commit | 0a6cb55f7a9365e880587f87befabb996262f8d2 (patch) | |
| tree | 4335a23128295af582c928bd41da1ca63c6e307d /cpp/src/tests | |
| parent | fcb9f8b0bd5bc48e101c02d4831eed8277e4ba35 (diff) | |
| download | qpid-python-0a6cb55f7a9365e880587f87befabb996262f8d2.tar.gz | |
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.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@779262 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/tests')
| -rwxr-xr-x | cpp/src/tests/run_cluster_tests | 12 | ||||
| -rw-r--r-- | cpp/src/tests/testlib.py | 15 |
2 files changed, 15 insertions, 12 deletions
diff --git a/cpp/src/tests/run_cluster_tests b/cpp/src/tests/run_cluster_tests index f3fd3f2883..dca2f89899 100755 --- a/cpp/src/tests/run_cluster_tests +++ b/cpp/src/tests/run_cluster_tests @@ -43,12 +43,14 @@ EOF 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 diff --git a/cpp/src/tests/testlib.py b/cpp/src/tests/testlib.py index 89967c2d44..1c1d1bf407 100644 --- a/cpp/src/tests/testlib.py +++ b/cpp/src/tests/testlib.py @@ -33,8 +33,8 @@ class TestBase(unittest.TestCase): 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 @@ class TestBaseCluster(TestBase): 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 @@ class TestBaseCluster(TestBase): rxMsgs = self.receiveMsgs(nodeNumber, clusterName, queueName, numMsgs, wait) if txMsgs != rxMsgs: self.fail("Send - receive message mismatch") +
\ No newline at end of file |