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/noRestartUpdate/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/noRestartUpdate/run.py')
| -rwxr-xr-x | cpp/test/IceGrid/noRestartUpdate/run.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cpp/test/IceGrid/noRestartUpdate/run.py b/cpp/test/IceGrid/noRestartUpdate/run.py index 8ebe5fddb3a..bf590fea5a2 100755 --- a/cpp/test/IceGrid/noRestartUpdate/run.py +++ b/cpp/test/IceGrid/noRestartUpdate/run.py @@ -34,9 +34,12 @@ if not os.path.exists(node2Dir): else: IceGridAdmin.cleanDbDir(node2Dir) -nodeOverrideOptions = '--IceBinDir="%s" --TestDir="%s" --NodePropertiesOverride="%s Ice.ServerIdleTime=0 Ice.PrintProcessId=0 Ice.PrintAdapterReady=0"' % ( + +TestUtil.addAdditionalBinDirectories([os.path.join(os.getcwd(), TestUtil.getTestDirectory("testservice"))]) + +nodeOverrideOptions = '--IceBinDir="%s" --ServerDir="%s" --NodePropertiesOverride="%s Ice.ServerIdleTime=0 Ice.PrintProcessId=0 Ice.PrintAdapterReady=0"' % ( TestUtil.getCppBinDir("cpp"), - os.getcwd(), + TestUtil.getTestDirectory("server"), TestUtil.getCommandLine("", TestUtil.DriverConfig("server")).replace("--", "")) IceGridAdmin.iceGridTest("", nodeOverrideOptions) |