File 4832-system-Fix-otp_SUITE-with-disable-esock.patch of Package erlang
From 9bb5c2d7a7bc3728f96806183b15d13102cd1318 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang.org>
Date: Thu, 17 Feb 2022 14:13:45 +0100
Subject: [PATCH 2/3] system: Fix otp_SUITE with --disable-esock
---
erts/test/otp_SUITE.erl | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/erts/test/otp_SUITE.erl b/erts/test/otp_SUITE.erl
index 78f29d0a55..7f0141e152 100644
--- a/erts/test/otp_SUITE.erl
+++ b/erts/test/otp_SUITE.erl
@@ -781,7 +781,9 @@ test_app_runtime_deps_versions(AppPath, App, IgnoredUndefinedFunctions) ->
%% Filter out undefined functions that we should ignore
UndefinedFunctions1 =
[F || F <- UndefinedFunctions0,
- not maps:get(F, IgnoredUndefinedFunctions, false)],
+ not maps:get(F, IgnoredUndefinedFunctions, false),
+ not maps:get({element(1,F),'_','_'}, IgnoredUndefinedFunctions, false),
+ not maps:get({element(1,F),element(2,F),'_'}, IgnoredUndefinedFunctions, false)],
case UndefinedFunctions1 of
[] ->
ok;
@@ -820,6 +822,14 @@ is_development_build() ->
test_runtime_dependencies_versions(_Config) ->
ReleasesDir = "/usr/local/otp/releases",
IgnoreApps = [],
+ SocketIgnore = case lists:member(prim_socket, erlang:pre_loaded()) of
+ true -> #{};
+ false ->
+ Ignore = #{{prim_socket,'_','_'} => true,
+ {socket_registry,'_','_'} => true,
+ {prim_net,'_','_'} => true },
+ #{ kernel => Ignore, erts => Ignore }
+ end,
AppsToIgnoredUndefinedFunctions =
#{eunit =>
%% Intentional call to nonexisting function
@@ -844,8 +854,9 @@ test_runtime_dependencies_versions(_Config) ->
filelib:is_file(get_otp_versions_table_path()),
first_available_otp_rel() =/= none} of
{true, true, true, true, true} ->
- test_runtime_dependencies_versions_rels(IgnoreApps,
- AppsToIgnoredUndefinedFunctions);
+ test_runtime_dependencies_versions_rels(
+ IgnoreApps,
+ maps:merge(AppsToIgnoredUndefinedFunctions, SocketIgnore));
{_, _ ,_, false, _} -> {skip,
"Could not find the file \"otp_versions.table\". "
"Check that the test has been built correctly. "
--
2.34.1