diff options
| author | Jose <jose@zeroc.com> | 2016-02-26 20:46:27 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-02-26 20:46:27 +0100 |
| commit | 62cba8cd46a535585a4422daab489f114feab6f3 (patch) | |
| tree | c77e9cec24a570b06024a3c6a1552b8e6eb20ec6 /cpp/test/IceGrid/distribution/run.py | |
| parent | updating changelog for ICE-6844 (diff) | |
| download | ice-62cba8cd46a535585a4422daab489f114feab6f3.tar.bz2 ice-62cba8cd46a535585a4422daab489f114feab6f3.tar.xz ice-62cba8cd46a535585a4422daab489f114feab6f3.zip | |
Windows msbuild build updates
Diffstat (limited to 'cpp/test/IceGrid/distribution/run.py')
| -rwxr-xr-x | cpp/test/IceGrid/distribution/run.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/cpp/test/IceGrid/distribution/run.py b/cpp/test/IceGrid/distribution/run.py index b695a27a3e7..adcc746bc42 100755 --- a/cpp/test/IceGrid/distribution/run.py +++ b/cpp/test/IceGrid/distribution/run.py @@ -26,8 +26,8 @@ def icepatch2Calc(datadir, dirname): commandProc.waitTestSuccess() datadir = os.path.join(os.getcwd(), "data") - -files = [ + +files = [ [ "original/rootfile", "rootfile" ], [ "original/dir1/file1", "dummy-file1"], [ "original/dir1/file2", "dummy-file2"], @@ -50,7 +50,7 @@ for [file, content] in files: file = os.path.join(datadir, file) if not os.path.exists(os.path.dirname(file)): os.makedirs(os.path.dirname(file)) - f = open(file, 'w') + f = open(file, 'w') f.write(content) f.close() @@ -58,8 +58,7 @@ icepatch2Calc(datadir, "original") icepatch2Calc(datadir, "updated") print("ok") -IceGridAdmin.iceGridTest("application.xml") +IceGridAdmin.iceGridTest("application.xml", "", "server.dir='%s'" % TestUtil.getTestDirectory("server")) IceGridAdmin.cleanDbDir(datadir) os.rmdir(datadir) - |