aboutsummaryrefslogtreecommitdiffstats
path: root/lib/common_test/src/ct_gen_conn.erl
diff options
context:
space:
mode:
authorPeter Andersson <peppe@erlang.org>2017-12-04 16:19:34 +0100
committerPeter Andersson <peppe@erlang.org>2017-12-04 16:19:34 +0100
commit4713f7a3decc907f5f45edf97c02d57e854f33f4 (patch)
treeefcd8fb3524cd7db4fce1658b666bb8adff9a743 /lib/common_test/src/ct_gen_conn.erl
parent0742eee122c4d8182778d07708c2242d7720b5d6 (diff)
parent333556f4323f8d8a9e22a613a8591032b84b28d8 (diff)
downloadotp-4713f7a3decc907f5f45edf97c02d57e854f33f4.tar.gz
otp-4713f7a3decc907f5f45edf97c02d57e854f33f4.tar.bz2
otp-4713f7a3decc907f5f45edf97c02d57e854f33f4.zip
Merge branch 'maint'
Diffstat (limited to 'lib/common_test/src/ct_gen_conn.erl')
-rw-r--r--lib/common_test/src/ct_gen_conn.erl9
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/common_test/src/ct_gen_conn.erl b/lib/common_test/src/ct_gen_conn.erl
index badb7c52ae..456bfd8bd1 100644
--- a/lib/common_test/src/ct_gen_conn.erl
+++ b/lib/common_test/src/ct_gen_conn.erl
@@ -186,9 +186,11 @@ end_log() ->
do_within_time(Fun,Timeout) ->
Self = self(),
Silent = get(silent),
- TmpPid = spawn_link(fun() -> put(silent,Silent),
- R = Fun(),
- Self ! {self(),R}
+ TmpPid = spawn_link(fun() ->
+ ct_util:mark_process(),
+ put(silent,Silent),
+ R = Fun(),
+ Self ! {self(),R}
end),
ConnPid = get(conn_pid),
receive
@@ -301,6 +303,7 @@ return({To,Ref},Result) ->
init_gen(Parent,Opts) ->
process_flag(trap_exit,true),
+ ct_util:mark_process(),
put(silent,false),
try (Opts#gen_opts.callback):init(Opts#gen_opts.name,
Opts#gen_opts.address,