diff options
| author | Lukas Larsson <[email protected]> | 2011-05-16 12:00:39 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2011-05-16 12:00:39 +0200 |
| commit | 4cd0717b717803ce8f03a12de4bf89f452ed1df7 (patch) | |
| tree | 21768b35a12085bbc4aac180aee7440e1ab9c3da /lib/test_server/src | |
| parent | eb26a54528e824f8f08af49d47281201bd8fefe3 (diff) | |
| download | otp-4cd0717b717803ce8f03a12de4bf89f452ed1df7.tar.gz otp-4cd0717b717803ce8f03a12de4bf89f452ed1df7.tar.bz2 otp-4cd0717b717803ce8f03a12de4bf89f452ed1df7.zip | |
Update ts to propigate the timetrap factor gotten from test_server:timetrap_scale_factor to common test when starting a test run.
Diffstat (limited to 'lib/test_server/src')
| -rw-r--r-- | lib/test_server/src/ts_run.erl | 10 |
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); |