aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2012-03-19 12:21:42 +0100
committerLukas Larsson <[email protected]>2012-03-20 10:32:39 +0100
commit07e52f515f9dca264cc389a75dbc1ded9e98513f (patch)
tree103472c3169dda9c9aa160c7e95e88988f6b0765 /lib
parentd8d08a31ee1880b29440438daa5a212de6f1f3af (diff)
downloadotp-07e52f515f9dca264cc389a75dbc1ded9e98513f.tar.gz
otp-07e52f515f9dca264cc389a75dbc1ded9e98513f.tar.bz2
otp-07e52f515f9dca264cc389a75dbc1ded9e98513f.zip
Extend timeout for windows
Diffstat (limited to 'lib')
-rw-r--r--lib/kernel/test/sendfile_SUITE.erl6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/kernel/test/sendfile_SUITE.erl b/lib/kernel/test/sendfile_SUITE.erl
index 4a60db34a0..6cf695adfd 100644
--- a/lib/kernel/test/sendfile_SUITE.erl
+++ b/lib/kernel/test/sendfile_SUITE.erl
@@ -315,6 +315,10 @@ sendfile_server(ClientPid, Orig) ->
-define(SENDFILE_TIMEOUT, 10000).
sendfile_do_recv(Sock, Bs) ->
+ TimeoutMul = case os:type() of
+ {win32, _} -> 6;
+ _ -> 1
+ end,
receive
stop when Bs /= 0,is_integer(Bs) ->
gen_tcp:close(Sock),
@@ -338,7 +342,7 @@ sendfile_do_recv(Sock, Bs) ->
{tcp_closed, Sock} when is_integer(Bs) ->
ct:log("Stopped due to close"),
{ok, Bs}
- after ?SENDFILE_TIMEOUT ->
+ after ?SENDFILE_TIMEOUT * TimeoutMul ->
ct:log("Sendfile timeout"),
timeout
end.