Update appups and appup tests for kernel, stdlib and sasl

Appups now only support one major release back, and the tests are
updated accordingly.

Support is also added in tests for giving previous releases in a ct
config file, e.g.

{otp_releases,[{r15,"/path/to/r15/bin/erl"},
	       {r16,"/path/to/r16/bin/erl"},
	       {'17',"/path/to/17/bin/erl"}]}.

2 files changed, 45 insertions, 30 deletions

diff --git a/lib/stdlib/src/stdlib.appup.src b/lib/stdlib/src/stdlib.appup.src
index 749a9a4201..22eefb2514 100644
--- a/lib/stdlib/src/stdlib.appup.src
+++ b/lib/stdlib/src/stdlib.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\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R17
-  {<<"1\\.19(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R16
-  {<<"1\\.18(\\.[0-9]+)*">>,[restart_new_emulator]}],%% R15
- %% Down to - max two major revisions back
+  {<<"1\\.19(\\.[0-9]+)*">>,[restart_new_emulator]}],%% R16
+ %% Down to - max one major revision back
  [{<<"2\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R17
-  {<<"1\\.19(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R16
-  {<<"1\\.18(\\.[0-9]+)*">>,[restart_new_emulator]}] %% R15
+  {<<"1\\.19(\\.[0-9]+)*">>,[restart_new_emulator]}] %% R16
 }.
diff --git a/lib/stdlib/test/stdlib_SUITE.erl b/lib/stdlib/test/stdlib_SUITE.erl
index 8fff5e2e05..b0d6913636 100644
--- a/lib/stdlib/test/stdlib_SUITE.erl
+++ b/lib/stdlib/test/stdlib_SUITE.erl
@@ -25,7 +25,6 @@
 
 % Default timetrap timeout (set in init_per_testcase).
 -define(default_timeout, ?t:minutes(1)).
--define(application, stdlib).
 
 % Test server specific exports
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
@@ -78,17 +77,18 @@ app_test(Config) when is_list(Config) ->
     ?t:app_test(stdlib),
     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(stdlib,create_test_vsns(stdlib)).
 
-do_appup_tests({[],[]}) ->
+appup_tests(_App,{[],[]}) ->
     {skip,"no previous releases available"};
-do_appup_tests({OkVsns,NokVsns}) ->
-    application:load(stdlib),
-    {_,_,Vsn} = lists:keyfind(stdlib,1,application:loaded_applications()),
-    AppupFile = filename:join([code:lib_dir(stdlib),ebin,"stdlib.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]),
@@ -99,13 +99,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 = stdlib_vsn([FirstMajor,SecondMajor]),
-    Nok0 = stdlib_vsn([ThirdMajor]),
+    Ok = app_vsn(App,[FirstMajor]),
+    Nok0 = app_vsn(App,[SecondMajor]),
     Nok = case Ok of
 	       [Ok1|_] ->
 		   [Ok1 ++ ",1" | Nok0]; % illegal
@@ -121,18 +120,36 @@ previous_major("r"++Rel) ->
 previous_major(Rel) ->
     integer_to_list(list_to_integer(Rel)-1).
 
-stdlib_vsn([R|Rs]) ->
-    case test_server:is_release_available(R) of
-	true ->
-	    {ok,N} = test_server:start_node(prevrel,peer,[{erl,[{release,R}]}]),
-	    As = rpc:call(N,application,which_applications,[]),
-	    {_,_,KV} = lists:keyfind(stdlib,1,As),
-	    test_server:stop_node(N),
-	    [KV|stdlib_vsn(Rs)];
+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 ->
-	    stdlib_vsn(Rs)
+	    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;
-stdlib_vsn([]) ->
+app_vsn(_App,[]) ->
     [].
 
 check_appup([Vsn|Vsns],Instrs,Expected) ->