diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2007-02-02 19:25:08 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2007-02-02 19:25:08 +0000 |
| commit | 21010e20bd7dc36cbf4a5024a8fd44e9471c49ff (patch) | |
| tree | 8c596d3366aa1f7da1c6232765464217f7752966 | |
| parent | bug 1741: test suite broken with PHP 5.1.6 (diff) | |
| download | ice-21010e20bd7dc36cbf4a5024a8fd44e9471c49ff.tar.bz2 ice-21010e20bd7dc36cbf4a5024a8fd44e9471c49ff.tar.xz ice-21010e20bd7dc36cbf4a5024a8fd44e9471c49ff.zip | |
Fix properties override
| -rw-r--r-- | java/config/IceGridAdmin.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/java/config/IceGridAdmin.py b/java/config/IceGridAdmin.py index 73a8b82bf90..75eeed57466 100644 --- a/java/config/IceGridAdmin.py +++ b/java/config/IceGridAdmin.py @@ -96,8 +96,13 @@ def startIceGridNode(testdir): else: cleanDbDir(dataDir) - overrideOptions = '"' + TestUtil.clientServerOptions.replace("--", "") + \ - ' Ice.ServerIdleTime=0 Ice.PrintProcessId=0 Ice.PrintAdapterReady=0"' + overrideOptions = '"' + for opt in TestUtil.clientServerOptions.split(): + opt = opt.replace("--", "") + if opt.find("=") == -1: + opt += "=1" + overrideOptions += opt + " " + overrideOptions += ' Ice.ServerIdleTime=0 Ice.PrintProcessId=0 Ice.PrintAdapterReady=0"' print "starting icegrid node...", command = iceGrid + TestUtil.cppClientServerOptions + ' --nowarn ' + nodeOptions + \ |