diff options
author | Siri Hansen <[email protected]> | 2014-04-22 12:10:51 +0200 |
---|---|---|
committer | Siri Hansen <[email protected]> | 2014-04-22 12:10:51 +0200 |
commit | 5ce2b6588eb2a237e757265a83de28d997a13c3d (patch) | |
tree | 0402898c0e421634af657322bf1e6f4e5f576724 /lib/sasl/test/systools_SUITE.erl | |
parent | ed1c35ea483db86d208335f43565026b12c426d6 (diff) | |
parent | 710a1fa0c47eb7bfd1047bb6f8538c8a0fd20e62 (diff) | |
download | otp-5ce2b6588eb2a237e757265a83de28d997a13c3d.tar.gz otp-5ce2b6588eb2a237e757265a83de28d997a13c3d.tar.bz2 otp-5ce2b6588eb2a237e757265a83de28d997a13c3d.zip |
Merge branch 'siri/cuddle-with-tests' into maint
* siri/cuddle-with-tests:
[reltool] Adapt tests to better quoting of paths on windows
[reltool] Increase timetrap timeout to handle slow test machines
Skip test when needed applications are missing
Don't allow slave nodes to survive their test case
Diffstat (limited to 'lib/sasl/test/systools_SUITE.erl')
-rw-r--r-- | lib/sasl/test/systools_SUITE.erl | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/lib/sasl/test/systools_SUITE.erl b/lib/sasl/test/systools_SUITE.erl index 1d3a71e94e..49a4303e0b 100644 --- a/lib/sasl/test/systools_SUITE.erl +++ b/lib/sasl/test/systools_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2012-2013. All Rights Reserved. +%% Copyright Ericsson AB 2012-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 @@ -1615,9 +1615,19 @@ no_sasl_relup(Config) when is_list(Config) -> %% make_relup: Check that application start type is used in relup app_start_type_relup(Config) when is_list(Config) -> + %% This might fail if some applications are not available, if so + %% skip the test case. + try create_script(latest_app_start_type2,Config) of + {Dir2,Name2} -> + app_start_type_relup(Dir2,Name2,Config) + catch throw:{error,Reason} -> + {skip,Reason} + end. + +app_start_type_relup(Dir2,Name2,Config) -> PrivDir = ?config(priv_dir, Config), {Dir1,Name1} = create_script(latest_app_start_type1,Config), - {Dir2,Name2} = create_script(latest_app_start_type2,Config), + Release1 = filename:join(Dir1,Name1), Release2 = filename:join(Dir2,Name2), @@ -2242,9 +2252,13 @@ app_vsns(AppVsns) -> [{App,app_vsn(App,Vsn)} || {App,Vsn} <- AppVsns] ++ [{App,app_vsn(App,Vsn),Type} || {App,Vsn,Type} <- AppVsns]. app_vsn(App,current) -> - application:load(App), - {ok,Vsn} = application:get_key(App,vsn), - Vsn; + case application:load(App) of + Ok when Ok==ok; Ok=={error,{already_loaded,App}} -> + {ok,Vsn} = application:get_key(App,vsn), + Vsn; + Error -> + throw(Error) + end; app_vsn(_App,Vsn) -> Vsn. |