aboutsummaryrefslogtreecommitdiffstats
path: root/lib/common_test/src/ct_run.erl
diff options
context:
space:
mode:
authorPeter Andersson <[email protected]>2013-02-15 15:51:26 +0100
committerPeter Andersson <[email protected]>2013-02-15 15:51:26 +0100
commitcd1380fdf78018d1c49678cf985051f48e70f219 (patch)
tree1450d320f89d3659d434a55dca78f21db1bdd198 /lib/common_test/src/ct_run.erl
parent26c702b122436ec8662fbedc80673421547cdb05 (diff)
downloadotp-cd1380fdf78018d1c49678cf985051f48e70f219.tar.gz
otp-cd1380fdf78018d1c49678cf985051f48e70f219.tar.bz2
otp-cd1380fdf78018d1c49678cf985051f48e70f219.zip
Solve problem with IO deadlock in ct_util_server
Diffstat (limited to 'lib/common_test/src/ct_run.erl')
-rw-r--r--lib/common_test/src/ct_run.erl10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/common_test/src/ct_run.erl b/lib/common_test/src/ct_run.erl
index c0bdbb2a09..2d47a92b3e 100644
--- a/lib/common_test/src/ct_run.erl
+++ b/lib/common_test/src/ct_run.erl
@@ -2921,11 +2921,11 @@ opts2args(EnvStartOpts) ->
[{event_handler_init,[atom_to_list(EH),ArgStr]}];
({event_handler,{EHs,Arg}}) when is_list(EHs) ->
ArgStr = lists:flatten(io_lib:format("~p", [Arg])),
- Strs = lists:map(fun(EH) ->
- [atom_to_list(EH),
- ArgStr,"and"]
- end, EHs),
- [_LastAnd|StrsR] = lists:reverse(lists:flatten(Strs)),
+ Strs = lists:flatmap(fun(EH) ->
+ [atom_to_list(EH),
+ ArgStr,"and"]
+ end, EHs),
+ [_LastAnd | StrsR] = lists:reverse(Strs),
[{event_handler_init,lists:reverse(StrsR)}];
({logopts,LOs}) when is_list(LOs) ->
[{logopts,[atom_to_list(LO) || LO <- LOs]}];