diff options
author | Micael Karlberg <[email protected]> | 2019-05-29 13:49:45 +0200 |
---|---|---|
committer | Micael Karlberg <[email protected]> | 2019-05-29 13:49:45 +0200 |
commit | 0bb7928c5985b057efbf8846ffbfc55edc7f31d4 (patch) | |
tree | 78ef645040c9f988a46d7759a341d823597ccd84 /erts/emulator/test/socket_test_ttest_tcp_server_socket.erl | |
parent | 247529ce5cb50cd9e645d3658e20420b8cf5263b (diff) | |
parent | 347cc4649f784c1a0fe57d2ce6ed1ccf41446b39 (diff) | |
download | otp-0bb7928c5985b057efbf8846ffbfc55edc7f31d4.tar.gz otp-0bb7928c5985b057efbf8846ffbfc55edc7f31d4.tar.bz2 otp-0bb7928c5985b057efbf8846ffbfc55edc7f31d4.zip |
Merge branch 'bmk/erts/esock/20190529/unix_domain_socket/OTP-15822' into maint
Diffstat (limited to 'erts/emulator/test/socket_test_ttest_tcp_server_socket.erl')
-rw-r--r-- | erts/emulator/test/socket_test_ttest_tcp_server_socket.erl | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/erts/emulator/test/socket_test_ttest_tcp_server_socket.erl b/erts/emulator/test/socket_test_ttest_tcp_server_socket.erl index b7ea1e8e93..d1de230637 100644 --- a/erts/emulator/test/socket_test_ttest_tcp_server_socket.erl +++ b/erts/emulator/test/socket_test_ttest_tcp_server_socket.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2018-2018. All Rights Reserved. +%% Copyright Ericsson AB 2018-2019. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -21,23 +21,18 @@ -module(socket_test_ttest_tcp_server_socket). -export([ - start/2, + start/3, stop/1 ]). -define(TRANSPORT_MOD, socket_test_ttest_tcp_socket). -%% -define(MOD(M), {?TRANSPORT_MOD, #{method => M, +%% -define(MOD(D, M), {?TRANSPORT_MOD, #{domain => D, +%% method => M, %% stats_interval => 10000}}). --define(MOD(M), {?TRANSPORT_MOD, #{method => M}}). +-define(MOD(D, M), {?TRANSPORT_MOD, #{domain => D, method => M}}). -start(Method, Active) -> - socket_test_ttest_tcp_server:start(?MOD(Method), Active). - %% {ok, {Pid, AddrPort}} -> - %% MRef = erlang:monitor(process, Pid), - %% {ok, {Pid, MRef, AddrPort}}; - %% {error, _} = ERROR -> - %% ERROR - %% end. +start(Method, Domain, Active) -> + socket_test_ttest_tcp_server:start(?MOD(Domain, Method), Active). stop(Pid) -> socket_test_ttest_tcp_server:stop(Pid). |