summaryrefslogtreecommitdiff
path: root/java/config/TestUtil.py
diff options
context:
space:
mode:
authorMarc Laukien <marc@zeroc.com>2002-11-07 23:13:26 +0000
committerMarc Laukien <marc@zeroc.com>2002-11-07 23:13:26 +0000
commit7fc52613fc865adfae2c256b315c1b1babe983f1 (patch)
treea383cbffc73bd9c5a2bcbef9e13daffd7523edc6 /java/config/TestUtil.py
parentfixes (diff)
downloadice-7fc52613fc865adfae2c256b315c1b1babe983f1.tar.bz2
ice-7fc52613fc865adfae2c256b315c1b1babe983f1.tar.xz
ice-7fc52613fc865adfae2c256b315c1b1babe983f1.zip
fix
Diffstat (limited to 'java/config/TestUtil.py')
-rw-r--r--java/config/TestUtil.py30
1 files changed, 17 insertions, 13 deletions
diff --git a/java/config/TestUtil.py b/java/config/TestUtil.py
index 12c9631ad5a..df8d346c073 100644
--- a/java/config/TestUtil.py
+++ b/java/config/TestUtil.py
@@ -24,25 +24,29 @@ import sys, os
protocol = ""
#
-# Set the host to the host name the test servers are running on. If not
-# set, the local host is used.
+# Set the host to the host name the test servers are running on. If
+# not set, Ice will try to find out the IP address for the
+# hostname. If you DNS isn't set up propertly, you should therefore
+# use "localhost".
#
#host = "someotherhost"
-host = ""
+host = "localhost"
#
# Don't change anything below this line!
#
if protocol == "ssl":
- clientProtocol = " --Ice.Default.Protocol=ssl" + \
- " --IceSSL.Client.CertPath=TOPLEVELDIR/certs --IceSSL.Client.Config=client_sslconfig.xml"
- serverProtocol = " --Ice.Default.Protocol=ssl" + \
- " --IceSSL.Server.CertPath=TOPLEVELDIR/certs --IceSSL.Server.Config=server_sslconfig.xml"
- clientServerProtocol = " --Ice.Default.Protocol=ssl" + \
- " --IceSSL.Client.CertPath=TOPLEVELDIR/certs --IceSSL.Client.Config=sslconfig.xml" + \
- " --IceSSL.Server.CertPath=TOPLEVELDIR/certs --IceSSL.Server.Config=sslconfig.xml"
+ print "No SSL available for Ice for Java."
+ sys.exit(1)
+# clientProtocol = " --Ice.Default.Protocol=ssl" + \
+# " --IceSSL.Client.CertPath=TOPLEVELDIR/certs --IceSSL.Client.Config=client_sslconfig.xml"
+# serverProtocol = " --Ice.Default.Protocol=ssl" + \
+# " --IceSSL.Server.CertPath=TOPLEVELDIR/certs --IceSSL.Server.Config=server_sslconfig.xml"
+# clientServerProtocol = " --Ice.Default.Protocol=ssl" + \
+# " --IceSSL.Client.CertPath=TOPLEVELDIR/certs --IceSSL.Client.Config=sslconfig.xml" + \
+# " --IceSSL.Server.CertPath=TOPLEVELDIR/certs --IceSSL.Server.Config=sslconfig.xml"
else:
clientProtocol = ""
serverProtocol = ""
@@ -65,10 +69,10 @@ else:
commonServerOptions = " --Ice.PrintAdapterReady --Ice.ServerThreadPool.Size=3" + \
" --Ice.ConnectionWarnings --Ice.ServerIdleTime=30"
-serverOptions = commonServerOptions + serverProtocol
clientOptions = clientProtocol + defaultHost
-clientServerOptions = commonServerOptions + clientServerProtocol + defaultHost
-collocatedOptions = clientServerProtocol
+serverOptions = serverProtocol + defaultHost + commonServerOptions
+clientServerOptions = clientServerProtocol + defaultHost + commonServerOptions
+collocatedOptions = clientServerProtocol + defaultHost
def isCygwin():