aboutsummaryrefslogtreecommitdiffstats
path: root/lib/test_server/src
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/test_server/src
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/test_server/src')
-rw-r--r--lib/test_server/src/test_server_node.erl10
1 files changed, 5 insertions, 5 deletions
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) ->