diff options
| author | Siri Hansen <[email protected]> | 2014-09-25 10:05:50 +0200 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2014-09-25 10:05:50 +0200 |
| commit | 201b95c1fe992be2c7fdb6759a7e490105fdf510 (patch) | |
| tree | 4ecbdea0e8a3081bd379113a999607242ae552a2 /lib/stdlib | |
| parent | 743ed31108ee555db18d9833186865e85e34333e (diff) | |
| download | otp-201b95c1fe992be2c7fdb6759a7e490105fdf510.tar.gz otp-201b95c1fe992be2c7fdb6759a7e490105fdf510.tar.bz2 otp-201b95c1fe992be2c7fdb6759a7e490105fdf510.zip | |
Do not test appup of core apps for upgrade from current vsn
The appup tests for kernel, stdlib and sasl tests that the appup file
allows upgrade from the previous and current major release to the
current release. If, in the current release, the application version
was not changed compared to the previous release, then we would still
test that the appup supported the upgrade (i.e. from current release
to current release). This is now changed, in order to avoid test
failures on patch releases where kernel, stdlib and sasl are not
changed.
Diffstat (limited to 'lib/stdlib')
| -rw-r--r-- | lib/stdlib/test/stdlib_SUITE.erl | 18 |
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. |