diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-11-26 18:08:44 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-11-26 18:08:44 +0100 |
| commit | 16adb126db30db3e9fbebf8534aff6d891da7940 (patch) | |
| tree | f51683f5428c29e9707ad1b455664d72aed7e5e2 /scripts/IceGridAdmin.py | |
| parent | Don't generate policy files in patch release (diff) | |
| download | ice-16adb126db30db3e9fbebf8534aff6d891da7940.tar.bz2 ice-16adb126db30db3e9fbebf8534aff6d891da7940.tar.xz ice-16adb126db30db3e9fbebf8534aff6d891da7940.zip | |
Fixed ICE-4980: IceGrid/simple test failure on Windows 7
Diffstat (limited to 'scripts/IceGridAdmin.py')
| -rw-r--r-- | scripts/IceGridAdmin.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/IceGridAdmin.py b/scripts/IceGridAdmin.py index 84e2f416c73..27b504d484f 100644 --- a/scripts/IceGridAdmin.py +++ b/scripts/IceGridAdmin.py @@ -28,7 +28,7 @@ nodeOptions = r' --Ice.Warn.Connections=0' + \ r' --IceGrid.Node.Trace.Adapter=0' + \ r' --IceGrid.Node.Trace.Server=0' + \ r' --IceGrid.Node.ThreadPool.SizeWarn=0' + \ - r' --IceGrid.Node.PrintServersReady=node' + \ + r' --IceGrid.Node.PrintServersReady=node1' + \ r' --Ice.NullHandleAbort' + \ r' --Ice.ThreadPool.Server.Size=0' + \ r' --Ice.ServerIdleTime=0' @@ -179,7 +179,7 @@ def startIceGridNode(testdir): driverConfig = TestUtil.DriverConfig("server") driverConfig.lang = "cpp" - proc = TestUtil.startServer(iceGrid, command, driverConfig, adapter='node') + proc = TestUtil.startServer(iceGrid, command, driverConfig, adapter='node1') print("ok") |