aboutsummaryrefslogtreecommitdiffstats
path: root/lib/common_test/test/ct_test_support.erl
diff options
context:
space:
mode:
authorPeter Andersson <[email protected]>2015-03-17 12:59:26 +0100
committerPeter Andersson <[email protected]>2015-03-18 11:25:45 +0100
commit36b13923d19931255c7cb12d615d098de77cd78f (patch)
treecbaa6cda5820a2a526ac36dbcb8e9dfea82c0e00 /lib/common_test/test/ct_test_support.erl
parent5fde23474656c1934250e8b8a9c7399dc00d5bdf (diff)
downloadotp-36b13923d19931255c7cb12d615d098de77cd78f.tar.gz
otp-36b13923d19931255c7cb12d615d098de77cd78f.tar.bz2
otp-36b13923d19931255c7cb12d615d098de77cd78f.zip
Modify test timing by enabling time multiplier and scaling
Diffstat (limited to 'lib/common_test/test/ct_test_support.erl')
-rw-r--r--lib/common_test/test/ct_test_support.erl14
1 files changed, 12 insertions, 2 deletions
diff --git a/lib/common_test/test/ct_test_support.erl b/lib/common_test/test/ct_test_support.erl
index 746469584d..6abca08452 100644
--- a/lib/common_test/test/ct_test_support.erl
+++ b/lib/common_test/test/ct_test_support.erl
@@ -51,12 +51,12 @@ init_per_suite(Config) ->
init_per_suite(Config, 50).
init_per_suite(Config, Level) ->
+ ScaleFactor = test_server:timetrap_scale_factor(),
case os:type() of
{win32, _} ->
%% Extend timeout to 1 hour for windows as starting node
%% can take a long time there
- test_server:timetrap( 60*60*1000 *
- test_server:timetrap_scale_factor());
+ test_server:timetrap( 60*60*1000 * ScaleFactor );
_ ->
ok
end,
@@ -67,6 +67,16 @@ init_per_suite(Config, Level) ->
_ ->
ok
end,
+
+ {Mult,Scale} = test_server_ctrl:get_timetrap_parameters(),
+ test_server:format(Level, "Timetrap multiplier: ~w~n", [Mult]),
+ if Scale == true ->
+ test_server:format(Level, "Timetrap scale factor: ~w~n",
+ [ScaleFactor]);
+ true ->
+ ok
+ end,
+
start_slave(Config, Level).
start_slave(Config, Level) ->