aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel/test
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2014-04-22 15:29:02 +0200
committerSiri Hansen <[email protected]>2014-04-23 14:29:30 +0200
commit5e1cfb2f2a296778c400c4afd47571bceb86d4ca (patch)
tree7b0778be09f6b52480f9ec85cd1057bcea385f13 /lib/kernel/test
parent53ec5bcc10a71e792f5a64491302d84faec4e30c (diff)
downloadotp-5e1cfb2f2a296778c400c4afd47571bceb86d4ca.tar.gz
otp-5e1cfb2f2a296778c400c4afd47571bceb86d4ca.tar.bz2
otp-5e1cfb2f2a296778c400c4afd47571bceb86d4ca.zip
Update kernel, stdlib and sasl appup tests
Add test of update instructions from current major to current minor. Earlier only previous major to current was tested.
Diffstat (limited to 'lib/kernel/test')
-rw-r--r--lib/kernel/test/kernel_SUITE.erl12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/kernel/test/kernel_SUITE.erl b/lib/kernel/test/kernel_SUITE.erl
index 78f5e93fc3..1884e8cf58 100644
--- a/lib/kernel/test/kernel_SUITE.erl
+++ b/lib/kernel/test/kernel_SUITE.erl
@@ -95,10 +95,10 @@ appup_tests(App,{OkVsns,NokVsns}) ->
ok.
create_test_vsns(App) ->
- This = erlang:system_info(otp_release),
- FirstMajor = previous_major(This),
+ ThisMajor = erlang:system_info(otp_release),
+ FirstMajor = previous_major(ThisMajor),
SecondMajor = previous_major(FirstMajor),
- Ok = app_vsn(App,[FirstMajor]),
+ Ok = app_vsn(App,[ThisMajor,FirstMajor]),
Nok0 = app_vsn(App,[SecondMajor]),
Nok = case Ok of
[Ok1|_] ->
@@ -109,9 +109,9 @@ create_test_vsns(App) ->
{Ok,Nok}.
previous_major("17") ->
- "r16";
-previous_major("r"++Rel) ->
- "r"++previous_major(Rel);
+ "r16b";
+previous_major("r16b") ->
+ "r15b";
previous_major(Rel) ->
integer_to_list(list_to_integer(Rel)-1).