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

* bjorn/remove-test_server/OTP-12705:
  Remove multiple inclusion of ct.hrl
  otp_SUITE: Remove handling of test_server application
  Correct common_test.app.src

3 files changed, 28 insertions, 69 deletions

diff --git a/lib/common_test/src/common_test.app.src b/lib/common_test/src/common_test.app.src
index d847907d75..26bcf00824 100644
--- a/lib/common_test/src/common_test.app.src
+++ b/lib/common_test/src/common_test.app.src
@@ -53,7 +53,13 @@
 	     ct_slave,
              cth_log_redirect,
 	     cth_conn_log,
-             cth_surefire
+             cth_surefire,
+	     erl2html2,
+	     test_server_ctrl,
+	     test_server,
+	     test_server_io,
+	     test_server_node,
+	     test_server_sup
 	    ]},
   {registered, [ct_logs,
 		ct_util_server,
@@ -61,13 +67,27 @@
 		ct_make_ref,
 		vts,
 		ct_master,
-		ct_master_logs]},
+		ct_master_logs,
+		test_server_ctrl,
+		test_server,
+		test_server_break_process]},
   {applications, [kernel,stdlib]},
   {env, []},
-  {runtime_dependencies,["xmerl-1.3.8","tools-2.8",
-			 "test_server-3.9","stdlib-2.5","ssh-4.0",
-			 "snmp-5.1.2","sasl-2.4.2","runtime_tools-1.8.16",
-			 "kernel-4.0","inets-6.0","erts-7.0",
-			 "debugger-4.1","crypto-3.6","compiler-6.0",
-			 "observer-2.1"]}]}.
+  {runtime_dependencies,
+   ["compiler-6.0",
+    "crypto-3.6",
+    "debugger-4.1",
+    "erts-7.0",
+    "inets-6.0",
+    "kernel-4.0",
+    "observer-2.1",
+    "runtime_tools-1.8.16",
+    "sasl-2.4.2",
+    "snmp-5.1.2",
+    "ssh-4.0",
+    "stdlib-2.5",
+    "syntax_tools-1.7",
+    "tools-2.8",
+    "xmerl-1.3.8"
+   ]}]}.
 
diff --git a/lib/common_test/src/test_server.app.src b/lib/common_test/src/test_server.app.src
deleted file mode 100644
index 334be8109d..0000000000
--- a/lib/common_test/src/test_server.app.src
+++ /dev/null
@@ -1,39 +0,0 @@
-% 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"]}]}.
-  
diff --git a/lib/common_test/src/test_server.appup.src b/lib/common_test/src/test_server.appup.src
deleted file mode 100644
index 7c4aa630ae..0000000000
--- a/lib/common_test/src/test_server.appup.src
+++ /dev/null
@@ -1,22 +0,0 @@
-%% -*- erlang -*-
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2014. 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%
-{"%VSN%",
- [{<<".*">>,[{restart_application, test_server}]}],
- [{<<".*">>,[{restart_application, test_server}]}]
-}.