aboutsummaryrefslogtreecommitdiffstats
path: root/lib/test_server/src
diff options
context:
space:
mode:
authorPeter Andersson <[email protected]>2010-06-03 14:27:21 +0200
committerRaimo Niskanen <[email protected]>2010-06-09 16:19:21 +0200
commit4da38a84f7540856fa590afdba2eb7958978788c (patch)
tree8c05173dcc67ac7feacd1005a7242df03a832f3b /lib/test_server/src
parentc3a1e56608ebe08f1ddc07273d85ff9c2779de9b (diff)
downloadotp-4da38a84f7540856fa590afdba2eb7958978788c.tar.gz
otp-4da38a84f7540856fa590afdba2eb7958978788c.tar.bz2
otp-4da38a84f7540856fa590afdba2eb7958978788c.zip
Make it possible to run ts tests for Common Test via the ct_run:script_start() interface
The possibility to pass start arguments to ct_run:start_script/0 by means of an application environment variable has been implemented. This will be used by ct_test_support for automatic testing of all common_test start interfaces.
Diffstat (limited to 'lib/test_server/src')
-rw-r--r--lib/test_server/src/test_server.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/test_server/src/test_server.erl b/lib/test_server/src/test_server.erl
index 7fb708778c..e3d853f078 100644
--- a/lib/test_server/src/test_server.erl
+++ b/lib/test_server/src/test_server.erl
@@ -958,7 +958,6 @@ job_proxy_msgloop() ->
run_test_case_eval(Mod, Func, Args0, Name, Ref, RunInit,
TimetrapData, TCCallback) ->
-
put(test_server_multiply_timetraps,TimetrapData),
{{Time,Value},Loc,Opts} =
@@ -1606,12 +1605,13 @@ timetrap_scale_factor() ->
%%
%% Creates a time trap, that will kill the calling process if the
%% trap is not cancelled with timetrap_cancel/1, within Timeout milliseconds.
-
timetrap(Timeout0) ->
Timeout = time_ms(Timeout0),
cancel_default_timetrap(),
case get(test_server_multiply_timetraps) of
undefined -> timetrap1(Timeout, true);
+ {undefined,false} -> timetrap1(Timeout, false);
+ {undefined,_} -> timetrap1(Timeout, true);
{infinity,_} -> infinity;
{Int,Scale} -> timetrap1(Timeout*Int, Scale)
end.