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/ct_master.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/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 44d3fb8f64..e2ea525cdd 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", |