aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2014-09-29 08:59:55 +0200
committerErlang/OTP <[email protected]>2014-09-29 08:59:55 +0200
commit395ca428a46b550162b65308aa5c6acc1351ac32 (patch)
tree430c6b081f540c055af4883b8e024c638d180255 /lib/stdlib
parent2b9c37facb2cad36d5bc6ced4ed4a3a4b2c3f09c (diff)
parent201b95c1fe992be2c7fdb6759a7e490105fdf510 (diff)
downloadotp-395ca428a46b550162b65308aa5c6acc1351ac32.tar.gz
otp-395ca428a46b550162b65308aa5c6acc1351ac32.tar.bz2
otp-395ca428a46b550162b65308aa5c6acc1351ac32.zip
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
Diffstat (limited to 'lib/stdlib')
-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.