diff options
| author | Peter Andersson <[email protected]> | 2013-02-19 14:12:03 +0100 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2013-02-19 14:12:09 +0100 |
| commit | df2b8d69d2abf071f4753da75e296e06859b5749 (patch) | |
| tree | 55dca8ebc4cc30ae74c76d9dbd2cbc81ffd408a4 /lib/common_test/src/ct_run.erl | |
| parent | e33534c42319768c7de5cc8b081c21eca134aed1 (diff) | |
| parent | 0164fa89fcf83cef70e1f5228fa66b43105c07aa (diff) | |
| download | otp-df2b8d69d2abf071f4753da75e296e06859b5749.tar.gz otp-df2b8d69d2abf071f4753da75e296e06859b5749.tar.bz2 otp-df2b8d69d2abf071f4753da75e296e06859b5749.zip | |
Merge remote branch 'origin/peppe/common_test/tc_print_deadlock'
* origin/peppe/common_test/tc_print_deadlock:
Fix problems with verbosity test suite
Solve problem with IO deadlock in ct_util_server
Implement test case that triggers known deadlock bug
OTP-10826
Diffstat (limited to 'lib/common_test/src/ct_run.erl')
| -rw-r--r-- | lib/common_test/src/ct_run.erl | 10 |
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]}]; |