aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/test
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2019-07-30 17:23:38 +0200
committerMicael Karlberg <[email protected]>2019-07-30 17:23:38 +0200
commite040bbe58cd38584b315ae48c593fc7c5b541c9b (patch)
tree2be844511494d3fb69d4038e443591ece0a8e345 /erts/emulator/test
parentb8689708139b10a08e11adf4ffea4dc8fe31cd07 (diff)
parent43e3e3b2a4c62b141437b47e455ba6dfe51e7541 (diff)
downloadotp-e040bbe58cd38584b315ae48c593fc7c5b541c9b.tar.gz
otp-e040bbe58cd38584b315ae48c593fc7c5b541c9b.tar.bz2
otp-e040bbe58cd38584b315ae48c593fc7c5b541c9b.zip
Merge branch 'bmk/erts/esock/20190729/eafnosupport_on_solaris10' into maint
Diffstat (limited to 'erts/emulator/test')
-rw-r--r--erts/emulator/test/socket_SUITE.erl8
1 files changed, 8 insertions, 0 deletions
diff --git a/erts/emulator/test/socket_SUITE.erl b/erts/emulator/test/socket_SUITE.erl
index ff5a4e7e2e..4980ea2a82 100644
--- a/erts/emulator/test/socket_SUITE.erl
+++ b/erts/emulator/test/socket_SUITE.erl
@@ -16248,6 +16248,7 @@ traffic_send_and_recv_counters_tcpL(doc) ->
traffic_send_and_recv_counters_tcpL(_Config) when is_list(_Config) ->
?TT(?SECS(15)),
tc_try(traffic_send_and_recv_counters_tcpL,
+ fun() -> has_support_unix_domain_socket() end,
fun() ->
InitState = #{domain => local,
proto => default,
@@ -16337,6 +16338,7 @@ traffic_sendmsg_and_recvmsg_counters_tcpL(doc) ->
traffic_sendmsg_and_recvmsg_counters_tcpL(_Config) when is_list(_Config) ->
?TT(?SECS(15)),
tc_try(traffic_sendmsg_and_recvmsg_counters_tcpL,
+ fun() -> has_support_unix_domain_socket() end,
fun() ->
InitState = #{domain => local,
proto => default,
@@ -16385,6 +16387,8 @@ traffic_send_and_recv_tcp(InitState) ->
case socket:open(Domain, stream, Proto) of
{ok, Sock} ->
{ok, State#{lsock => Sock}};
+ {error, eafnosupport = Reason} ->
+ {skip, Reason};
{error, _} = ERROR ->
ERROR
end
@@ -16729,6 +16733,8 @@ traffic_send_and_recv_tcp(InitState) ->
case socket:open(Domain, stream, Proto) of
{ok, Sock} ->
{ok, State#{sock => Sock}};
+ {error, eafnosupport = Reason} ->
+ {skip, Reason};
{error, _} = ERROR ->
ERROR
end
@@ -17285,6 +17291,7 @@ traffic_sendto_and_recvfrom_counters_udpL(doc) ->
traffic_sendto_and_recvfrom_counters_udpL(_Config) when is_list(_Config) ->
?TT(?SECS(15)),
tc_try(traffic_sendto_and_recvfrom_counters_udp4,
+ fun() -> has_support_unix_domain_socket() end,
fun() ->
InitState = #{domain => local,
proto => default,
@@ -17380,6 +17387,7 @@ traffic_sendmsg_and_recvmsg_counters_udpL(doc) ->
traffic_sendmsg_and_recvmsg_counters_udpL(_Config) when is_list(_Config) ->
?TT(?SECS(15)),
tc_try(traffic_sendmsg_and_recvmsg_counters_udpL,
+ fun() -> has_support_unix_domain_socket() end,
fun() ->
InitState = #{domain => local,
proto => default,