5 files changed, 13 insertions, 90 deletions
diff --git a/cpp/test/IceSSL/Makefile b/cpp/test/IceSSL/Makefile
deleted file mode 100644
index 94e3a98a5ec..00000000000
--- a/cpp/test/IceSSL/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ../..
-
-include $(top_srcdir)/config/Make.rules
-
-SUBDIRS		= configuration
-
-.PHONY: $(EVERYTHING) $(SUBDIRS)
-
-all:: $(SUBDIRS)
-
-$(SUBDIRS):
-	@echo "making all in $@"
-	@$(MAKE) all --directory=$@
-
-$(EVERYTHING_EXCEPT_ALL)::
-	@for subdir in $(SUBDIRS); \
-	do \
-	    echo "making $@ in $$subdir"; \
-	    ( cd $$subdir && $(MAKE) $@ ) || exit 1; \
-	done
diff --git a/cpp/test/IceSSL/configuration/.gitignore b/cpp/test/IceSSL/configuration/.gitignore
deleted file mode 100644
index 3a3aae35bd8..00000000000
--- a/cpp/test/IceSSL/configuration/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-// Generated by makegitignore.py
-
-// IMPORTANT: Do not edit this file -- any edits made here will be lost!
-.depend
-client
-server
-.depend
-Test.cpp
-Test.h
diff --git a/cpp/test/IceSSL/configuration/AllTests.cpp b/cpp/test/IceSSL/configuration/AllTests.cpp
index 741e392914c..3fc92e581f1 100644
--- a/cpp/test/IceSSL/configuration/AllTests.cpp
+++ b/cpp/test/IceSSL/configuration/AllTests.cpp
@@ -3252,8 +3252,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12, b
         }
         catch(const Ice::LocalException& ex)
         {
-            cerr << ex << endl;
-            test(false);
+            cerr << "warning: unable to connect to demo.zeroc.com to check system CA:\n" << ex << endl;
         }
         comm->destroy();
     }
diff --git a/cpp/test/IceSSL/configuration/Makefile b/cpp/test/IceSSL/configuration/Makefile
deleted file mode 100644
index 1c5d24f1cdf..00000000000
--- a/cpp/test/IceSSL/configuration/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ../../..
-
-CLIENT		= $(call mktestname,client)
-SERVER		= $(call mktestname,server)
-
-TARGETS		= $(CLIENT) $(SERVER)
-
-SLICE_OBJS	= Test.o
-
-COBJS		= $(SLICE_OBJS) \
-		  Client.o \
-		  AllTests.o
-
-SOBJS		= $(SLICE_OBJS) \
-		  TestI.o \
-		  Server.o
-
-OBJS		= $(COBJS) \
-		  $(SOBJS)
-
-GENPIC          = no
-
-include $(top_srcdir)/config/Make.rules
-
-CPPFLAGS	:= -I. -I../../include $(CPPFLAGS) 
-
-ifeq ($(UNAME),Darwin)
-LINK_WITH = -framework Security -framework CoreFoundation
-endif
-
-ifeq ($(UNAME),MINGW)
-LINK_WITH = $(SSL_OS_LIBS)
-endif
-
-$(CLIENT): $(COBJS)
-	rm -f $@
-	$(call mktest,$@,$(COBJS),$(ICESSL_LIBS) $(LINK_WITH) $(LIBS))
-
-$(SERVER): $(SOBJS)
-	rm -f $@
-	$(call mktest,$@,$(SOBJS),$(ICESSL_LIBS) $(LINK_WITH) $(LIBS))
diff --git a/cpp/test/IceSSL/configuration/Makefile.mk b/cpp/test/IceSSL/configuration/Makefile.mk
new file mode 100644
index 00000000000..b0c9b1f2ab1
--- /dev/null
+++ b/cpp/test/IceSSL/configuration/Makefile.mk
@@ -0,0 +1,12 @@
+# **********************************************************************
+#
+# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+$(test)_dependencies = IceSSL Ice IceUtil TestCommon
+
+tests += $(test)