File 3013-megaco-test-More-et-dependency-fixes.patch of Package erlang

From 59a472cc6407efc2a5b2ebabded009d58930d8f7 Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Tue, 19 Sep 2023 13:58:28 +0200
Subject: [PATCH 3/3] [megaco|test] More et dependency fixes

---
 lib/megaco/test/megaco_mess_SUITE.erl |  4 ++--
 lib/megaco/test/megaco_test_lib.erl   | 24 ++++++++++++++++++++++--
 lib/megaco/test/megaco_test_lib.hrl   |  3 ++-
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/lib/megaco/test/megaco_mess_SUITE.erl b/lib/megaco/test/megaco_mess_SUITE.erl
index 0643baa638..964eb5b544 100644
--- a/lib/megaco/test/megaco_mess_SUITE.erl
+++ b/lib/megaco/test/megaco_mess_SUITE.erl
@@ -13766,8 +13766,8 @@ otp_8212(Config) when is_list(Config) ->
     RemoteMid2    = {deviceName, RemoteMidStr2}, 
     UserMod       = megaco_mess_otp8212_test,
 
-    d("set megaco trace level to max",[]),
-    megaco:enable_trace(max, io),
+    d("(maybe) enable megaco trace at level to max with dest io", []),
+    ?ENABLE_TRACE(Config, max, io),
 
     d("start megaco app",[]),
     ?VERIFY(ok, application:start(megaco)),
diff --git a/lib/megaco/test/megaco_test_lib.erl b/lib/megaco/test/megaco_test_lib.erl
index 5b7c1912d9..e854475e50 100644
--- a/lib/megaco/test/megaco_test_lib.erl
+++ b/lib/megaco/test/megaco_test_lib.erl
@@ -71,7 +71,8 @@
          open/3,
          listen/3, connect/3,
 
-         megaco_trace/2
+         megaco_trace/2,
+         enable_trace/3
 
         ]).
 -export([init_per_suite/1,    end_per_suite/1,
@@ -3114,8 +3115,11 @@ stop_node(Node) ->
     end.
 
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
 %% ----------------------------------------------------------------
-%% Gerated a 'megaco_trace' tuple based on Config and a default value
+%% Generates a 'megaco_trace' tuple based on Config and a default
+%% value.
 %%
 
 megaco_trace(Config, Default) ->
@@ -3129,6 +3133,22 @@ megaco_trace(Config, Default) ->
     end.
 
 
+%% ----------------------------------------------------------------
+%% Conditionally enable megaco trace at Level and for Destination.
+%%
+
+enable_trace(Config, Level, Destination) ->
+    Key = megaco_trace,
+    case lists:keysearch(Key, 1, Config) of
+        {value, {Key, disable}} ->
+            p("megaco-trace disabled => skip enabling trace at: ~w; ~w",
+              [Level, Destination]),
+            ok;
+        _ ->
+            megaco:enable_trace(Level, Destination)
+    end.
+    
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 timetrap_scale_factor() ->
diff --git a/lib/megaco/test/megaco_test_lib.hrl b/lib/megaco/test/megaco_test_lib.hrl
index c49f2e8aa0..c2f93d3eed 100644
--- a/lib/megaco/test/megaco_test_lib.hrl
+++ b/lib/megaco/test/megaco_test_lib.hrl
@@ -147,4 +147,5 @@
         list_to_atom(
           ?F("~w_~w", [(PreName), erlang:system_time(millisecond)]))).
 
--define(MEGACO_TRACE(C, D), ?LIB:megaco_trace((C), (D))).
+-define(MEGACO_TRACE(C, D),    ?LIB:megaco_trace((C), (D))).
+-define(ENABLE_TRACE(C, L, D), ?LIB:enable_trace((C), (L), (D))).
-- 
2.35.3