From 3374b8e20dfafe357dfc6c82adb7357c39b18d86 Mon Sep 17 00:00:00 2001
From: Siri Hansen <siri@erlang.org>
Date: Wed, 12 Feb 2014 15:04:02 +0100
Subject: 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"}]}.
---
 lib/sasl/test/sasl_SUITE.erl | 62 ++++++++++++++++++++++++++++----------------
 1 file changed, 39 insertions(+), 23 deletions(-)

(limited to 'lib/sasl/test')

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) ->
-- 
cgit v1.2.3


From 69bb84dfd1ac198f1ddc6998ce039e8e88ffdd18 Mon Sep 17 00:00:00 2001
From: Siri Hansen <siri@erlang.org>
Date: Mon, 17 Feb 2014 16:34:43 +0100
Subject: Update sasl/test/test_lib.hrl with recent versions of kernel and
 stdlib

---
 lib/sasl/test/test_lib.hrl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/sasl/test')

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").
-- 
cgit v1.2.3