Merge branch 'siri/appup_tests_17/OTP-11534'

* siri/appup_tests_17/OTP-11534:
  Update sasl/test/test_lib.hrl with recent versions of kernel and stdlib
  Update appups and appup tests for kernel, stdlib and sasl

3 files changed, 46 insertions, 32 deletions

diff --git a/lib/sasl/src/sasl.appup.src b/lib/sasl/src/sasl.appup.src
index 0c4d80a74f..e789853eea 100644
--- a/lib/sasl/src/sasl.appup.src
+++ b/lib/sasl/src/sasl.appup.src
@@ -1,7 +1,7 @@
 %% -*- erlang -*-
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2013. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2014. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -16,12 +16,10 @@
 %%
 %% %CopyrightEnd%
 {"%VSN%",
- %% Up from - max two major revisions back
+ %% Up from - max one major revision back
  [{<<"2\\.4(\\.[0-9]+)*">>,[restart_new_emulator]},         %% R17
-  {<<"2\\.3(\\.[0-9]+)*">>,[restart_new_emulator]},         %% R16
-  {<<"2\\.2(\\.[0-9]+)*">>,[restart_new_emulator]}],        %% R15
- %% Down to - max two major revisions back
+  {<<"2\\.3(\\.[0-9]+)*">>,[restart_new_emulator]}],        %% R16
+ %% Down to - max one major revision back
  [{<<"2\\.4(\\.[0-9]+)*">>,[restart_new_emulator]},         %% R17
-  {<<"2\\.3(\\.[0-9]+)*">>,[restart_new_emulator]},         %% R16
-  {<<"2\\.2(\\.[0-9]+)*">>,[restart_new_emulator]}]         %% R15
+  {<<"2\\.3(\\.[0-9]+)*">>,[restart_new_emulator]}]         %% R16
 }.
diff --git a/lib/sasl/test/sasl_SUITE.erl b/lib/sasl/test/sasl_SUITE.erl
index e799230338..ad63a31cbd 100644
--- a/lib/sasl/test/sasl_SUITE.erl
+++ b/lib/sasl/test/sasl_SUITE.erl
@@ -22,7 +22,6 @@
 
 %% Default timetrap timeout (set in init_per_testcase).
 -define(default_timeout, ?t:minutes(1)).
--define(application, sasl).
 
 %% Test server specific exports
 -export([all/0,groups/0,init_per_group/2,end_per_group/2]).
@@ -58,17 +57,18 @@ app_test(Config) when is_list(Config) ->
     ?t:app_test(sasl, allow),
     ok.
 
-%% Test that appup allows upgrade from/downgrade to a maximum of two
-%% major releases back.
+%% Test that appup allows upgrade from/downgrade to a maximum of one
+%% major release back.
 appup_test(_Config) ->
-    do_appup_tests(create_test_vsns()).
+    appup_tests(sasl,create_test_vsns(sasl)).
 
-do_appup_tests({[],[]}) ->
+appup_tests(_App,{[],[]}) ->
     {skip,"no previous releases available"};
-do_appup_tests({OkVsns,NokVsns}) ->
-    application:load(sasl),
-    {_,_,Vsn} = lists:keyfind(sasl,1,application:loaded_applications()),
-    AppupFile = filename:join([code:lib_dir(sasl),ebin,"sasl.appup"]),
+appup_tests(App,{OkVsns,NokVsns}) ->
+    application:load(App),
+    {_,_,Vsn} = lists:keyfind(App,1,application:loaded_applications()),
+    AppupFileName = atom_to_list(App) ++ ".appup",
+    AppupFile = filename:join([code:lib_dir(App),ebin,AppupFileName]),
     {ok,[{Vsn,UpFrom,DownTo}=AppupScript]} = file:consult(AppupFile),
     ct:log("~p~n",[AppupScript]),
     ct:log("Testing ok versions: ~p~n",[OkVsns]),
@@ -79,13 +79,12 @@ do_appup_tests({OkVsns,NokVsns}) ->
     check_appup(NokVsns,DownTo,error),
     ok.
 
-create_test_vsns() ->
+create_test_vsns(App) ->
     This = erlang:system_info(otp_release),
     FirstMajor = previous_major(This),
     SecondMajor = previous_major(FirstMajor),
-    ThirdMajor = previous_major(SecondMajor),
-    Ok = sasl_vsn([FirstMajor,SecondMajor]),
-    Nok0 = sasl_vsn([ThirdMajor]),
+    Ok = app_vsn(App,[FirstMajor]),
+    Nok0 = app_vsn(App,[SecondMajor]),
     Nok = case Ok of
 	       [Ok1|_] ->
 		   [Ok1 ++ ",1" | Nok0]; % illegal
@@ -101,19 +100,36 @@ previous_major("r"++Rel) ->
 previous_major(Rel) ->
     integer_to_list(list_to_integer(Rel)-1).
 
-sasl_vsn([R|Rs]) ->
-    case test_server:is_release_available(R) of
-	true ->
-	    {ok,N} = test_server:start_node(prevrel,peer,[{erl,[{release,R}]}]),
-	    _ = rpc:call(N,application,load,[sasl]),
+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(sasl,1,As),
+	    {_,_,V} = lists:keyfind(App,1,As),
 	    test_server:stop_node(N),
-	    [V|sasl_vsn(Rs)];
-	false ->
-	    sasl_vsn(Rs)
+	    [V|app_vsn(App,Rs)]
     end;
-sasl_vsn([]) ->
+app_vsn(_App,[]) ->
     [].
 
 check_appup([Vsn|Vsns],Instrs,Expected) ->
diff --git a/lib/sasl/test/test_lib.hrl b/lib/sasl/test/test_lib.hrl
index 37aa44c198..c8a4e92f24 100644
--- a/lib/sasl/test/test_lib.hrl
+++ b/lib/sasl/test/test_lib.hrl
@@ -1,3 +1,3 @@
 -define(ertsvsn,"4.4").
--define(kernelvsn,"2.15.3").
--define(stdlibvsn,"1.18.3").
+-define(kernelvsn,"2.16.4").
+-define(stdlibvsn,"1.19.4").