Merge branch 'siri/dont-check-appup-from-current-vsn' into maint-17

* siri/dont-check-appup-from-current-vsn:
  Do not test appup of core apps for upgrade from current vsn

3 files changed, 45 insertions, 9 deletions

diff --git a/lib/kernel/test/kernel_SUITE.erl b/lib/kernel/test/kernel_SUITE.erl
index 1884e8cf58..613efeeb2f 100644
--- a/lib/kernel/test/kernel_SUITE.erl
+++ b/lib/kernel/test/kernel_SUITE.erl
@@ -79,17 +79,29 @@ appup_test(_Config) ->
 
 appup_tests(_App,{[],[]}) ->
     {skip,"no previous releases available"};
-appup_tests(App,{OkVsns,NokVsns}) ->
+appup_tests(App,{OkVsns0,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]),
+    OkVsns =
+	case OkVsns0 -- [Vsn] of
+	    OkVsns0 ->
+		OkVsns0;
+	    Ok ->
+		ct:log("Current version, ~p, is same as in previous release.~n"
+		       "Removing this from the list of ok versions.",
+		      [Vsn]),
+		Ok
+	end,
+    ct:log("Testing that appup allows upgrade from these 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]),
+    ct:log("Testing that appup does not allow upgrade from these versions: ~p~n",
+	   [NokVsns]),
     check_appup(NokVsns,UpFrom,error),
     check_appup(NokVsns,DownTo,error),
     ok.
diff --git a/lib/sasl/test/sasl_SUITE.erl b/lib/sasl/test/sasl_SUITE.erl
index e91d220daf..d7b99d506e 100644
--- a/lib/sasl/test/sasl_SUITE.erl
+++ b/lib/sasl/test/sasl_SUITE.erl
@@ -57,17 +57,29 @@ appup_test(_Config) ->
 
 appup_tests(_App,{[],[]}) ->
     {skip,"no previous releases available"};
-appup_tests(App,{OkVsns,NokVsns}) ->
+appup_tests(App,{OkVsns0,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]),
+    OkVsns =
+	case OkVsns0 -- [Vsn] of
+	    OkVsns0 ->
+		OkVsns0;
+	    Ok ->
+		ct:log("Current version, ~p, is same as in previous release.~n"
+		       "Removing this from the list of ok versions.",
+		      [Vsn]),
+		Ok
+	end,
+    ct:log("Testing that appup allows upgrade from these 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]),
+    ct:log("Testing that appup does not allow upgrade from these versions: ~p~n",
+	   [NokVsns]),
     check_appup(NokVsns,UpFrom,error),
     check_appup(NokVsns,DownTo,error),
     ok.
diff --git a/lib/stdlib/test/stdlib_SUITE.erl b/lib/stdlib/test/stdlib_SUITE.erl
index 59821220b4..3d09bd27ff 100644
--- a/lib/stdlib/test/stdlib_SUITE.erl
+++ b/lib/stdlib/test/stdlib_SUITE.erl
@@ -78,17 +78,29 @@ appup_test(_Config) ->
 
 appup_tests(_App,{[],[]}) ->
     {skip,"no previous releases available"};
-appup_tests(App,{OkVsns,NokVsns}) ->
+appup_tests(App,{OkVsns0,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]),
+    OkVsns =
+	case OkVsns0 -- [Vsn] of
+	    OkVsns0 ->
+		OkVsns0;
+	    Ok ->
+		ct:log("Current version, ~p, is same as in previous release.~n"
+		       "Removing this from the list of ok versions.",
+		      [Vsn]),
+		Ok
+	end,
+    ct:log("Testing that appup allows upgrade from these 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]),
+    ct:log("Testing that appup does not allow upgrade from these versions: ~p~n",
+	   [NokVsns]),
     check_appup(NokVsns,UpFrom,error),
     check_appup(NokVsns,DownTo,error),
     ok.