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_ctrl.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_ctrl.erl')
-rw-r--r-- | lib/common_test/src/test_server_ctrl.erl | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/common_test/src/test_server_ctrl.erl b/lib/common_test/src/test_server_ctrl.erl index 5988af4a29..3a454a1e84 100644 --- a/lib/common_test/src/test_server_ctrl.erl +++ b/lib/common_test/src/test_server_ctrl.erl @@ -1127,6 +1127,7 @@ init_tester(Mod, Func, Args, Dir, Name, {_,_,MinLev}=Levels, RejectIoReqs, CreatePrivDir, TCCallback, ExtraTools) -> process_flag(trap_exit, true), _ = test_server_io:start_link(), + put(app, common_test), put(test_server_name, Name), put(test_server_dir, Dir), put(test_server_total_time, 0), @@ -3725,6 +3726,7 @@ run_test_case(Ref, Num, Mod, Func, Args, RunInit, TimetrapData, Mode) -> spawn_link( fun() -> process_flag(trap_exit, true), + ct_util:mark_process(), _ = [put(Key, Val) || {Key,Val} <- Dictionary], set_io_buffering({tc,Main}), run_test_case1(Ref, Num, Mod, Func, Args, RunInit, |