aboutsummaryrefslogtreecommitdiffstats
path: root/lib/reltool/test/reltool_test_lib.erl
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2010-04-28 04:53:39 +0000
committerErlang/OTP <[email protected]>2010-04-28 04:53:39 +0000
commit39e5ca57147c08502806f873c107c77e197a78ab (patch)
tree91e8cad7d4b2e340c1dd8389b693be20fbb50f87 /lib/reltool/test/reltool_test_lib.erl
parent9658ff5a3b14bf3189986682023c614077d32143 (diff)
parente57e7f332fcf9ea26a7f7536b18a24181b680463 (diff)
downloadotp-39e5ca57147c08502806f873c107c77e197a78ab.tar.gz
otp-39e5ca57147c08502806f873c107c77e197a78ab.tar.bz2
otp-39e5ca57147c08502806f873c107c77e197a78ab.zip
Merge branch 'hawk/reltool' into dev
* hawk/reltool: Make some cleanups Ensure that {error, Reason} is returned even when server dies Introduced a new embedded_app_type option Removed spurious CDATA in documentation Automatically include applications that must be started Add app test SUITE Add app and appup files to reltool Add function to return status about the configuration Improved handling of applications explicitly included releases Created escript for simplified usage from makefiles OTP-8590 hawk/reltool
Diffstat (limited to 'lib/reltool/test/reltool_test_lib.erl')
-rw-r--r--lib/reltool/test/reltool_test_lib.erl14
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/reltool/test/reltool_test_lib.erl b/lib/reltool/test/reltool_test_lib.erl
index 25978294ee..5390b0a75e 100644
--- a/lib/reltool/test/reltool_test_lib.erl
+++ b/lib/reltool/test/reltool_test_lib.erl
@@ -1,19 +1,19 @@
%%
%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2009. All Rights Reserved.
-%%
+%%
+%% Copyright Ericsson AB 2009-2010. 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
%% compliance with the License. You should have received a copy of the
%% Erlang Public License along with this software. If not, it can be
%% retrieved online at http://www.erlang.org/.
-%%
+%%
%% Software distributed under the License is distributed on an "AS IS"
%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
%% the License for the specific language governing rights and limitations
%% under the License.
-%%
+%%
%% %CopyrightEnd%
-module(reltool_test_lib).
@@ -24,9 +24,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
init_per_suite(Config) when is_list(Config)->
+ global:register_name(reltool_global_logger, group_leader()),
incr_timetrap(Config, 5).
end_per_suite(Config) when is_list(Config)->
+ global:unregister_name(reltool_global_logger),
ok.
incr_timetrap(Config, Times) ->
@@ -130,11 +132,9 @@ wx_end_per_suite(Config) ->
init_per_testcase(_Func, Config) when is_list(Config) ->
set_kill_timer(Config),
- global:register_name(reltool_global_logger, group_leader()),
Config.
end_per_testcase(_Func, Config) when is_list(Config) ->
- global:unregister_name(reltool_global_logger),
reset_kill_timer(Config),
Config.