diff options
| author | Micael Karlberg <[email protected]> | 2011-10-11 10:38:48 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-10-11 10:38:48 +0200 |
| commit | 8490c3a413ca4a89c0a2f37e8723b2105cbe2406 (patch) | |
| tree | 8dbae16e97b8f5872f7feae2c983ef8e43b0903e /lib/common_test/test/ct_test_support.erl | |
| parent | adacb706e77b90a9284c3f4d8c828992c9acebf8 (diff) | |
| parent | 6ca6dd3c670fb8185ebb9a20c2a731a7375c1cac (diff) | |
| download | otp-8490c3a413ca4a89c0a2f37e8723b2105cbe2406.tar.gz otp-8490c3a413ca4a89c0a2f37e8723b2105cbe2406.tar.bz2 otp-8490c3a413ca4a89c0a2f37e8723b2105cbe2406.zip | |
Merge branch 'master' of super:otp into bmk/inets/inets58_integration
Diffstat (limited to 'lib/common_test/test/ct_test_support.erl')
| -rw-r--r-- | lib/common_test/test/ct_test_support.erl | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/common_test/test/ct_test_support.erl b/lib/common_test/test/ct_test_support.erl index 31381abc40..6df02d12b7 100644 --- a/lib/common_test/test/ct_test_support.erl +++ b/lib/common_test/test/ct_test_support.erl @@ -23,8 +23,8 @@ %%% -module(ct_test_support). --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 +46,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, |