diff options
| author | Peter Andersson <[email protected]> | 2017-12-04 16:01:06 +0100 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2017-12-04 16:01:06 +0100 |
| commit | 333556f4323f8d8a9e22a613a8591032b84b28d8 (patch) | |
| tree | fb2b191cdf6433f637e1ee998000d9f38e96a0f9 /lib/common_test/src/ct_master.erl | |
| parent | 1a5dd04e0958681a72984eba6b3cf026aaec0155 (diff) | |
| parent | 378da5aef27e1679aa30b8f4a2a6569accb70ff2 (diff) | |
| download | otp-333556f4323f8d8a9e22a613a8591032b84b28d8.tar.gz otp-333556f4323f8d8a9e22a613a8591032b84b28d8.tar.bz2 otp-333556f4323f8d8a9e22a613a8591032b84b28d8.zip | |
Merge branch 'peppe/common_test/auto_cleanup/OTP-13832' into maint
* peppe/common_test/auto_cleanup/OTP-13832:
Add tests and doc for the new remaining_test_procs function
Implement function that finds disposable test processes
Tag Common Test system processes using process dictionary
Add app name tag in process dictionary
OTP-13832
Diffstat (limited to 'lib/common_test/src/ct_master.erl')
| -rw-r--r-- | lib/common_test/src/ct_master.erl | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/common_test/src/ct_master.erl b/lib/common_test/src/ct_master.erl index 6e6d1879c2..ef2aff69b7 100644 --- a/lib/common_test/src/ct_master.erl +++ b/lib/common_test/src/ct_master.erl @@ -346,6 +346,7 @@ init_master(Parent,NodeOptsList,EvHandlers,MasterLogDir,LogDirs, case whereis(ct_master) of undefined -> register(ct_master,self()), + ct_util:mark_process(), ok; _Pid -> io:format("~nWarning: ct_master already running!~n"), @@ -690,6 +691,7 @@ refresh_logs([],Refreshed) -> init_node_ctrl(MasterPid,Cookie,Opts) -> %% make sure tests proceed even if connection to master is lost process_flag(trap_exit, true), + ct_util:mark_process(), MasterNode = node(MasterPid), group_leader(whereis(user),self()), io:format("~n********** node_ctrl process ~w started on ~w **********~n", |