File 3440-kernel-Add-debug-logs-for-shell_history-te... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 3440-kernel-Add-debug-logs-for-shell_history-test.patch of Package erlang

From ac26ed0149c92d030df835e7977eb98d4e9b314d Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang.org>
Date: Mon, 15 Mar 2021 16:39:21 +0100
Subject: [PATCH 10/11] kernel: Add debug logs for shell_history test

---
 lib/kernel/test/interactive_shell_SUITE.erl | 30 ++++++++++++---------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/lib/kernel/test/interactive_shell_SUITE.erl b/lib/kernel/test/interactive_shell_SUITE.erl
index 5fc3e2085e..bd0fa755ac 100644
--- a/lib/kernel/test/interactive_shell_SUITE.erl
+++ b/lib/kernel/test/interactive_shell_SUITE.erl
@@ -239,8 +239,10 @@ stop_during_init(Config) when is_list(Config) ->
 		Tempdir ->
 		    XArg = " -kernel shell_history enabled -s init stop",
 		    start_runerl_command(RunErl, Tempdir, "\\\""++Erl++"\\\""++XArg),
-		    {ok, Binary} = file:read_file(filename:join(Tempdir, "erlang.log.1")),
-		    nomatch = binary:match(Binary, <<"*** ERROR: Shell process terminated! ***">>)
+                    Logs = rtnode_read_logs(Tempdir),
+                    rtnode_dump_logs(Logs),
+		    nomatch = binary:match(maps:get("erlang.log.1",Logs),
+                                           <<"*** ERROR: Shell process terminated! ***">>)
 	    end
      end.
 
@@ -860,17 +862,7 @@ rtstop({CPid, SPid, ToErl, Tempdir}) ->
             ok
     end,
     wait_for_runerl_server(SPid),
-    {ok, LogFiles} = file:list_dir(Tempdir),
-    Logs =
-        lists:foldl(
-          fun(File, Acc) ->
-                  case file:read_file(filename:join(Tempdir, File)) of
-                      {ok, Data} ->
-                          Acc#{ File => Data };
-                      _ ->
-                          Acc
-                  end
-          end, #{}, LogFiles),
+    Logs = rtnode_read_logs(Tempdir),
     file:del_dir_r(Tempdir),
     Logs.
 
@@ -1282,6 +1274,18 @@ rtnode_dump_logs(Logs) ->
               ct:pal("~ts: ~ts",[File, Data])
       end, Logs).
 
+rtnode_read_logs(Tempdir) ->
+    {ok, LogFiles} = file:list_dir(Tempdir),
+    lists:foldl(
+      fun(File, Acc) ->
+              case file:read_file(filename:join(Tempdir, File)) of
+                  {ok, Data} ->
+                      Acc#{ File => Data };
+                  _ ->
+                      Acc
+              end
+      end, #{}, LogFiles).
+
 get_default_shell() ->
     try
         rtnode([{putline,""},
-- 
2.26.2

Places

File 3440-kernel-Add-debug-logs-for-shell_history-test.patch of Package erlang

Places