File 0915-system-Fix-upgrade_SUITE-to-ignore-flags-p... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0915-system-Fix-upgrade_SUITE-to-ignore-flags-passed-in-E.patch of Package erlang

From b54a55e61af86aec1f29c1d0b1b3ec955dc9cfbb Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang.org>
Date: Mon, 14 Feb 2022 17:12:41 +0100
Subject: [PATCH 1/3] system: Fix upgrade_SUITE to ignore flags passed in
 ERL_AFLAGS

---
 erts/test/upgrade_SUITE.erl | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/erts/test/upgrade_SUITE.erl b/erts/test/upgrade_SUITE.erl
index e5afcc56d8..defefcbb1b 100644
--- a/erts/test/upgrade_SUITE.erl
+++ b/erts/test/upgrade_SUITE.erl
@@ -518,7 +518,7 @@ subst_var([], Vars, Result, VarAcc) ->
 %%%-----------------------------------------------------------------
 %%% 
 start_node(Start,ExpStatus,ExpVsn,ExpApps) ->
-    case open_port({spawn_executable, Start}, []) of
+    case open_port({spawn_executable, Start}, [{env,[{"ERL_AFLAGS",false}]}]) of
         Port when is_port(Port) ->
             unlink(Port),
             erlang:port_close(Port),
@@ -533,7 +533,22 @@ wait_node_up(ExpStatus, ExpVsn, ExpApps0) ->
     wait_node_up(Node, ExpStatus, ExpVsn, lists:keysort(1,ExpApps), 60).
 
 wait_node_up(Node, ExpStatus, ExpVsn, ExpApps, 0) ->
-    p("wait_node_up -> fail"),
+    LogTxt =
+        try erpc:call(Node, code, root_dir, []) of
+            Root ->
+                LogGlob = filename:join([Root,"log","erlang.*"]),
+                {ok, Log} = case filelib:wildcard(LogGlob) of
+                                [Logfile|_] ->
+                                    file:read_file(Logfile);
+                                [] ->
+                                    {ok, "No log file found"}
+                            end,
+                Log
+        catch C:E ->
+                {"erpc:call",C,E}
+        end,
+    p("wait_node_up -> fail~n"
+      "Logs: ~n~ts~n", [LogTxt]),
     ct:fail({app_check_failed,ExpVsn,ExpApps,
 	     rpc:call(Node, release_handler, which_releases,     [ExpStatus]),
 	     rpc:call(Node, application,     which_applications, [])});
@@ -549,8 +564,11 @@ wait_node_up(Node, ExpStatus, ExpVsn, ExpApps, N) ->
                     p("wait_node_up -> [~w] expected apps", [N]),
                     {ok, Node};
                 UnexpApps ->
-                    p("wait_node_up -> [~w] still wrong apps:"
-                      "~n      ~p", [N, UnexpApps]),
+                    p("wait_node_up -> [~w] still wrong apps:~n"
+                      "Missing:~p~n"
+                      "Extra:  ~p~n"
+                      "All:    ~p~n"
+                      , [N, ExpApps -- UnexpApps, UnexpApps -- ExpApps, UnexpApps]),
                     wait_node_up(Node, ExpStatus, ExpVsn, ExpApps, N-1)
             end;
         {[{_,Vsn,_,_}],_} ->
-- 
2.34.1

Places

File 0915-system-Fix-upgrade_SUITE-to-ignore-flags-passed-in-E.patch of Package erlang

Places