diff options
| author | Peter Andersson <[email protected]> | 2017-12-04 16:19:34 +0100 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2017-12-04 16:19:34 +0100 |
| commit | 4713f7a3decc907f5f45edf97c02d57e854f33f4 (patch) | |
| tree | efcd8fb3524cd7db4fce1658b666bb8adff9a743 /lib/common_test/src/test_server_sup.erl | |
| parent | 0742eee122c4d8182778d07708c2242d7720b5d6 (diff) | |
| parent | 333556f4323f8d8a9e22a613a8591032b84b28d8 (diff) | |
| download | otp-4713f7a3decc907f5f45edf97c02d57e854f33f4.tar.gz otp-4713f7a3decc907f5f45edf97c02d57e854f33f4.tar.bz2 otp-4713f7a3decc907f5f45edf97c02d57e854f33f4.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/common_test/src/test_server_sup.erl')
| -rw-r--r-- | lib/common_test/src/test_server_sup.erl | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/common_test/src/test_server_sup.erl b/lib/common_test/src/test_server_sup.erl index 21f4be22fe..6ddbf1ad27 100644 --- a/lib/common_test/src/test_server_sup.erl +++ b/lib/common_test/src/test_server_sup.erl @@ -56,6 +56,7 @@ timetrap(Timeout0, Scale, Pid) -> timetrap(Timeout0, ReportTVal, Scale, Pid) -> process_flag(priority, max), + ct_util:mark_process(), Timeout = if not Scale -> Timeout0; true -> test_server:timetrap_scale_factor() * Timeout0 end, @@ -773,6 +774,7 @@ framework_call(Callback,Func,Args,DefaultReturn) -> false -> ok end, + ct_util:mark_process(), try apply(Mod,Func,Args) of Result -> Result @@ -850,6 +852,7 @@ util_start() -> undefined -> spawn_link(fun() -> register(?MODULE, self()), + put(app, common_test), util_loop(#util_state{starter=Starter}) end), ok; |