diff options
| -rw-r--r-- | cppe/config/Make.rules | 27 | ||||
| -rw-r--r-- | cppe/config/Make.rules.HP-UX | 4 | ||||
| -rw-r--r-- | cppe/config/TestUtil.py | 36 |
3 files changed, 3 insertions, 64 deletions
diff --git a/cppe/config/Make.rules b/cppe/config/Make.rules index 0283567593d..b841d5abef5 100644 --- a/cppe/config/Make.rules +++ b/cppe/config/Make.rules @@ -94,21 +94,6 @@ endif #DB_HOME ?= /opt/db # -# If OpenSSL is not installed in a standard location where the -# compiler can find it, set OPENSSL_HOME to the OpenSSL installation -# directory. -# - -#OPENSSL_HOME ?= /opt/openssl - -# -# Define if your OpenSSL requires Kerberos, and if Kerberos is not -# installed in a standard location. -# - -KERBEROS_HOME ?= /usr/kerberos - -# # If expat is not installed in a standard location where the # compiler can find it, set EXPAT_HOME to the expat # installation directory. @@ -182,18 +167,6 @@ else STLPORT_LIBS = endif -ifneq ($(OPENSSL_HOME),) - OPENSSL_FLAGS = -I$(OPENSSL_HOME)/include - OPENSSL_LIBS = -L$(OPENSSL_HOME)/$(libsubdir) -lssl -lcrypto -else - OPENSSL_FLAGS = - OPENSSL_LIBS = -lssl -lcrypto -endif - -ifneq ($(KERBEROS_HOME),) - OPENSSL_FLAGS += -I$(KERBEROS_HOME)/include -endif - ifneq ($(BZIP2_HOME),) BZIP2_FLAGS = -I$(BZIP2_HOME)/include BZIP2_LIBS = -L$(BZIP2_HOME)/$(libsubdir) -lbz2 diff --git a/cppe/config/Make.rules.HP-UX b/cppe/config/Make.rules.HP-UX index 5aa82461fdf..cee9de84bed 100644 --- a/cppe/config/Make.rules.HP-UX +++ b/cppe/config/Make.rules.HP-UX @@ -52,10 +52,6 @@ CXXLIBS = -lCsup_v2 -lstd_v2 LIBPATH = -ifneq ($(OPENSSL_HOME),) - LIBPATH += -L$(OPENSSL_HOME)/$(libsubdir) -endif - ifneq ($(BZIP2_HOME),) LIBPATH += -L$(BZIP2_HOME)/$(libsubdir) endif diff --git a/cppe/config/TestUtil.py b/cppe/config/TestUtil.py index 18240277126..ba3f1b67be7 100644 --- a/cppe/config/TestUtil.py +++ b/cppe/config/TestUtil.py @@ -9,14 +9,6 @@ # ********************************************************************** # -# Set protocol to "ssl" in case you want to run the tests with the SSL -# protocol. Otherwise TCP is used. -# - -protocol = "" -#protocol = "ssl" - -# # Set compressed to 1 in case you want to run the tests with # protocol compression. # @@ -25,14 +17,6 @@ protocol = "" compress = 1 # -# Set threadPerConnection to 1 in case you want to run the tests in -# thread per connection mode. -# - -#threadPerConnection = 0 -threadPerConnection = 1 - -# # If you don't set "host" below, then the Ice library will try to find # out the IP address of this host. For the Ice test suite, it's best # to set the IP address explicitly to 127.0.0.1. This avoid problems @@ -204,23 +188,9 @@ else: os.environ["LD_LIBRARY_PATH"] = os.path.join(toplevel, "lib") + ":" + os.getenv("LD_LIBRARY_PATH", "") os.environ["LD_LIBRARY_PATH_64"] = os.path.join(toplevel, "lib") + ":" + os.getenv("LD_LIBRARY_PATH_64", "") -if protocol == "ssl": - plugin = " --Ice.Plugin.IceSSL=IceSSL:create" - clientProtocol = plugin + " --Ice.Default.Protocol=ssl" + \ - " --IceSSL.Client.CertPath=" + os.path.join(toplevel, "certs") + \ - " --IceSSL.Client.Config=client_sslconfig.xml" - serverProtocol = plugin + " --Ice.Default.Protocol=ssl" + \ - " --IceSSL.Server.CertPath=" + os.path.join(toplevel, "certs") + \ - " --IceSSL.Server.Config=server_sslconfig.xml" - clientServerProtocol = plugin + " --Ice.Default.Protocol=ssl" + \ - " --IceSSL.Client.CertPath=" + os.path.join(toplevel, "certs") + \ - " --IceSSL.Client.Config=sslconfig.xml" + \ - " --IceSSL.Server.CertPath=" + os.path.join(toplevel, "certs") + \ - " --IceSSL.Server.Config=sslconfig.xml" -else: - clientProtocol = "" - serverProtocol = "" - clientServerProtocol = "" +clientProtocol = "" +serverProtocol = "" +clientServerProtocol = "" if compress: clientProtocol += " --Ice.Override.Compress" |