File 1908-Adjust-appup-tests-in-sasl-kernel-stdlib.p... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1908-Adjust-appup-tests-in-sasl-kernel-stdlib.patch of Package erlang (Revision 3713767a038ae3acd54a990b0e65a761)

Currently displaying revision 3713767a038ae3acd54a990b0e65a761 , Show latest

From fbcdc948ae7ed066b7ed9ecfd54fbed0f4d10b5a Mon Sep 17 00:00:00 2001
From: Rickard Green <rickard@erlang.org>
Date: Tue, 12 Oct 2021 01:59:25 +0200
Subject: [PATCH 08/10] Adjust appup tests in sasl, kernel, stdlib

---
 lib/kernel/test/Makefile         |  10 ++-
 lib/kernel/test/kernel_SUITE.erl |  94 +++++++++-----------
 lib/sasl/test/Makefile           |   5 +-
 lib/sasl/test/otp_vsns.erl       | 145 +++++++++++++++++++++++++++++++
 lib/sasl/test/sasl_SUITE.erl     |  94 +++++++++-----------
 lib/stdlib/test/Makefile         |  12 ++-
 lib/stdlib/test/stdlib_SUITE.erl |  94 +++++++++-----------
 7 files changed, 285 insertions(+), 169 deletions(-)
 create mode 100644 lib/sasl/test/otp_vsns.erl

diff --git a/lib/kernel/test/Makefile b/lib/kernel/test/Makefile
index 62909d324d..31bdc5c8ee 100644
--- a/lib/kernel/test/Makefile
+++ b/lib/kernel/test/Makefile
@@ -132,13 +132,17 @@ APP_FILES = \
 	topApp2.app \
 	topApp3.app
 
-ERL_FILES= $(MODULES:%=%.erl) code_a_test.erl
+SASL_MODULES= otp_vsns
+
+ERL_FILES= $(MODULES:%=%.erl) code_a_test.erl $(SASL_MODULES:%=$(ERL_TOP)/lib/sasl/test/%.erl)
 HRL_FILES= \
 	kernel_test_lib.hrl \
 	socket_test_evaluator.hrl \
 	socket_test_ttest.hrl \
 	socket_test_ttest_client.hrl
 
+EXTRA_FILES= $(ERL_TOP)/otp_versions.table
+
 TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
 INSTALL_PROGS= $(TARGET_FILES)
 
@@ -176,7 +180,7 @@ erl_uds_dist.erl: ../examples/erl_uds_dist/src/erl_uds_dist.erl
 make_emakefile: $(ERL_FILES)
 	$(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) -o$(EBIN) '*_SUITE_make' \
 	> $(EMAKEFILE)
-	$(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) -o$(EBIN) $(MODULES) \
+	$(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) -o$(EBIN) $(MODULES) $(SASL_MODULES) \
 	>> $(EMAKEFILE)
 
 tests debug opt: make_emakefile
@@ -203,7 +207,7 @@ release_spec: opt
 release_tests_spec: make_emakefile
 	$(INSTALL_DIR) "$(RELSYSDIR)"
 	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)"
-	$(INSTALL_DATA) $(APP_FILES) "$(RELSYSDIR)"
+	$(INSTALL_DATA) $(APP_FILES) $(EXTRA_FILES) "$(RELSYSDIR)"
 	$(INSTALL_DATA) \
 		kernel.spec kernel_smoke.spec kernel_bench.spec logger.spec \
 		$(EMAKEFILE) $(COVERFILE) "$(RELSYSDIR)"
diff --git a/lib/kernel/test/kernel_SUITE.erl b/lib/kernel/test/kernel_SUITE.erl
index a5fce3ad32..94a05902cc 100644
--- a/lib/kernel/test/kernel_SUITE.erl
+++ b/lib/kernel/test/kernel_SUITE.erl
@@ -75,8 +75,6 @@ app_test(Config) when is_list(Config) ->
 appup_test(_Config) ->
     appup_tests(kernel,create_test_vsns(kernel)).
 
-appup_tests(_App,{[],[]}) ->
-    {skip,"no previous releases available"};
 appup_tests(App,{OkVsns0,NokVsns}) ->
     application:load(App),
     {_,_,Vsn} = lists:keyfind(App,1,application:loaded_applications()),
@@ -89,8 +87,7 @@ appup_tests(App,{OkVsns0,NokVsns}) ->
 	    OkVsns0 ->
 		OkVsns0;
 	    Ok ->
-		ct:log("Current version, ~p, is same as in previous release.~n"
-		       "Removing this from the list of ok versions.",
+		ct:log("Removed current version ~p from the list of ok versions to test.",
 		      [Vsn]),
 		Ok
 	end,
@@ -105,57 +102,46 @@ appup_tests(App,{OkVsns0,NokVsns}) ->
     ok.
 
 create_test_vsns(App) ->
-    ThisMajor = erlang:system_info(otp_release),
-    FirstMajor = previous_major(ThisMajor),
-    SecondMajor = previous_major(previous_major(FirstMajor)),
-    Ok = app_vsn(App,[ThisMajor,FirstMajor]),
-    Nok0 = app_vsn(App,[SecondMajor]),
+    S = otp_vsns:read_state(),
+    Rel = list_to_integer(erlang:system_info(otp_release)),
+    AppStr = atom_to_list(App),
+    Ok = ok_app_vsns(S, Rel, AppStr),
+    Nok0 = nok_app_vsns(S, Rel, AppStr, hd(Ok)),
     Nok = case Ok of
-	       [Ok1|_] ->
-		   [Ok1 ++ ",1" | Nok0]; % illegal
-	       _ ->
-		   Nok0
-	   end,
-    {Ok,Nok}.
-
-previous_major("17") ->
-    "r16b";
-previous_major("r16b") ->
-    "r15b";
-previous_major(Rel) ->
-    integer_to_list(list_to_integer(Rel)-1).
-
-app_vsn(App,[R|Rs]) ->
-    OldRel =
-	case test_server:is_release_available(R) of
-	    true ->
-		{release,R};
-	    false ->
-		case ct:get_config({otp_releases,list_to_atom(R)}) of
-		    undefined ->
-			false;
-		    Prog0 ->
-			case os:find_executable(Prog0) of
-			    false ->
-				false;
-			    Prog ->
-				{prog,Prog}
-			end
-		end
-	end,
-    case OldRel of
-	false ->
-	    app_vsn(App,Rs);
-	_ ->
-	    {ok,N} = test_server:start_node(prevrel,peer,[{erl,[OldRel]}]),
-	    _ = rpc:call(N,application,load,[App]),
-	    As = rpc:call(N,application,loaded_applications,[]),
-	    {_,_,V} = lists:keyfind(App,1,As),
-	    test_server:stop_node(N),
-	    [V|app_vsn(App,Rs)]
-    end;
-app_vsn(_App,[]) ->
-    [].
+              [Ok1|_] ->
+                  [Ok1 ++ ",1" | Nok0]; % illegal
+              _ ->
+                  Nok0
+          end,
+    {Ok, Nok}.
+
+ok_app_vsns(S, Rel, AppStr) ->
+    AppVsns0 = get_rel_app_vsns(S, Rel-2, AppStr),
+    AppVsns1 = get_rel_app_vsns(S, Rel-1, AppStr),
+    AppVsns2 = try
+                   get_rel_app_vsns(S, Rel, AppStr)
+               catch
+                   _:_ -> []
+               end,
+    lists:usort(AppVsns2 ++ AppVsns1 ++ AppVsns0).
+
+nok_app_vsns(S, Rel, AppStr, EarliestOkVsn) ->
+    AppVsns0 = get_rel_app_vsns(S, Rel-4, AppStr),
+    AppVsns1 = get_rel_app_vsns(S, Rel-3, AppStr),
+    %% Earliest OK version may exist in not OK versions
+    %% as well if there were no application version bump
+    %% between two releases, so we need to remove it
+    %% if that is the case...
+    lists:usort(AppVsns1 ++ AppVsns0) -- EarliestOkVsn.
+
+get_rel_app_vsns(S, Rel, App) ->
+    RelStr = integer_to_list(Rel),
+    OtpVsns = otp_vsns:branch_vsns(S, "maint-"++RelStr),
+    lists:map(fun (OtpVsn) ->
+                      AppVsn = otp_vsns:app_vsn(S, OtpVsn, App),
+                      [_, Vsn] = string:lexemes(AppVsn, "-"),
+                      Vsn
+              end, OtpVsns).
 
 check_appup([Vsn|Vsns],Instrs,Expected) ->
     case systools_relup:appup_search_for_version(Vsn, Instrs) of
diff --git a/lib/sasl/test/Makefile b/lib/sasl/test/Makefile
index 2a782bcf61..ae033ab623 100644
--- a/lib/sasl/test/Makefile
+++ b/lib/sasl/test/Makefile
@@ -35,9 +35,12 @@ MODULES= \
 	systools_rc_SUITE \
 	rb_SUITE \
 	rh_test_lib \
+	otp_vsns
 
 ERL_FILES= $(MODULES:%=%.erl)
 
+EXTRA_FILES= $(ERL_TOP)/otp_versions.table
+
 HRL_FILES= test_lib.hrl
 
 TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
@@ -87,7 +90,7 @@ release_spec: opt
 
 release_tests_spec: make_emakefile
 	$(INSTALL_DIR) "$(RELSYSDIR)"
-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)"
+	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(EXTRA_FILES) "$(RELSYSDIR)"
 	$(INSTALL_DATA) sasl.spec sasl.cover $(EMAKEFILE) "$(RELSYSDIR)"
 	chmod -R u+w "$(RELSYSDIR)"
 	@tar cfh - *_SUITE_data | (cd "$(RELSYSDIR)"; tar xf -)
diff --git a/lib/sasl/test/otp_vsns.erl b/lib/sasl/test/otp_vsns.erl
new file mode 100644
index 0000000000..a70de069ee
--- /dev/null
+++ b/lib/sasl/test/otp_vsns.erl
@@ -0,0 +1,145 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2021. All Rights Reserved.
+%% 
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%% 
+%% %CopyrightEnd%
+%%
+
+-module(otp_vsns).
+
+-export([read_state/0, branch_latest/2, branch_vsns/2, app_vsn/3]).
+
+read_state() ->
+    OtpVsnsTabFile = filename:join([filename:dirname(code:which(?MODULE)),
+                                    "otp_versions.table"]),
+    {ok, OtpVsnsTabData} = file:read_file(OtpVsnsTabFile),
+    lists:foldl(fun (OtpAppVsnsBin, Acc0) ->
+                        [OtpVsnBin
+                        | AppVsnBins] = binary:split(OtpAppVsnsBin,
+                                                     [<<" ">>,
+                                                      <<":">>,
+                                                      <<"#">>],
+                                                     [global, trim_all]),
+                        OtpVsn = mk_vsn(OtpVsnBin),
+                        AppList = lists:map(fun (AppVsnBin) ->
+                                                    AppVsn = mk_vsn(AppVsnBin),
+                                                    {App, _} = AppVsn,
+                                                    {App, AppVsn}
+                                            end,
+                                            AppVsnBins),
+                        AppMap = maps:from_list(AppList),
+                        Acc1 = maps:put(OtpVsn, AppMap, Acc0),
+                        Acc2 = update_branch(OtpVsn, Acc1),
+                        update_branch_versions(OtpVsn, Acc2)
+                end,
+                #{},
+                binary:split(OtpVsnsTabData, <<"\n">>, [global, trim_all])).
+
+branch_latest(State, "maint-" ++ RelStr) ->
+    mk_vsn_str(maps:get({maint, list_to_integer(RelStr)}, State)).
+
+branch_vsns(State, "maint-" ++ RelStr) ->
+    Rel = list_to_integer(RelStr),
+    NrmlVsns = lists:map(fun (V) -> mk_vsn_str(V) end,
+                         maps:get({normal_maint_vsns, Rel}, State)),
+    case maps:get({maint, Rel}, State) of
+        {'OTP', [_, _]} ->
+            NrmlVsns;
+        {'OTP', [_, _, _]} ->
+            NrmlVsns;
+        {'OTP', [_, _, _, _]} = Vsn ->
+            add_branched_vsns(1, Vsn, NrmlVsns)
+    end.
+
+add_branched_vsns(MinorPatch,
+                  {'OTP', [_Major, _Minor, _Patch, MinorPatch]} = Vsn,
+                  VsnStrs) ->
+    [mk_vsn_str(Vsn) | VsnStrs];
+add_branched_vsns(N,
+                  {'OTP', [Major, Minor, Patch, _MinorPatch]} = Vsn,
+                  VsnStrs) ->
+    VsnStr = mk_vsn_str({'OTP', [Major, Minor, Patch, N]}),
+    add_branched_vsns(N+1, Vsn, [VsnStr | VsnStrs]).
+
+app_vsn(State, "OTP-"++OtpVsn, App) ->
+    AppMap = maps:get({'OTP', vsnstr2vsnlist(OtpVsn)}, State),
+    mk_vsn_str(maps:get(list_to_atom(App), AppMap)).
+
+mk_vsn_str({App, Vsn}) ->
+    VsnStr = lists:flatten(lists:join($., lists:map(fun (V) ->
+                                                            integer_to_list(V)
+                                                    end, Vsn))),
+    atom_to_list(App) ++ "-" ++ VsnStr.
+
+mk_vsn(AppVsnBin) ->
+    [AppBin, VsnBin] = binary:split(AppVsnBin, <<"-">>),
+    {binary_to_atom(AppBin), vsnstr2vsnlist(VsnBin)}.
+
+vsnstr2vsnlist(VsnStr) ->
+    lists:map(fun (SV) when is_list(SV) ->
+                      list_to_integer(SV);
+                  (BV) when is_binary(BV) ->
+                      binary_to_integer(BV)
+              end, string:lexemes(VsnStr, ".")).
+
+update_branch({'OTP', [Major, Minor | _] = Vsn} = OtpVsn,
+              VsnMap) when length(Vsn) =< 4 ->
+    Branch = {maint, Major},
+    case maps:get(Branch, VsnMap, undefined) of
+        undefined ->
+            maps:put(Branch, OtpVsn, VsnMap);
+        {'OTP', [Major, OldMinor | _] = OldVsn} ->
+            if OldMinor < Minor ->
+                    maps:put(Branch, OtpVsn, VsnMap);
+               OldMinor > Minor ->
+                    VsnMap;
+               true ->
+                    {Patch, MinorPatch} = get_patch_vsns(Vsn),
+                    {OldPatch, OldMinorPatch} = get_patch_vsns(OldVsn),
+                    if OldPatch < Patch ->
+                            maps:put(Branch, OtpVsn, VsnMap);
+                       OldPatch > Patch ->
+                            VsnMap;
+                       OldMinorPatch < MinorPatch ->
+                            maps:put(Branch, OtpVsn, VsnMap);
+                       true ->
+                            VsnMap
+                    end
+            end
+    end;
+update_branch({'OTP', [_Major, _Minor | _]}, VsnMap) ->
+    VsnMap.
+
+update_branch_versions({'OTP', [Rel | _] = Vsn} = OtpVsn,
+                       VsnMap) when length(Vsn) =< 3 ->
+    %% Save normal versions. Branched versions are added on request
+    %% since we do not know the right branch until all versions has
+    %% been parsed.
+    BranchVsnsKey = {normal_maint_vsns, Rel},
+    OtherOtpVsns = case maps:get(BranchVsnsKey, VsnMap, undefined) of
+                       undefined -> [];
+                       Vsns -> Vsns
+                   end,
+    maps:put(BranchVsnsKey, [OtpVsn|OtherOtpVsns], VsnMap);
+update_branch_versions({'OTP', _}, VsnMap) ->
+    VsnMap.
+
+get_patch_vsns([_Major, _Minor]) ->
+    {0, 0};
+get_patch_vsns([_Major, _Minor, Patch]) ->
+    {Patch, 0};
+get_patch_vsns([_, _, Patch, MinorPatch | _]) ->
+    {Patch, MinorPatch}.
diff --git a/lib/sasl/test/sasl_SUITE.erl b/lib/sasl/test/sasl_SUITE.erl
index dfb2199771..74d002ba5b 100644
--- a/lib/sasl/test/sasl_SUITE.erl
+++ b/lib/sasl/test/sasl_SUITE.erl
@@ -74,8 +74,6 @@ app_test(Config) when is_list(Config) ->
 appup_test(_Config) ->
     appup_tests(sasl,create_test_vsns(sasl)).
 
-appup_tests(_App,{[],[]}) ->
-    {skip,"no previous releases available"};
 appup_tests(App,{OkVsns0,NokVsns}) ->
     application:load(App),
     {_,_,Vsn} = lists:keyfind(App,1,application:loaded_applications()),
@@ -88,8 +86,7 @@ appup_tests(App,{OkVsns0,NokVsns}) ->
 	    OkVsns0 ->
 		OkVsns0;
 	    Ok ->
-		ct:log("Current version, ~p, is same as in previous release.~n"
-		       "Removing this from the list of ok versions.",
+		ct:log("Removed current version ~p from the list of ok versions to test.",
 		      [Vsn]),
 		Ok
 	end,
@@ -104,57 +101,46 @@ appup_tests(App,{OkVsns0,NokVsns}) ->
     ok.
 
 create_test_vsns(App) ->
-    ThisMajor = erlang:system_info(otp_release),
-    FirstMajor = previous_major(ThisMajor),
-    SecondMajor = previous_major(previous_major(FirstMajor)),
-    Ok = app_vsn(App,[ThisMajor,FirstMajor]),
-    Nok0 = app_vsn(App,[SecondMajor]),
+    S = otp_vsns:read_state(),
+    Rel = list_to_integer(erlang:system_info(otp_release)),
+    AppStr = atom_to_list(App),
+    Ok = ok_app_vsns(S, Rel, AppStr),
+    Nok0 = nok_app_vsns(S, Rel, AppStr, hd(Ok)),
     Nok = case Ok of
-	       [Ok1|_] ->
-		   [Ok1 ++ ",1" | Nok0]; % illegal
-	       _ ->
-		   Nok0
-	   end,
-    {Ok,Nok}.
-
-previous_major("17") ->
-    "r16b";
-previous_major("r16b") ->
-    "r15b";
-previous_major(Rel) ->
-    integer_to_list(list_to_integer(Rel)-1).
-
-app_vsn(App,[R|Rs]) ->
-    OldRel =
-	case test_server:is_release_available(R) of
-	    true ->
-		{release,R};
-	    false ->
-		case ct:get_config({otp_releases,list_to_atom(R)}) of
-		    undefined ->
-			false;
-		    Prog0 ->
-			case os:find_executable(Prog0) of
-			    false ->
-				false;
-			    Prog ->
-				{prog,Prog}
-			end
-		end
-	end,
-    case OldRel of
-	false ->
-	    app_vsn(App,Rs);
-	_ ->
-	    {ok,N} = test_server:start_node(prevrel,peer,[{erl,[OldRel]}]),
-	    _ = rpc:call(N,application,load,[App]),
-	    As = rpc:call(N,application,loaded_applications,[]),
-	    {_,_,V} = lists:keyfind(App,1,As),
-	    test_server:stop_node(N),
-	    [V|app_vsn(App,Rs)]
-    end;
-app_vsn(_App,[]) ->
-    [].
+              [Ok1|_] ->
+                  [Ok1 ++ ",1" | Nok0]; % illegal
+              _ ->
+                  Nok0
+          end,
+    {Ok, Nok}.
+
+ok_app_vsns(S, Rel, AppStr) ->
+    AppVsns0 = get_rel_app_vsns(S, Rel-2, AppStr),
+    AppVsns1 = get_rel_app_vsns(S, Rel-1, AppStr),
+    AppVsns2 = try
+                   get_rel_app_vsns(S, Rel, AppStr)
+               catch
+                   _:_ -> []
+               end,
+    lists:usort(AppVsns2 ++ AppVsns1 ++ AppVsns0).
+
+nok_app_vsns(S, Rel, AppStr, EarliestOkVsn) ->
+    AppVsns0 = get_rel_app_vsns(S, Rel-4, AppStr),
+    AppVsns1 = get_rel_app_vsns(S, Rel-3, AppStr),
+    %% Earliest OK version may exist in not OK versions
+    %% as well if there were no application version bump
+    %% between two releases, so we need to remove it
+    %% if that is the case...
+    lists:usort(AppVsns1 ++ AppVsns0) -- EarliestOkVsn.
+
+get_rel_app_vsns(S, Rel, App) ->
+    RelStr = integer_to_list(Rel),
+    OtpVsns = otp_vsns:branch_vsns(S, "maint-"++RelStr),
+    lists:map(fun (OtpVsn) ->
+                      AppVsn = otp_vsns:app_vsn(S, OtpVsn, App),
+                      [_, Vsn] = string:lexemes(AppVsn, "-"),
+                      Vsn
+              end, OtpVsns).
 
 check_appup([Vsn|Vsns],Instrs,Expected) ->
     case systools_relup:appup_search_for_version(Vsn, Instrs) of
diff --git a/lib/stdlib/test/Makefile b/lib/stdlib/test/Makefile
index bda16c263d..fce3869343 100644
--- a/lib/stdlib/test/Makefile
+++ b/lib/stdlib/test/Makefile
@@ -100,8 +100,13 @@ MODULES= \
 	zzz_SUITE
 
 ERTS_MODULES= erts_test_utils
+SASL_MODULES= otp_vsns
 
-ERL_FILES= $(MODULES:%=%.erl) $(ERTS_MODULES:%=$(ERL_TOP)/erts/emulator/test/%.erl)
+ERL_FILES=	$(MODULES:%=%.erl) \
+		$(ERTS_MODULES:%=$(ERL_TOP)/erts/emulator/test/%.erl) \
+		$(SASL_MODULES:%=$(ERL_TOP)/lib/sasl/test/%.erl)
+
+EXTRA_FILES= $(ERL_TOP)/otp_versions.table
 
 # ----------------------------------------------------
 # Release directory specification
@@ -126,7 +131,8 @@ COVERFILE=stdlib.cover
 # ----------------------------------------------------
 
 make_emakefile:
-	$(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) -o$(EBIN) $(MODULES) $(ERTS_MODULES) \
+	$(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) -o$(EBIN) \
+		$(MODULES) $(ERTS_MODULES) $(SASL_MODULES) \
 	> $(EMAKEFILE)
 
 tests debug opt: make_emakefile
@@ -149,7 +155,7 @@ release_spec: opt
 release_tests_spec: make_emakefile
 	$(INSTALL_DIR) "$(RELSYSDIR)"
 	$(INSTALL_DATA) stdlib.spec stdlib_bench.spec error_info.spec $(EMAKEFILE) \
-		$(ERL_FILES) $(COVERFILE) "$(RELSYSDIR)"
+		$(ERL_FILES) $(COVERFILE) $(EXTRA_FILES) "$(RELSYSDIR)"
 	chmod -R u+w "$(RELSYSDIR)"
 	@tar cf - *_SUITE_data property_test | (cd "$(RELSYSDIR)"; tar xf -)
 
diff --git a/lib/stdlib/test/stdlib_SUITE.erl b/lib/stdlib/test/stdlib_SUITE.erl
index b30974cd0f..8a3fa042b0 100644
--- a/lib/stdlib/test/stdlib_SUITE.erl
+++ b/lib/stdlib/test/stdlib_SUITE.erl
@@ -65,8 +65,6 @@ app_test(Config) when is_list(Config) ->
 appup_test(_Config) ->
     appup_tests(stdlib,create_test_vsns(stdlib)).
 
-appup_tests(_App,{[],[]}) ->
-    {skip,"no previous releases available"};
 appup_tests(App,{OkVsns0,NokVsns}) ->
     application:load(App),
     {_,_,Vsn} = lists:keyfind(App,1,application:loaded_applications()),
@@ -79,8 +77,7 @@ appup_tests(App,{OkVsns0,NokVsns}) ->
 	    OkVsns0 ->
 		OkVsns0;
 	    Ok ->
-		ct:log("Current version, ~p, is same as in previous release.~n"
-		       "Removing this from the list of ok versions.",
+		ct:log("Removed current version ~p from the list of ok versions to test.",
 		      [Vsn]),
 		Ok
 	end,
@@ -95,57 +92,46 @@ appup_tests(App,{OkVsns0,NokVsns}) ->
     ok.
 
 create_test_vsns(App) ->
-    ThisMajor = erlang:system_info(otp_release),
-    FirstMajor = previous_major(ThisMajor),
-    SecondMajor = previous_major(previous_major(FirstMajor)),
-    Ok = app_vsn(App,[ThisMajor,FirstMajor]),
-    Nok0 = app_vsn(App,[SecondMajor]),
+    S = otp_vsns:read_state(),
+    Rel = list_to_integer(erlang:system_info(otp_release)),
+    AppStr = atom_to_list(App),
+    Ok = ok_app_vsns(S, Rel, AppStr),
+    Nok0 = nok_app_vsns(S, Rel, AppStr, hd(Ok)),
     Nok = case Ok of
-	       [Ok1|_] ->
-		   [Ok1 ++ ",1" | Nok0]; % illegal
-	       _ ->
-		   Nok0
-	   end,
-    {Ok,Nok}.
-
-previous_major("17") ->
-    "r16b";
-previous_major("r16b") ->
-    "r15b";
-previous_major(Rel) ->
-    integer_to_list(list_to_integer(Rel)-1).
-
-app_vsn(App,[R|Rs]) ->
-    OldRel =
-	case test_server:is_release_available(R) of
-	    true ->
-		{release,R};
-	    false ->
-		case ct:get_config({otp_releases,list_to_atom(R)}) of
-		    undefined ->
-			false;
-		    Prog0 ->
-			case os:find_executable(Prog0) of
-			    false ->
-				false;
-			    Prog ->
-				{prog,Prog}
-			end
-		end
-	end,
-    case OldRel of
-	false ->
-	    app_vsn(App,Rs);
-	_ ->
-	    {ok,N} = test_server:start_node(prevrel,peer,[{erl,[OldRel]}]),
-	    _ = rpc:call(N,application,load,[App]),
-	    As = rpc:call(N,application,loaded_applications,[]),
-	    {_,_,V} = lists:keyfind(App,1,As),
-	    test_server:stop_node(N),
-	    [V|app_vsn(App,Rs)]
-    end;
-app_vsn(_App,[]) ->
-    [].
+              [Ok1|_] ->
+                  [Ok1 ++ ",1" | Nok0]; % illegal
+              _ ->
+                  Nok0
+          end,
+    {Ok, Nok}.
+
+ok_app_vsns(S, Rel, AppStr) ->
+    AppVsns0 = get_rel_app_vsns(S, Rel-2, AppStr),
+    AppVsns1 = get_rel_app_vsns(S, Rel-1, AppStr),
+    AppVsns2 = try
+                   get_rel_app_vsns(S, Rel, AppStr)
+               catch
+                   _:_ -> []
+               end,
+    lists:usort(AppVsns2 ++ AppVsns1 ++ AppVsns0).
+
+nok_app_vsns(S, Rel, AppStr, EarliestOkVsn) ->
+    AppVsns0 = get_rel_app_vsns(S, Rel-4, AppStr),
+    AppVsns1 = get_rel_app_vsns(S, Rel-3, AppStr),
+    %% Earliest OK version may exist in not OK versions
+    %% as well if there were no application version bump
+    %% between two releases, so we need to remove it
+    %% if that is the case...
+    lists:usort(AppVsns1 ++ AppVsns0) -- EarliestOkVsn.
+
+get_rel_app_vsns(S, Rel, App) ->
+    RelStr = integer_to_list(Rel),
+    OtpVsns = otp_vsns:branch_vsns(S, "maint-"++RelStr),
+    lists:map(fun (OtpVsn) ->
+                      AppVsn = otp_vsns:app_vsn(S, OtpVsn, App),
+                      [_, Vsn] = string:lexemes(AppVsn, "-"),
+                      Vsn
+              end, OtpVsns).
 
 check_appup([Vsn|Vsns],Instrs,Expected) ->
     case systools_relup:appup_search_for_version(Vsn, Instrs) of
-- 
2.31.1

Places

File 1908-Adjust-appup-tests-in-sasl-kernel-stdlib.patch of Package erlang (Revision 3713767a038ae3acd54a990b0e65a761)

Places