aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2011-05-16 12:00:39 +0200
committerLukas Larsson <[email protected]>2011-05-16 13:21:25 +0200
commit20339c15f8794a1bcffa27202393a44fdbb71ab5 (patch)
treedc99f789265bb111a7bb430164b5f7d95e66aa8f
parente375165f6421c86fb245843d787e021d5b7dd00d (diff)
downloadotp-20339c15f8794a1bcffa27202393a44fdbb71ab5.tar.gz
otp-20339c15f8794a1bcffa27202393a44fdbb71ab5.tar.bz2
otp-20339c15f8794a1bcffa27202393a44fdbb71ab5.zip
Update ts to propigate the timetrap factor gotten from test_server:timetrap_scale_factor to common test when starting a test run.
-rw-r--r--lib/test_server/src/ts_run.erl10
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/test_server/src/ts_run.erl b/lib/test_server/src/ts_run.erl
index d145290820..885a3c9b96 100644
--- a/lib/test_server/src/ts_run.erl
+++ b/lib/test_server/src/ts_run.erl
@@ -365,6 +365,14 @@ make_common_test_args(Args0, Options, _Vars) ->
[{logdir,"../test_server"}]
end,
+ TimeTrap = case test_server:timetrap_scale_factor() of
+ 1 ->
+ [];
+ Scale ->
+ [{multiply_timetraps, Scale},
+ {scale_timetraps, true}]
+ end,
+
ConfigPath = case {os:getenv("TEST_CONFIG_PATH"),
lists:keysearch(config, 1, Options)} of
{false,{value, {config, Path}}} ->
@@ -377,7 +385,7 @@ make_common_test_args(Args0, Options, _Vars) ->
ConfigFiles = [{config,[filename:join(ConfigPath,File)
|| File <- get_config_files()]}],
io_lib:format("~100000p",[Args0++Trace++Cover++Logdir++
- ConfigFiles++Options]).
+ ConfigFiles++Options++TimeTrap]).
to_list(X) when is_atom(X) ->
atom_to_list(X);