File 1909-sasl-replace-manually-updated-versions-wit... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1909-sasl-replace-manually-updated-versions-with-read-of-.patch of Package erlang (Revision a3c4263f873c2273804c376249a3c22f)

Currently displaying revision a3c4263f873c2273804c376249a3c22f , Show latest

From 8cb2e7818281a815d484008a42063b550cff1786 Mon Sep 17 00:00:00 2001
From: Rickard Green <rickard@erlang.org>
Date: Wed, 13 Oct 2021 13:19:28 +0200
Subject: [PATCH 09/10] sasl: replace manually updated versions with read of
 actual versions

---
 lib/sasl/test/Makefile                        |  2 +-
 lib/sasl/test/installer.erl                   |  8 +++----
 lib/sasl/test/otp_vsns.erl                    | 21 +++++++++++++++---
 lib/sasl/test/release_handler_SUITE.erl       | 16 ++++++++++----
 .../lib/installer-1.0/ebin/installer.app      |  2 +-
 lib/sasl/test/rh_test_lib.erl                 | 22 +++++++++++++++++++
 lib/sasl/test/test_lib.hrl                    |  3 ---
 7 files changed, 58 insertions(+), 16 deletions(-)
 delete mode 100644 lib/sasl/test/test_lib.hrl

diff --git a/lib/sasl/test/Makefile b/lib/sasl/test/Makefile
index ae033ab623..b9edca3a0c 100644
--- a/lib/sasl/test/Makefile
+++ b/lib/sasl/test/Makefile
@@ -41,7 +41,7 @@ ERL_FILES= $(MODULES:%=%.erl)
 
 EXTRA_FILES= $(ERL_TOP)/otp_versions.table
 
-HRL_FILES= test_lib.hrl
+HRL_FILES=
 
 TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
 INSTALL_PROGS= $(TARGET_FILES)
diff --git a/lib/sasl/test/installer.erl b/lib/sasl/test/installer.erl
index 2c5c9d725a..b1fce19183 100644
--- a/lib/sasl/test/installer.erl
+++ b/lib/sasl/test/installer.erl
@@ -20,8 +20,6 @@
 
 -module(installer).
 
--include("test_lib.hrl").
-
 %%-compile(export_all).
 -export([install_1/2]).
 -export([install_2/1]).
@@ -330,7 +328,7 @@ install_11(TestNode) ->
     true = lists:member("a-1.0", Libs),
     false = lists:member("a-1.1", Libs),
     {ok, Dirs} = file:list_dir(code:root_dir()),
-    ErtsDir = "erts-"++?ertsvsn,
+    ErtsDir = "erts-"++rh_test_lib:old_app_vsn(erts),
     [ErtsDir] = lists:filter(fun(Dir) -> lists:prefix("erts-",Dir) end, Dirs),
     ?print(["install_11 file checks ok"]),
     ok.
@@ -918,7 +916,9 @@ start_client_unix(TestNode,Sname,Node) ->
 start_client_win32(TestNode,Client,ClientSname) ->
     Name = atom_to_list(ClientSname) ++ "_P1G",
     RootDir = code:root_dir(),
-    ErtsBinDir = filename:join([RootDir,"erts-"++?ertsvsn,"bin"]),
+    ErtsBinDir = filename:join([RootDir,
+                                "erts-"++rh_test_lib:old_app_vsn(erts),
+                                "bin"]),
 
     {ClientArgs,RelClientDir} = rh_test_lib:get_client_args(Client,ClientSname,
 							    RootDir),
diff --git a/lib/sasl/test/otp_vsns.erl b/lib/sasl/test/otp_vsns.erl
index a70de069ee..d88fb8a815 100644
--- a/lib/sasl/test/otp_vsns.erl
+++ b/lib/sasl/test/otp_vsns.erl
@@ -20,11 +20,26 @@
 
 -module(otp_vsns).
 
--export([read_state/0, branch_latest/2, branch_vsns/2, app_vsn/3]).
+-export([read_state/0, read_state/1, branch_latest/2, branch_vsns/2, app_vsn/3]).
 
 read_state() ->
-    OtpVsnsTabFile = filename:join([filename:dirname(code:which(?MODULE)),
-                                    "otp_versions.table"]),
+    File = "otp_versions.table",
+    Dir = filename:dirname(code:which(?MODULE)),
+    Alt0 = filename:join([Dir, File]),
+    case file:read_file_info(Alt0) of
+        {ok, _} ->
+            read_state(Alt0);
+        _ ->
+            Alt1 = filename:join([Dir, "..", "priv", File]),
+            case file:read_file_info(Alt1) of
+                {ok, _} ->
+                    read_state(Alt1);
+                _ ->
+                    error(no_otp_versions_table)
+            end
+    end.
+
+read_state(OtpVsnsTabFile) ->
     {ok, OtpVsnsTabData} = file:read_file(OtpVsnsTabFile),
     lists:foldl(fun (OtpAppVsnsBin, Acc0) ->
                         [OtpVsnBin
diff --git a/lib/sasl/test/release_handler_SUITE.erl b/lib/sasl/test/release_handler_SUITE.erl
index d9f89f3b1e..4f2e62b65d 100644
--- a/lib/sasl/test/release_handler_SUITE.erl
+++ b/lib/sasl/test/release_handler_SUITE.erl
@@ -20,7 +20,6 @@
 -module(release_handler_SUITE).
 
 -include_lib("common_test/include/ct.hrl").
--include("test_lib.hrl").
 
 -compile([export_all, nowarn_export_all]).
 -export([scheduler_wall_time/0, garbage_collect/0]). %% rpc'ed
@@ -2405,6 +2404,17 @@ create_p1g(Conf,TargetDir) ->
 	      filename:join([DataDir,lib,"installer-1.0",ebin])),
     copy_file(filename:join(DataDir, "../rh_test_lib.beam"),
 	      filename:join([DataDir,lib,"installer-1.0",ebin])),
+    copy_file(filename:join(DataDir, "../otp_vsns.beam"),
+	      filename:join([DataDir,lib,"installer-1.0",ebin])),
+
+    InstPrivDir = filename:join([DataDir,lib,"installer-1.0","priv"]),
+    case file:read_file_info(InstPrivDir) of
+        {ok, _} ->
+            ok;
+        _ ->
+            ok = file:make_dir(InstPrivDir)
+    end,
+    copy_file(filename:join(DataDir, "../otp_versions.table"), InstPrivDir),
 
     %% Create .rel, .script and .boot files
     RelName = "rel0",
@@ -2940,9 +2950,7 @@ modify_tar_win32(Conf, TarFileName) ->
 
 app_dir(App,Vsn) ->
     atom_to_list(App) ++ "-" ++ vsn(App,Vsn).
-vsn(erts,old) -> ?ertsvsn;
-vsn(kernel,old) -> ?kernelvsn;
-vsn(stdlib,old) -> ?stdlibvsn;
+vsn(App,old) -> rh_test_lib:old_app_vsn(App);
 vsn(erts,current) -> erlang:system_info(version);
 vsn(App,current) ->
     {ok,Vsn} = application:get_key(App,vsn),
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/installer-1.0/ebin/installer.app b/lib/sasl/test/release_handler_SUITE_data/lib/installer-1.0/ebin/installer.app
index e1391c0605..b1622307bb 100644
--- a/lib/sasl/test/release_handler_SUITE_data/lib/installer-1.0/ebin/installer.app
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/installer-1.0/ebin/installer.app
@@ -1,6 +1,6 @@
 {application, installer,
 	     [{description, "Installer application"},
               {vsn, "1.0"},
-	      {modules, [installer,rh_test_lib]},
+	      {modules, [installer,rh_test_lib,otp_vsns]},
 	      {registered, []},
 	      {applications, [kernel, stdlib, sasl]}]}.
diff --git a/lib/sasl/test/rh_test_lib.erl b/lib/sasl/test/rh_test_lib.erl
index 6425fce7a7..7fffb310fc 100644
--- a/lib/sasl/test/rh_test_lib.erl
+++ b/lib/sasl/test/rh_test_lib.erl
@@ -12,6 +12,8 @@
 -export([clean_dir/1,
 	 clean_dir/2]).
 
+-export([old_app_vsn/1]).
+
 -include_lib("kernel/include/file.hrl").
 
 cmd(Cmd,Args,Env) ->
@@ -160,3 +162,23 @@ rm_rf([File|Files],Save) ->
     end;
 rm_rf([],_) ->
     ok.
+
+old_app_vsn(App) ->
+    %% Get oldest application version (erts, kernel, sasl,
+    %% stdlib) we support upgrade from, i.e., the first
+    %% application version in the release two releases
+    %% prior to current release...
+    State = case get('__otp_vsns_state__') of
+                undefined ->
+                    S = otp_vsns:read_state(),
+                    put('__otp_vsns_state__', S),
+                    S;
+                S ->
+                    S
+            end,
+    Rel = integer_to_list(list_to_integer(erlang:system_info(otp_release))-2),
+    AppVsn = otp_vsns:app_vsn(State, "OTP-"++Rel++".0", atom_to_list(App)),
+    [_, Vsn] = string:lexemes(AppVsn, "-"),
+    Vsn.
+
+
diff --git a/lib/sasl/test/test_lib.hrl b/lib/sasl/test/test_lib.hrl
deleted file mode 100644
index 6f02666b87..0000000000
--- a/lib/sasl/test/test_lib.hrl
+++ /dev/null
@@ -1,3 +0,0 @@
--define(ertsvsn,"10.4").
--define(kernelvsn,"6.4").
--define(stdlibvsn,"3.9").
-- 
2.31.1

Places

File 1909-sasl-replace-manually-updated-versions-with-read-of-.patch of Package erlang (Revision a3c4263f873c2273804c376249a3c22f)

Places