aboutsummaryrefslogtreecommitdiffstats
path: root/lib/test_server
diff options
context:
space:
mode:
authorPeter Andersson <[email protected]>2016-04-18 12:31:07 +0200
committerPeter Andersson <[email protected]>2016-05-02 14:07:22 +0200
commit03d7a4ac57ac52358fbf5388f1462a5347882d50 (patch)
treebde3b10cd075de936aba9964f5f131a755a540c4 /lib/test_server
parent10c1adf6028bf770003eb19b0c775ddc0260c950 (diff)
downloadotp-03d7a4ac57ac52358fbf5388f1462a5347882d50.tar.gz
otp-03d7a4ac57ac52358fbf5388f1462a5347882d50.tar.bz2
otp-03d7a4ac57ac52358fbf5388f1462a5347882d50.zip
Skip pre/post test IO suite if cover or debug is running
OTP-13535 The return value of ct:get_timetrap_info/0 has been modified.
Diffstat (limited to 'lib/test_server')
-rw-r--r--lib/test_server/src/test_server.erl15
1 files changed, 12 insertions, 3 deletions
diff --git a/lib/test_server/src/test_server.erl b/lib/test_server/src/test_server.erl
index 34acad6fd1..919526c5d7 100644
--- a/lib/test_server/src/test_server.erl
+++ b/lib/test_server/src/test_server.erl
@@ -2165,10 +2165,19 @@ get_timetrap_info(TCPid, SendToServer) ->
Timers ->
case [Info || {Handle,Pid,Info} <- Timers,
Pid == TCPid, Handle /= infinity] of
- [I|_] ->
- I;
+ [{TVal,true}|_] ->
+ {TVal,{true,test_server:timetrap_scale_factor()}};
+ [{TVal,false}|_] ->
+ {TVal,{false,1}};
[] when SendToServer == true ->
- tc_supervisor_req({get_timetrap_info,TCPid});
+ case tc_supervisor_req({get_timetrap_info,TCPid}) of
+ {TVal,true} ->
+ {TVal,{true,test_server:timetrap_scale_factor()}};
+ {TVal,false} ->
+ {TVal,{false,1}};
+ Error ->
+ Error
+ end;
[] ->
undefined
end