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

5 files changed, 25 insertions, 25 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).
 
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).
 
diff --git a/lib/stdlib/test/stdlib_SUITE.erl b/lib/stdlib/test/stdlib_SUITE.erl
index 53a34511d9..59821220b4 100644
--- a/lib/stdlib/test/stdlib_SUITE.erl
+++ b/lib/stdlib/test/stdlib_SUITE.erl
@@ -94,10 +94,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|_] ->
@@ -108,9 +108,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).
 
diff --git a/lib/test_server/src/test_server_node.erl b/lib/test_server/src/test_server_node.erl
index 582abb2153..acd47788db 100644
--- a/lib/test_server/src/test_server_node.erl
+++ b/lib/test_server/src/test_server_node.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2002-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2014. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -653,7 +653,7 @@ find_rel_linux(Rel) ->
     end.
 
 find_rel_suse(Rel, SuseRel) ->
-    Root = "/usr/local/otp/releases/otp_beam_linux_sles",
+    Root = "/usr/local/otp/releases/sles",
     case SuseRel of
 	"11" ->
 	    %% Try both SuSE 11, SuSE 10 and SuSe 9 in that order.
@@ -673,10 +673,10 @@ find_rel_suse(Rel, SuseRel) ->
 find_rel_suse_1(Rel, RootWc) ->
     case erlang:system_info(wordsize) of
 	4 ->
-	    find_rel_suse_2(Rel, RootWc++"_i386");
+	    find_rel_suse_2(Rel, RootWc++"_32");
 	8 ->
-	    find_rel_suse_2(Rel, RootWc++"_x64") ++
-		find_rel_suse_2(Rel, RootWc++"_i386")
+	    find_rel_suse_2(Rel, RootWc++"_64") ++
+		find_rel_suse_2(Rel, RootWc++"_32")
     end.
 
 find_rel_suse_2(Rel, RootWc) ->