[socket|net|test] Update test suites to handle disabled esock

2 files changed, 29 insertions, 19 deletions

diff --git a/erts/emulator/test/net_SUITE.erl b/erts/emulator/test/net_SUITE.erl
index 1a973cacb2..6111fc76a5 100644
--- a/erts/emulator/test/net_SUITE.erl
+++ b/erts/emulator/test/net_SUITE.erl
@@ -127,12 +127,17 @@ api_basic_cases() ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 init_per_suite(Config) ->
-    case os:type() of
-        {win32, _} ->
-            not_yet_implemented();
-        _ ->
-            %% ?LOGGER:start(),
-            Config
+    case lists:member(socket, erlang:loaded()) of
+        true ->
+            case os:type() of
+                {win32, _} ->
+                    not_yet_implemented();
+                _ ->
+                    %% ?LOGGER:start(),
+                    Config
+            end;
+        false ->
+            {skip, "esock disabled"}
     end.
 
 end_per_suite(_) ->
diff --git a/erts/emulator/test/socket_SUITE.erl b/erts/emulator/test/socket_SUITE.erl
index cefbe4c1f8..e3545ccbf9 100644
--- a/erts/emulator/test/socket_SUITE.erl
+++ b/erts/emulator/test/socket_SUITE.erl
@@ -1385,22 +1385,27 @@ ttest_ssockt_csockt_cases() ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 init_per_suite(Config) ->
-    case os:type() of
-        {win32, _} ->
-            not_yet_implemented();
-        _ ->
-            case quiet_mode(Config) of
-                default ->
-                    ?LOGGER:start(),
-                    Config;
-                Quiet ->
-                    ?LOGGER:start(Quiet),
-                    [{esock_test_quiet, Quiet}|Config]
-            end
+    case lists:member(socket, erlang:loaded()) of
+        true ->
+            case os:type() of
+                {win32, _} ->
+                    (catch not_yet_implemented());
+                _ ->
+                    case quiet_mode(Config) of
+                        default ->
+                            ?LOGGER:start(),
+                            Config;
+                        Quiet ->
+                            ?LOGGER:start(Quiet),
+                            [{esock_test_quiet, Quiet}|Config]
+                    end
+            end;
+        false ->
+            {skip, "esock disabled"}
     end.
 
 end_per_suite(_) ->
-    ?LOGGER:stop(),
+    (catch ?LOGGER:stop()),
     ok.