Merge remote-tracking branch 'origin/3.6'

1 files changed, 0 insertions, 48 deletions

diff --git a/cpp/test/Ice/acm/Client.cpp b/cpp/test/Ice/acm/Client.cpp
deleted file mode 100644
index 4a0ad4acf99..00000000000
--- a/cpp/test/Ice/acm/Client.cpp
+++ /dev/null
@@ -1,48 +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.
-//
-// **********************************************************************
-
-#include <Ice/Ice.h>
-#include <TestCommon.h>
-#include <Test.h>
-
-DEFINE_TEST("client")
-
-using namespace std;
-
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
-{
-    void allTests(const Ice::CommunicatorPtr&);
-    allTests(communicator);
-    return EXIT_SUCCESS;
-}
-
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL();
-#   if defined(__linux)
-    Ice::registerIceBT();
-#   endif
-#endif
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        initData.properties->setProperty("Ice.Warn.Connections", "0");
-
-        Ice::CommunicatorHolder ich = Ice::initialize(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return EXIT_FAILURE;
-    }
-}