aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel/test
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2011-12-08 15:56:50 +0100
committerLukas Larsson <[email protected]>2011-12-08 15:59:49 +0100
commit7d79fd6eb57a073e58080d52e98881bd85f8fcc9 (patch)
treebadba945b18de02ab8b3f7e8ec1d6a8948529c8b /lib/kernel/test
parent3323324c28d9102099b03e266f5c36aee0183f2c (diff)
parentf160ef80b3044b697f9f4714b02f52eb11fbdf33 (diff)
downloadotp-7d79fd6eb57a073e58080d52e98881bd85f8fcc9.tar.gz
otp-7d79fd6eb57a073e58080d52e98881bd85f8fcc9.tar.bz2
otp-7d79fd6eb57a073e58080d52e98881bd85f8fcc9.zip
Merge branch 'lukas/bugs_and_tc_fixes'
* lukas/bugs_and_tc_fixes: Fix test_server test makefile for windows Only step pointer arity steps Link with LIBS after ETHR_LIBS Save +M<S>t data as true or false, not the number Return true/false instead of num for +M<S>t info Return correct format for info about sys_alloc Add explanatory text for tc failure OTP-9800
Diffstat (limited to 'lib/kernel/test')
-rw-r--r--lib/kernel/test/gen_tcp_misc_SUITE.erl5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/kernel/test/gen_tcp_misc_SUITE.erl b/lib/kernel/test/gen_tcp_misc_SUITE.erl
index c1c5ff8b81..3da4b07c05 100644
--- a/lib/kernel/test/gen_tcp_misc_SUITE.erl
+++ b/lib/kernel/test/gen_tcp_misc_SUITE.erl
@@ -1031,6 +1031,7 @@ busy_send_loop(Server, Client, N) ->
{Server,send} ->
?line busy_send_2(Server, Client, N+1)
after 10000 ->
+ %% If this happens, see busy_send_srv
?t:fail({timeout,{server,not_send,flush([])}})
end
end.
@@ -1050,7 +1051,9 @@ busy_send_2(Server, Client, _N) ->
busy_send_srv(L, Master, Msg) ->
%% Server
- %%
+ %% Sometimes this accept does not return, do not really know why
+ %% but is causes the timeout error in busy_send_loop to be
+ %% triggered. Only happens on OS X Leopard?!?
{ok,Socket} = gen_tcp:accept(L),
busy_send_srv_loop(Socket, Master, Msg).