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/test/ct_test_support.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/test/ct_test_support.erl')
| -rw-r--r-- | lib/common_test/test/ct_test_support.erl | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/common_test/test/ct_test_support.erl b/lib/common_test/test/ct_test_support.erl index 7c33fd404d..5e109e98e9 100644 --- a/lib/common_test/test/ct_test_support.erl +++ b/lib/common_test/test/ct_test_support.erl @@ -312,8 +312,10 @@ wait_for_ct_stop(Retries, CTNode) -> undefined -> true; Pid -> + Info = (catch process_info(Pid)), test_server:format(0, "Waiting for CT (~p) to finish (~p)...", [Pid,Retries]), + test_server:format(0, "Process info for ~p:~n~p", [Info]), timer:sleep(5000), wait_for_ct_stop(Retries-1, CTNode) end. @@ -328,12 +330,17 @@ handle_event(EH, Event) -> start_event_receiver(Config) -> CTNode = proplists:get_value(ct_node, Config), - spawn_link(CTNode, fun() -> er() end). + Level = proplists:get_value(trace_level, Config), + ER = spawn_link(CTNode, fun() -> er() end), + test_server:format(Level, "~nEvent receiver ~w started!~n", [ER]), + ER. get_events(_, Config) -> CTNode = proplists:get_value(ct_node, Config), + Level = proplists:get_value(trace_level, Config), {event_receiver,CTNode} ! {self(),get_events}, Events = receive {event_receiver,Evs} -> Evs end, + test_server:format(Level, "Stopping event receiver!~n", []), {event_receiver,CTNode} ! stop, Events. |