diff options
| author | Lukas Larsson <[email protected]> | 2011-09-29 17:54:27 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2011-09-29 17:54:27 +0200 |
| commit | 71099221fc8d0456fb38b1954e9053ec527d43b2 (patch) | |
| tree | 6e0b29ded24837b7e31c1ddcd0df5608c1af199e /lib/common_test/test | |
| parent | fbf611254ded96a0bbeedb76b895f39958b04edc (diff) | |
| parent | 1be1c1cb15068aed40a30210c8be34f36e38ed66 (diff) | |
| download | otp-71099221fc8d0456fb38b1954e9053ec527d43b2.tar.gz otp-71099221fc8d0456fb38b1954e9053ec527d43b2.tar.bz2 otp-71099221fc8d0456fb38b1954e9053ec527d43b2.zip | |
Merge branch 'dev' into major
* dev:
Skip create_big_boot on platforms without crypto
Remove test_server path instead of cwd for clash test
Skip getaddr_v6 test if on the ipv4_only host
Use static port for old solaris versions
Extend time to wait for zone files to be loaded
Allow out of memory exception for max_port checks
Extend slave start timeout for windows tests
Double timeout to make sure debug builds pass
Use now instead of os:timestamp
Increase timeout in scheduler_suspend for slow platforms
Skip update_cpu_info if 'taskset' cannot be found
Diffstat (limited to 'lib/common_test/test')
| -rw-r--r-- | lib/common_test/test/ct_test_support.erl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/common_test/test/ct_test_support.erl b/lib/common_test/test/ct_test_support.erl index 31381abc40..e85e8e6ad3 100644 --- a/lib/common_test/test/ct_test_support.erl +++ b/lib/common_test/test/ct_test_support.erl @@ -25,6 +25,7 @@ -include_lib("test_server/include/test_server.hrl"). -include_lib("common_test/include/ct_event.hrl"). +-include_lib("common_test/include/ct.hrl"). -export([init_per_suite/1, init_per_suite/2, end_per_suite/1, init_per_testcase/2, end_per_testcase/2, @@ -46,9 +47,10 @@ init_per_suite(Config) -> init_per_suite(Config, Level) -> case os:type() of {win32, _} -> - %% Extend timeout for windows as starting node + %% Extend timeout to 1 hour for windows as starting node %% can take a long time there - test_server:timetrap( 120000 * test_server:timetrap_scale_factor()); + test_server:timetrap( 60*60*1000 * + test_server:timetrap_scale_factor()); _ -> ok end, |