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/update/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/update/run.py')
| -rwxr-xr-x | cpp/test/IceGrid/update/run.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cpp/test/IceGrid/update/run.py b/cpp/test/IceGrid/update/run.py index 959c5e0741d..393ed116f15 100755 --- a/cpp/test/IceGrid/update/run.py +++ b/cpp/test/IceGrid/update/run.py @@ -34,7 +34,11 @@ if not os.path.exists(node2Dir): else: IceGridAdmin.cleanDbDir(node2Dir) -nodeOverrideOptions = '--IceBinDir="%s" --TestDir="%s" ' % (TestUtil.getCppBinDir(), os.getcwd()) + \ +bindir = TestUtil.getCppBinDir() +testdir = os.getcwd() +serverdir = os.path.join(os.getcwd(), TestUtil.getTestDirectory("server")) + +nodeOverrideOptions = '--IceBinDir="%s" --TestDir="%s" --ServerDir="%s" ' % (bindir, testdir, serverdir) + \ '--NodePropertiesOverride=\"%s Ice.ServerIdleTime=0 Ice.PrintProcessId=0 Ice.PrintAdapterReady=0\"' % \ IceGridAdmin.iceGridNodePropertiesOverride() |