summaryrefslogtreecommitdiff
path: root/cpp/test/IceGrid/distribution/run.py
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/test/IceGrid/distribution/run.py')
-rwxr-xr-xcpp/test/IceGrid/distribution/run.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/cpp/test/IceGrid/distribution/run.py b/cpp/test/IceGrid/distribution/run.py
index 8c9f3bcab43..bf345146953 100755
--- a/cpp/test/IceGrid/distribution/run.py
+++ b/cpp/test/IceGrid/distribution/run.py
@@ -16,9 +16,9 @@ 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, IceGridAdmin
def icepatch2Calc(datadir, dirname):
icePatch2Calc = ""
@@ -43,7 +43,8 @@ files = [
]
-print "creating IcePatch2 data directory...",
+sys.stdout.write("creating IcePatch2 data directory... ")
+sys.stdout.flush()
if not os.path.exists(datadir):
os.mkdir(datadir)
else:
@@ -59,7 +60,7 @@ for [file, content] in files:
icepatch2Calc(datadir, "original")
icepatch2Calc(datadir, "updated")
-print "ok"
+print("ok")
IceGridAdmin.iceGridTest("application.xml")