aboutsummaryrefslogtreecommitdiffstats
path: root/lib/sasl
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2014-05-09 10:17:16 +0200
committerSiri Hansen <[email protected]>2014-05-09 10:17:16 +0200
commitc5979e269c01789546f03660930e3991ee1037b8 (patch)
treee210087a8b2c2a3e97e50c3a6dac66298c424f83 /lib/sasl
parente65c7bf107ecb07baa37bc15b83ad70392eae25b (diff)
parent74e9bb75f2e1014cf46b58d6696eb70eb3e7b201 (diff)
downloadotp-c5979e269c01789546f03660930e3991ee1037b8.tar.gz
otp-c5979e269c01789546f03660930e3991ee1037b8.tar.bz2
otp-c5979e269c01789546f03660930e3991ee1037b8.zip
Merge branch 'siri/cuddle-with-tests' into maint
* siri/cuddle-with-tests: Fix regexp in release_handler test so versions are correctly replaced Update kernel, stdlib and sasl appup tests Minor update to test_server for finding old releases
Diffstat (limited to 'lib/sasl')
-rw-r--r--lib/sasl/test/release_handler_SUITE.erl4
-rw-r--r--lib/sasl/test/sasl_SUITE.erl12
2 files changed, 8 insertions, 8 deletions
diff --git a/lib/sasl/test/release_handler_SUITE.erl b/lib/sasl/test/release_handler_SUITE.erl
index 8a635796b7..bd7414fbb4 100644
--- a/lib/sasl/test/release_handler_SUITE.erl
+++ b/lib/sasl/test/release_handler_SUITE.erl
@@ -2292,8 +2292,8 @@ create_p1g(Conf,TargetDir) ->
ok.
fix_version(SystemLib,App) ->
- FromVsn = vsn(App,current),
- ToVsn = vsn(App,old),
+ FromVsn = re:replace(vsn(App,current),"\\.","\\\\.",[{return,binary}]),
+ ToVsn = re:replace(vsn(App,old),"\\.","\\\\.",[{return,binary}]),
Rootname = filename:join([SystemLib,app_dir(App,old),ebin,atom_to_list(App)]),
AppFile = Rootname ++ ".app",
diff --git a/lib/sasl/test/sasl_SUITE.erl b/lib/sasl/test/sasl_SUITE.erl
index f4455f7e9b..e91d220daf 100644
--- a/lib/sasl/test/sasl_SUITE.erl
+++ b/lib/sasl/test/sasl_SUITE.erl
@@ -73,10 +73,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|_] ->
@@ -87,9 +87,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).