Merge branch 'bjorn/remove-test_server/OTP-12705'

* bjorn/remove-test_server/OTP-12705:
  Remove test_server as a standalone application
  Erlang mode for Emacs: Include ct.hrl instead test_server.hrl
  Remove out-commented references to the test_server applications
  Makefiles: Remove test_server from include path and code path
  Eliminate use of test_server.hrl and test_server_line.hrl

1 files changed, 39 insertions, 0 deletions

diff --git a/lib/common_test/src/test_server.app.src b/lib/common_test/src/test_server.app.src
new file mode 100644
index 0000000000..334be8109d
--- /dev/null
+++ b/lib/common_test/src/test_server.app.src
@@ -0,0 +1,39 @@
+% This is an -*- erlang -*- file.
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2009-2013. All Rights Reserved.
+%% 
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%% 
+%% %CopyrightEnd%
+
+{application, test_server,
+ [{description, "The OTP Test Server application"},
+  {vsn, "%VSN%"},
+  {modules, [
+	     erl2html2,
+	     test_server_ctrl,
+	     test_server,
+	     test_server_io,
+	     test_server_node,
+	     test_server_sup
+	    ]},
+  {registered, [test_server_ctrl,
+		test_server,
+		test_server_break_process]},
+  {applications, [kernel,stdlib]},
+  {env, []},
+  {runtime_dependencies, ["tools-2.8","stdlib-2.5","runtime_tools-1.8.16",
+			  "observer-2.1","kernel-4.0","inets-6.0",
+			  "syntax_tools-1.7","erts-7.0"]}]}.
+