diff options
| author | Björn Gustavsson <[email protected]> | 2013-03-14 14:54:07 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2013-03-14 14:54:07 +0100 |
| commit | 2251b9344c2e5d0ba5d43f89a1ad896c1e67cb0c (patch) | |
| tree | 169caa76a1c314684b699a0eb2cdf7581ce76dc4 /lib/reltool/test/reltool_test_lib.erl | |
| parent | 59ab7fcb61da503f7a25d6d85fa555b4d9be5f8f (diff) | |
| parent | 5f764a80aab1af1bbae170f8819fe3c3393b0cb6 (diff) | |
| download | otp-2251b9344c2e5d0ba5d43f89a1ad896c1e67cb0c.tar.gz otp-2251b9344c2e5d0ba5d43f89a1ad896c1e67cb0c.tar.bz2 otp-2251b9344c2e5d0ba5d43f89a1ad896c1e67cb0c.zip | |
Merge branch 'maint'
* maint:
[sasl] Fix tests that compare execution time
Prepare release
PER: Ensure that the complete encoding is at least one byte
PER/UPER: Correct decoding of ENUMERATEDs with a single value
[jinterface] Kill process between tests to avoid consequential error
[observer] Extend timer to allow trace msgs to arrive over tcp/ip
[observer] Kill slave node between tests in etop_SUITE
[observer] Accept current function for a process to be 'undefined' on hipe
[observer] Improve measurement of CPU utilization in etop
[observer] Fix non tail-recusive loop when measuring scheduler utilization
[jinterface] Make tests handle space in path on windows
[common_test] Extend timers for slave nodes in ct_cover_SUITE
[test_server] Clean up unused code in test_server_SUITE
[reltool] Increase timetrap timeout for reltool_server_SUTIE to 10 minutes
[test_server] Fix encoding of HTML file references to work on windows
[test_server] Use simpler tc name in unicode test to make it work on windows
Diffstat (limited to 'lib/reltool/test/reltool_test_lib.erl')
| -rw-r--r-- | lib/reltool/test/reltool_test_lib.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/reltool/test/reltool_test_lib.erl b/lib/reltool/test/reltool_test_lib.erl index 61f783190c..3485365ed9 100644 --- a/lib/reltool/test/reltool_test_lib.erl +++ b/lib/reltool/test/reltool_test_lib.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2009-2012. All Rights Reserved. +%% Copyright Ericsson AB 2009-2013. 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 @@ -25,7 +25,7 @@ init_per_suite(Config) when is_list(Config)-> global:register_name(reltool_global_logger, group_leader()), - incr_timetrap(Config, 5). + incr_timetrap(Config, 10). end_per_suite(Config) when is_list(Config)-> global:unregister_name(reltool_global_logger), @@ -51,7 +51,7 @@ set_kill_timer(Config) -> Time = case lookup_config(tc_timeout, Config) of [] -> - timer:minutes(5); + timer:minutes(10); ConfigTime when is_integer(ConfigTime) -> ConfigTime end, |