From 2df013b5bfd714247570d9b4958b40f7559d35dd Mon Sep 17 00:00:00 2001
From: Peter Andersson <peppe@erlang.org>
Date: Fri, 6 Oct 2017 14:22:25 +0200
Subject: Tag Common Test system processes using process dictionary

---
 lib/common_test/src/test_server.erl | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'lib/common_test/src/test_server.erl')

diff --git a/lib/common_test/src/test_server.erl b/lib/common_test/src/test_server.erl
index dc6b7a536c..d4991408cd 100644
--- a/lib/common_test/src/test_server.erl
+++ b/lib/common_test/src/test_server.erl
@@ -784,6 +784,7 @@ spawn_fw_call(Mod,IPTC={init_per_testcase,Func},CurrConf,Pid,
 	      Why,Loc,SendTo) ->
     FwCall =
 	fun() ->
+                ct_util:mark_process(),
 		Skip = {skip,{failed,{Mod,init_per_testcase,Why}}},
 		%% if init_per_testcase fails, the test case
 		%% should be skipped
@@ -814,6 +815,7 @@ spawn_fw_call(Mod,EPTC={end_per_testcase,Func},EndConf,Pid,
 	      Why,_Loc,SendTo) ->
     FwCall =
 	fun() ->
+                ct_util:mark_process(),
 		{RetVal,Report} =
 		    case proplists:get_value(tc_status, EndConf) of
 			undefined ->
@@ -863,6 +865,7 @@ spawn_fw_call(Mod,EPTC={end_per_testcase,Func},EndConf,Pid,
 spawn_fw_call(FwMod,FwFunc,_,_Pid,{framework_error,FwError},_,SendTo) ->
     FwCall =
 	fun() ->
+                ct_util:mark_process(),
 		test_server_sup:framework_call(report, [framework_error,
 							{{FwMod,FwFunc},
 							 FwError}]),
@@ -879,6 +882,7 @@ spawn_fw_call(FwMod,FwFunc,_,_Pid,{framework_error,FwError},_,SendTo) ->
     spawn_link(FwCall);
 
 spawn_fw_call(Mod,Func,CurrConf,Pid,Error,Loc,SendTo) ->
+    ct_util:mark_process(),
     {Func1,EndTCFunc} = case Func of
 			    CF when CF == init_per_suite; CF == end_per_suite;
 				    CF == init_per_group; CF == end_per_group ->
@@ -917,6 +921,7 @@ start_job_proxy() ->
 
 %% The io_reply_proxy is not the most satisfying solution but it works...
 io_reply_proxy(ReplyTo) ->
+    ct_util:mark_process(),
     receive
 	IoReply when is_tuple(IoReply),
 		     element(1, IoReply) == io_reply ->
@@ -926,6 +931,7 @@ io_reply_proxy(ReplyTo) ->
     end.
 
 job_proxy_msgloop() ->
+    ct_util:mark_process(),
     receive
 
 	%%
@@ -1803,6 +1809,7 @@ break(CBM, TestCase, Comment) ->
 spawn_break_process(Pid, PName) ->
     spawn(fun() ->
 		  register(PName, self()),
+                  ct_util:mark_process(),
 		  receive
 		      continue -> continue(Pid);
 		      cancel -> ok
@@ -2000,6 +2007,7 @@ time_ms_apply(Func, TCPid, MultAndScale) ->
 
 user_timetrap_supervisor(Func, Spawner, TCPid, GL, T0, MultAndScale) ->
     process_flag(trap_exit, true),
+    ct_util:mark_process(),
     Spawner ! {self(),infinity},
     MonRef = monitor(process, TCPid),
     UserTTSup = self(),
@@ -2570,6 +2578,7 @@ run_on_shielded_node(Fun, CArgs) when is_function(Fun), is_list(CArgs) ->
 -spec start_job_proxy_fun(_, _) -> fun(() -> no_return()).
 start_job_proxy_fun(Master, Fun) ->
     fun () ->
+            ct_util:mark_process(),
             _ = start_job_proxy(),
             receive
                 Ref ->
-- 
cgit v1.2.3