Merge remote branch 'origin/peppe/common_test/otp-9958' into maint

* origin/peppe/common_test/otp-9958:
  Fix problem with dropped suite- and test case names

OTP-9958

1 files changed, 10 insertions, 3 deletions

diff --git a/lib/test_server/src/test_server.erl b/lib/test_server/src/test_server.erl
index 1433eef193..8ba6728f5d 100644
--- a/lib/test_server/src/test_server.erl
+++ b/lib/test_server/src/test_server.erl
@@ -852,7 +852,11 @@ run_test_case_msgloop(Ref, Pid, CaptureStdout, Terminate, Comment, CurrConf) ->
 		    %% result of an exit(TestCase,kill) call, which is the
 		    %% only way to abort a testcase process that traps exits
 		    %% (see abort_current_testcase)
-		    spawn_fw_call(undefined,undefined,CurrConf,Pid,
+		    {Mod,Func} = case CurrConf of
+				     {MF,_} -> MF;
+				     _      -> {undefined,undefined}
+				 end,
+		    spawn_fw_call(Mod,Func,CurrConf,Pid,
 				  testcase_aborted_or_killed,
 				  unknown,self()),
 		    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,Comment,CurrConf);
@@ -863,8 +867,11 @@ run_test_case_msgloop(Ref, Pid, CaptureStdout, Terminate, Comment, CurrConf) ->
 		_Other ->
 		    %% the testcase has terminated because of Reason (e.g. an exit
 		    %% because a linked process failed)
-		    spawn_fw_call(undefined,undefined,CurrConf,Pid,Reason,
-				  unknown,self()),
+		    {Mod,Func} = case CurrConf of
+				     {MF,_} -> MF;
+				     _      -> {undefined,undefined}
+				 end,
+		    spawn_fw_call(Mod,Func,CurrConf,Pid,Reason,unknown,self()),
 		    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,Comment,CurrConf)
 	    end;
 	{EndConfPid,{call_end_conf,Data,_Result}} ->