summaryrefslogtreecommitdiff
path: root/scripts/IceGridAdmin.py
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2015-12-17 11:45:27 -0800
committerMark Spruiell <mes@zeroc.com>2015-12-17 11:45:27 -0800
commit884e2be89b0cd997f372c59f05bf05a9a5372b60 (patch)
tree53d2123abf22042f827d0e83b6093cea038c3b3a /scripts/IceGridAdmin.py
parentMerge branch '3.6' (diff)
downloadice-884e2be89b0cd997f372c59f05bf05a9a5372b60.tar.bz2
ice-884e2be89b0cd997f372c59f05bf05a9a5372b60.tar.xz
ice-884e2be89b0cd997f372c59f05bf05a9a5372b60.zip
Fixes for Bluetooth plug-ins.
Updates to testsuite to support Bluetooth and remote servers.
Diffstat (limited to 'scripts/IceGridAdmin.py')
-rw-r--r--scripts/IceGridAdmin.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/IceGridAdmin.py b/scripts/IceGridAdmin.py
index 3f65308929e..ba7fbb634bc 100644
--- a/scripts/IceGridAdmin.py
+++ b/scripts/IceGridAdmin.py
@@ -140,7 +140,7 @@ def iceGridNodePropertiesOverride():
# Create property overrides from command line options.
#
overrideOptions = ''
- for opt in shlex.split(TestUtil.getCommandLineProperties("", TestUtil.DriverConfig("server"))):
+ for opt in shlex.split(TestUtil.getCommandLineProperties("", TestUtil.DriverConfig("server"), "")):
opt = opt.strip().replace("--", "")
index = opt.find("=")
if index == -1: