aboutsummaryrefslogtreecommitdiffstats
path: root/lib/common_test/src/common_test.app.src
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2016-03-02 15:15:55 +0100
committerBjörn Gustavsson <[email protected]>2016-03-02 15:15:55 +0100
commitf2f3093222b37dba42b6eb7e7c4cbecf7655305c (patch)
tree241d91b8d92f5393a2463652d5c0aa32c175be9a /lib/common_test/src/common_test.app.src
parent630e42c7a6fcde6acec407653c5d948fdeb1d8d7 (diff)
parent8480526b8fea311d7bca818caeb2687ee615e5dd (diff)
downloadotp-f2f3093222b37dba42b6eb7e7c4cbecf7655305c.tar.gz
otp-f2f3093222b37dba42b6eb7e7c4cbecf7655305c.tar.bz2
otp-f2f3093222b37dba42b6eb7e7c4cbecf7655305c.zip
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
Diffstat (limited to 'lib/common_test/src/common_test.app.src')
-rw-r--r--lib/common_test/src/common_test.app.src36
1 files changed, 28 insertions, 8 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"
+ ]}]}.