aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2016-04-13 11:41:25 +0200
committerSiri Hansen <[email protected]>2016-04-13 11:41:25 +0200
commit88c00152dce3b3ba50f621f9145f459ec9cbbdf7 (patch)
tree1712519b5a776576c1bdda793f3437bbd17dd068
parent08ab8c8534ecabb2797165f5508a8c42d4dae926 (diff)
parent0dd267e5eb1e599f92bcd7f6225a85ad6d4d9a6c (diff)
downloadotp-88c00152dce3b3ba50f621f9145f459ec9cbbdf7.tar.gz
otp-88c00152dce3b3ba50f621f9145f459ec9cbbdf7.tar.bz2
otp-88c00152dce3b3ba50f621f9145f459ec9cbbdf7.zip
Merge branch 'siri/ct/mods-in-app-file/OTP-13475'
* siri/ct/mods-in-app-file/OTP-13475: Don't add explicit path to ct_release_test Add missing modules to common_test.app.src
-rw-r--r--lib/common_test/src/common_test.app.src6
-rw-r--r--lib/common_test/src/ct_release_test.erl4
2 files changed, 6 insertions, 4 deletions
diff --git a/lib/common_test/src/common_test.app.src b/lib/common_test/src/common_test.app.src
index ddd9d95396..77588af59b 100644
--- a/lib/common_test/src/common_test.app.src
+++ b/lib/common_test/src/common_test.app.src
@@ -26,6 +26,7 @@
ct_framework,
ct_ftp,
ct_gen_conn,
+ ct_groups,
ct_hooks,
ct_hooks_lock,
ct_logs,
@@ -36,6 +37,8 @@
ct_master_status,
ct_netconfc,
ct_conn_log_h,
+ ct_property_test,
+ ct_release_test,
ct_repeat,
ct_rpc,
ct_run,
@@ -45,6 +48,8 @@
ct_telnet,
ct_testspec,
ct_util,
+ ct_webtool,
+ ct_webtool_sup,
unix_telnet,
vts,
ct_config,
@@ -57,6 +62,7 @@
erl2html2,
test_server_ctrl,
test_server,
+ test_server_gl,
test_server_io,
test_server_node,
test_server_sup
diff --git a/lib/common_test/src/ct_release_test.erl b/lib/common_test/src/ct_release_test.erl
index 4cf253e571..4e0f88cf5f 100644
--- a/lib/common_test/src/ct_release_test.erl
+++ b/lib/common_test/src/ct_release_test.erl
@@ -655,10 +655,6 @@ do_upgrade({Cb,InitState},FromVsn,FromAppsVsns,ToRel,ToAppsVsns,InstallDir) ->
Start = filename:join([InstallDir,bin,start]),
{ok,Node} = start_node(Start,FromVsn,FromAppsVsns),
- %% Add path to this module, to allow calls to get_appup/2
- Dir = filename:dirname(code:which(?MODULE)),
- _ = rpc:call(Node,code,add_pathz,[Dir]),
-
ct:log("Node started: ~p",[Node]),
CtData = #ct_data{from = [{A,V,code:lib_dir(A)} || {A,V} <- FromAppsVsns],
to=[{A,V,code:lib_dir(A)} || {A,V} <- ToAppsVsns]},