diff options
| author | Björn Gustavsson <[email protected]> | 2012-10-03 13:20:29 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2012-10-05 10:07:00 +0200 |
| commit | 5dc4302bcd680ac2fff8dacab22121b0f89f8d4a (patch) | |
| tree | 3e496ce46e02c5c48c7eb834acb5b62354d55461 | |
| parent | a24c49aec663f19092cf0d2062af19523666d291 (diff) | |
| download | otp-5dc4302bcd680ac2fff8dacab22121b0f89f8d4a.tar.gz otp-5dc4302bcd680ac2fff8dacab22121b0f89f8d4a.tar.bz2 otp-5dc4302bcd680ac2fff8dacab22121b0f89f8d4a.zip | |
ts_run: Always turn on timetrap scaling when starting common_test
Scaling timetraps depending on cover, debug-compiled emulator and so
on is built-in to the test_server. Therefore, {multiply_timetraps,Scale}
should not be set (it would multiply the timeout value twice). Only
{scale_timetraps,true} needs to be set, and it must be set
unconditionally as the feature tests in
test_server:timetrap_scale_factor() may not return the correct
scale factor until the test_server node and test cases have been
started (for example, there is no cover server running).
| -rw-r--r-- | lib/test_server/src/ts_run.erl | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/lib/test_server/src/ts_run.erl b/lib/test_server/src/ts_run.erl index f4d5b3e3b1..57d1b8806e 100644 --- a/lib/test_server/src/ts_run.erl +++ b/lib/test_server/src/ts_run.erl @@ -380,13 +380,7 @@ make_common_test_args(Args0, Options0, _Vars) -> [{logdir,"../test_server"}] end, - TimeTrap = case test_server:timetrap_scale_factor() of - 1 -> - []; - Scale -> - [{multiply_timetraps, Scale}, - {scale_timetraps, true}] - end, + TimeTrap = [{scale_timetraps, true}], {ConfigPath, Options} = case {os:getenv("TEST_CONFIG_PATH"), |