aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib/test
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2014-09-30 09:39:51 +0200
committerHenrik Nord <[email protected]>2014-09-30 09:39:51 +0200
commit88d5c0edbd08e069bc20cf13fa90bca59eb43e86 (patch)
treebef481b72ffa142b7a9fb1ee9e5be969e3e7093e /lib/stdlib/test
parent6b240f6d882a10707ff2dea4e171a2d9599b3746 (diff)
parentee24a87a779d8d10461cadd47b3eb276e70baef8 (diff)
downloadotp-88d5c0edbd08e069bc20cf13fa90bca59eb43e86.tar.gz
otp-88d5c0edbd08e069bc20cf13fa90bca59eb43e86.tar.bz2
otp-88d5c0edbd08e069bc20cf13fa90bca59eb43e86.zip
Merge branch 'maint-17' into maint
Conflicts: OTP_VERSION lib/ssh/test/ssh_connection_SUITE.erl
Diffstat (limited to 'lib/stdlib/test')
-rw-r--r--lib/stdlib/test/stdlib_SUITE.erl18
1 files changed, 15 insertions, 3 deletions
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.