1 files changed, 43 insertions, 37 deletions

diff --git a/lib/stdlib/test/stdlib_SUITE.erl b/lib/stdlib/test/stdlib_SUITE.erl
index 8a2cb5ea6b..8fff5e2e05 100644
--- a/lib/stdlib/test/stdlib_SUITE.erl
+++ b/lib/stdlib/test/stdlib_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1997-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
@@ -81,53 +81,59 @@ app_test(Config) when is_list(Config) ->
 %% Test that appup allows upgrade from/downgrade to a maximum of two
 %% major releases back.
 appup_test(_Config) ->
+    do_appup_tests(create_test_vsns()).
+
+do_appup_tests({[],[]}) ->
+    {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"]),
     {ok,[{Vsn,UpFrom,DownTo}=AppupScript]} = file:consult(AppupFile),
     ct:log("~p~n",[AppupScript]),
-    {OkVsns,NokVsns} = create_test_vsns(Vsn),
+    ct:log("Testing ok versions: ~p~n",[OkVsns]),
     check_appup(OkVsns,UpFrom,{ok,[restart_new_emulator]}),
     check_appup(OkVsns,DownTo,{ok,[restart_new_emulator]}),
+    ct:log("Testing not ok versions: ~p~n",[NokVsns]),
     check_appup(NokVsns,UpFrom,error),
     check_appup(NokVsns,DownTo,error),
     ok.
 
-create_test_vsns(Current) ->
-    [XStr,YStr|Rest] = string:tokens(Current,"."),
-    X = list_to_integer(XStr),
-    Y = list_to_integer(YStr),
-    SecondMajor = vsn(X,Y-2),
-    SecondMinor = SecondMajor ++ ".1.3",
-    FirstMajor = vsn(X,Y-1),
-    FirstMinor = FirstMajor ++ ".57",
-    ThisMajor = vsn(X,Y),
-    This =
-	case Rest of
-	    [] ->
-		[];
-	    ["1"] ->
-		[ThisMajor];
-	    _ ->
-		ThisMinor = ThisMajor ++ ".1",
-		[ThisMajor,ThisMinor]
-	end,
-    OkVsns = This ++ [FirstMajor, FirstMinor, SecondMajor, SecondMinor],
-
-    ThirdMajor = vsn(X,Y-3),
-    ThirdMinor = ThirdMajor ++ ".10.12",
-    Illegal = ThisMajor ++ ",1",
-    Newer1Major = vsn(X,Y+1),
-    Newer1Minor = Newer1Major ++ ".1",
-    Newer2Major = ThisMajor ++ "1",
-    NokVsns = [ThirdMajor,ThirdMinor,
-	       Illegal,
-	       Newer1Major,Newer1Minor,
-	       Newer2Major],
-    {OkVsns,NokVsns}.
-
-vsn(X,Y) ->
-    integer_to_list(X) ++ "." ++ integer_to_list(Y).
+create_test_vsns() ->
+    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]),
+    Nok = case Ok of
+	       [Ok1|_] ->
+		   [Ok1 ++ ",1" | Nok0]; % illegal
+	       _ ->
+		   Nok0
+	   end,
+    {Ok,Nok}.
+
+previous_major("17") ->
+    "r16";
+previous_major("r"++Rel) ->
+    "r"++previous_major(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)];
+	false ->
+	    stdlib_vsn(Rs)
+    end;
+stdlib_vsn([]) ->
+    [].
 
 check_appup([Vsn|Vsns],Instrs,Expected) ->
     case systools_relup:appup_search_for_version(Vsn, Instrs) of