summaryrefslogtreecommitdiff
path: root/py/test/Ice/blobject/run.py
diff options
context:
space:
mode:
Diffstat (limited to 'py/test/Ice/blobject/run.py')
-rwxr-xr-xpy/test/Ice/blobject/run.py12
1 files changed, 3 insertions, 9 deletions
diff --git a/py/test/Ice/blobject/run.py b/py/test/Ice/blobject/run.py
index c80260ad967..2265a40ca12 100755
--- a/py/test/Ice/blobject/run.py
+++ b/py/test/Ice/blobject/run.py
@@ -10,20 +10,14 @@
import os, sys
-# Skip the test if we're using python 2.3 and we're not on Mac.
-if sys.version_info[1] == 3 and sys.platform != 'darwin':
- print "Test skipped due to python 2.3"
- sys.exit(0)
-
path = [ ".", "..", "../..", "../../..", "../../../.." ]
head = os.path.dirname(sys.argv[0])
if len(head) > 0:
path = [os.path.join(head, p) for p in path]
path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ]
if len(path) == 0:
- raise "can't find toplevel directory!"
-sys.path.append(os.path.join(path[0]))
-from scripts import *
+ raise RuntimeError("can't find toplevel directory!")
+sys.path.append(os.path.join(path[0], "scripts"))
+import TestUtil
TestUtil.clientServerTest()
-