aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel/test
diff options
context:
space:
mode:
authorJohn Högberg <[email protected]>2018-10-17 07:56:56 +0200
committerJohn Högberg <[email protected]>2018-10-17 07:56:56 +0200
commite18ee8b3d0ced05a8905d20f486f025a26f7c8c8 (patch)
treed11106f62eaa86d17a2cb8750a6c3d215fdd000c /lib/kernel/test
parentb20482625cf11dfe9330527330660ef5c15cfcaf (diff)
parent2c9cfa8663df4b73afb6d9a6e5a40d6887cdc744 (diff)
downloadotp-e18ee8b3d0ced05a8905d20f486f025a26f7c8c8.tar.gz
otp-e18ee8b3d0ced05a8905d20f486f025a26f7c8c8.tar.bz2
otp-e18ee8b3d0ced05a8905d20f486f025a26f7c8c8.zip
Merge branch 'maint'
* maint: "cork" tcp socket around file:sendfile Add nopush TCP socket option
Diffstat (limited to 'lib/kernel/test')
-rw-r--r--lib/kernel/test/inet_sockopt_SUITE.erl9
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/kernel/test/inet_sockopt_SUITE.erl b/lib/kernel/test/inet_sockopt_SUITE.erl
index ada9c2689c..27ff74e309 100644
--- a/lib/kernel/test/inet_sockopt_SUITE.erl
+++ b/lib/kernel/test/inet_sockopt_SUITE.erl
@@ -110,9 +110,14 @@ simple(Config) when is_list(Config) ->
{S1,S2} = create_socketpair(Opt, Opt),
{ok,Opt} = inet:getopts(S1,OptTags),
{ok,Opt} = inet:getopts(S2,OptTags),
- COpt = [{X,case X of nodelay -> false;_ -> Y end} || {X,Y} <- Opt],
+ NoPushOpt = case os:type() of
+ {unix, Osname} when Osname =:= linux; Osname =:= freebsd -> {nopush, true};
+ {_,_} -> {nopush, false}
+ end,
+ COpt = [{X,case X of nodelay -> false;_ -> Y end} || {X,Y} <- [NoPushOpt|Opt]],
+ COptTags = [X || {X,_} <- COpt],
inet:setopts(S1,COpt),
- {ok,COpt} = inet:getopts(S1,OptTags),
+ {ok,COpt} = inet:getopts(S1,COptTags),
{ok,Opt} = inet:getopts(S2,OptTags),
gen_tcp:close(S1),
gen_tcp:close(S2),