diff options
| author | Micael Karlberg <[email protected]> | 2019-07-16 17:32:38 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2019-07-16 17:32:38 +0200 |
| commit | 3b6cebce2ffed10fb51fc0929dcb09e8051a864b (patch) | |
| tree | 581b24277dcdf5f32a2fa2bae85761129749dc4a /erts/emulator/test/socket_test_ttest_tcp_client_socket.erl | |
| parent | 86716445f382abad9b0af4e178ae526015ed074d (diff) | |
| parent | 439b0fb6d3d0ba810fcd3d961a059b545d5bbfdc (diff) | |
| download | otp-3b6cebce2ffed10fb51fc0929dcb09e8051a864b.tar.gz otp-3b6cebce2ffed10fb51fc0929dcb09e8051a864b.tar.bz2 otp-3b6cebce2ffed10fb51fc0929dcb09e8051a864b.zip | |
Merge branch 'bmk/erts/esock/20190708/ipv6/OTP-15897' into maint
Diffstat (limited to 'erts/emulator/test/socket_test_ttest_tcp_client_socket.erl')
| -rw-r--r-- | erts/emulator/test/socket_test_ttest_tcp_client_socket.erl | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/erts/emulator/test/socket_test_ttest_tcp_client_socket.erl b/erts/emulator/test/socket_test_ttest_tcp_client_socket.erl index ca7eff4437..2fb1242028 100644 --- a/erts/emulator/test/socket_test_ttest_tcp_client_socket.erl +++ b/erts/emulator/test/socket_test_ttest_tcp_client_socket.erl @@ -34,24 +34,24 @@ start(Method, Async, Active, ServerInfo) when is_list(ServerInfo) -> Domain = local, socket_test_ttest_tcp_client:start_monitor(?MOD(Domain, Async, Method), - Active, ServerInfo); + ServerInfo, Active); start(Method, Async, Active, ServerInfo = {Addr, _}) when is_tuple(Addr) andalso (size(Addr) =:= 4) -> Domain = inet, socket_test_ttest_tcp_client:start_monitor(?MOD(Domain, Async, Method), - Active, ServerInfo); + ServerInfo, Active); start(Method, Async, Active, ServerInfo = {Addr, _}) when is_tuple(Addr) andalso (size(Addr) =:= 8) -> Domain = inet6, socket_test_ttest_tcp_client:start_monitor(?MOD(Domain, Async, Method), - Active, ServerInfo). + ServerInfo, Active). start(Method, Async, Active, ServerInfo, MsgID) when is_list(ServerInfo) -> %% This is just a simplification Domain = local, socket_test_ttest_tcp_client:start(?MOD(Domain, Async, Method), - Active, ServerInfo, MsgID); + ServerInfo, Active, MsgID); start(Method, Async, Active, ServerInfo = {Addr, _}, MsgID) when is_tuple(Addr) andalso (size(Addr) =:= 4) -> %% This is just a simplification @@ -62,14 +62,14 @@ start(Method, Async, Active, ServerInfo = {Addr, _}, MsgID) when is_tuple(Addr) andalso (size(Addr) =:= 8) -> Domain = inet6, socket_test_ttest_tcp_client:start(?MOD(Domain, Async, Method), - Active, ServerInfo, MsgID). + ServerInfo, Active, MsgID). start(Method, Async, Active, ServerInfo, MsgID, MaxOutstanding, RunTime) when is_list(ServerInfo) -> Domain = local, socket_test_ttest_tcp_client:start(false, ?MOD(Domain, Async, Method), - Active, ServerInfo, + ServerInfo, Active, MsgID, MaxOutstanding, RunTime); start(Method, Async, Active, ServerInfo = {Addr, _}, MsgID, MaxOutstanding, RunTime) @@ -77,7 +77,7 @@ start(Method, Async, Active, ServerInfo = {Addr, _}, Domain = inet, socket_test_ttest_tcp_client:start(false, ?MOD(Domain, Async, Method), - Active, ServerInfo, + ServerInfo, Active, MsgID, MaxOutstanding, RunTime); start(Method, Async, Active, ServerInfo = {Addr, _}, MsgID, MaxOutstanding, RunTime) @@ -85,7 +85,7 @@ start(Method, Async, Active, ServerInfo = {Addr, _}, Domain = inet6, socket_test_ttest_tcp_client:start(false, ?MOD(Domain, Async, Method), - Active, ServerInfo, + ServerInfo, Active, MsgID, MaxOutstanding, RunTime). start(Quiet, Async, Active, Method, ServerInfo, MsgID, MaxOutstanding, RunTime) @@ -93,7 +93,7 @@ start(Quiet, Async, Active, Method, ServerInfo, MsgID, MaxOutstanding, RunTime) Domain = local, socket_test_ttest_tcp_client:start(Quiet, ?MOD(Domain, Async, Method), - Active, ServerInfo, + ServerInfo, Active, MsgID, MaxOutstanding, RunTime); start(Quiet, Async, Active, Method, ServerInfo = {Addr, _}, MsgID, MaxOutstanding, RunTime) @@ -101,7 +101,7 @@ start(Quiet, Async, Active, Method, ServerInfo = {Addr, _}, Domain = inet, socket_test_ttest_tcp_client:start(Quiet, ?MOD(Domain, Async, Method), - Active, ServerInfo, + ServerInfo, Active, MsgID, MaxOutstanding, RunTime); start(Quiet, Async, Active, Method, ServerInfo = {Addr, _}, MsgID, MaxOutstanding, RunTime) @@ -109,7 +109,7 @@ start(Quiet, Async, Active, Method, ServerInfo = {Addr, _}, Domain = inet6, socket_test_ttest_tcp_client:start(Quiet, ?MOD(Domain, Async, Method), - Active, ServerInfo, + ServerInfo, Active, MsgID, MaxOutstanding, RunTime). stop(Pid) -> |