diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2009-12-18 21:13:09 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2009-12-18 21:13:09 +0100 |
| commit | aa6809bd9431b5cc3952d6a6e2abde76b2bf003c (patch) | |
| tree | 0da37ff519b9a3b6effbd1583b61abbf6f132c2a /cpp/test/IceGrid/update/run.py | |
| parent | http://bugzilla/bugzilla/show_bug.cgi?id=4509 - parallel build issues. (diff) | |
| download | ice-aa6809bd9431b5cc3952d6a6e2abde76b2bf003c.tar.bz2 ice-aa6809bd9431b5cc3952d6a6e2abde76b2bf003c.tar.xz ice-aa6809bd9431b5cc3952d6a6e2abde76b2bf003c.zip | |
Fixed bug 4511 - properties override doesn't handle quotes
Diffstat (limited to 'cpp/test/IceGrid/update/run.py')
| -rwxr-xr-x | cpp/test/IceGrid/update/run.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/cpp/test/IceGrid/update/run.py b/cpp/test/IceGrid/update/run.py index 3a721ebb429..740a7c841d4 100755 --- a/cpp/test/IceGrid/update/run.py +++ b/cpp/test/IceGrid/update/run.py @@ -34,10 +34,9 @@ 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.getCppBinDir(), - os.getcwd(), - TestUtil.getCommandLine("", TestUtil.DriverConfig("server")).replace("--", "")) +nodeOverrideOptions = '--IceBinDir="%s" --TestDir="%s" ' % (TestUtil.getCppBinDir(), os.getcwd()) + \ + '--NodePropertiesOverride=\"%s Ice.ServerIdleTime=0 Ice.PrintProcessId=0 Ice.PrintAdapterReady=0\"' % \ + IceGridAdmin.iceGridNodePropertiesOverride() IceGridAdmin.iceGridTest("", nodeOverrideOptions) |