Merge branch 'bjorn/ct-fix-silent-death/OTP-9769'

* bjorn/ct-fix-silent-death/OTP-9769:
  Teach test_server to report severe errors to common_test
  test_server_ctrl: Present "cannot create log dir" errors more neatly
  test_server_ctrl: Don't die in stop_extra_tools/1

1 files changed, 11 insertions, 4 deletions

diff --git a/lib/test_server/src/test_server_ctrl.erl b/lib/test_server/src/test_server_ctrl.erl
index a38e2be98e..f7266e5632 100644
--- a/lib/test_server/src/test_server_ctrl.erl
+++ b/lib/test_server/src/test_server_ctrl.erl
@@ -1410,13 +1410,14 @@ init_tester(Mod, Func, Args, Dir, Name, {SumLev,MajLev,MinLev}, RejectIoReqs,
     StartedExtraTools = start_extra_tools(ExtraTools),
     {TimeMy,Result} = ts_tc(Mod, Func, Args),
     put(test_server_common_io_handler, undefined),
-    stop_extra_tools(StartedExtraTools),
+    catch stop_extra_tools(StartedExtraTools),
     case Result of
 	{'EXIT',test_suites_done} ->
 	    print(25, "DONE, normal exit", []);
 	{'EXIT',_Pid,Reason} ->
 	    print(1, "EXIT, reason ~p", [Reason]);
 	{'EXIT',Reason} ->
+	    report_severe_error(Reason),
 	    print(1, "EXIT, reason ~p", [Reason]);
 	_Other ->
 	    print(25, "DONE", [])
@@ -1440,6 +1441,9 @@ init_tester(Mod, Func, Args, Dir, Name, {SumLev,MajLev,MinLev}, RejectIoReqs,
 	  "</tfoot>\n",
 	  [Time,SuccessStr,OkN,FailedN,SkipStr,OkN+FailedN+SkippedN]).
 
+report_severe_error(Reason) ->
+    test_server_sup:framework_call(report, [severe_error,Reason]).
+
 %% timer:tc/3
 ts_tc(M, F, A) ->
     Before = ?now,
@@ -1873,7 +1877,7 @@ start_log_file() ->
 	{error, eexist} ->
 	    ok;
 	MkDirError ->
-	    exit({cant_create_log_dir,{MkDirError,Dir}})
+	    log_file_error(MkDirError, Dir)
     end,
     TestDir = timestamp_filename_get(filename:join(Dir, "run.")),
     TestDir1 =
@@ -1888,10 +1892,10 @@ start_log_file() ->
 		    ok ->
 			TestDirX;
 		    MkDirError2 ->
-			exit({cant_create_log_dir,{MkDirError2,TestDirX}})
+			log_file_error(MkDirError2, TestDirX)
 		end;
 	    MkDirError2 ->
-		exit({cant_create_log_dir,{MkDirError2,TestDir}})
+		log_file_error(MkDirError2, TestDir)
 	end,
     ok = file:write_file(filename:join(Dir, ?last_file), TestDir1 ++ "\n"),
     ok = file:write_file(?last_file, TestDir1 ++ "\n"),
@@ -1918,6 +1922,9 @@ start_log_file() ->
     test_server_sup:framework_call(report, [loginfo,LogInfo]),
     {ok,TestDir1}.
 
+log_file_error(Error, Dir) ->
+    exit({cannot_create_log_dir,{Error,lists:flatten(Dir)}}).
+
 make_html_link(LinkName, Target, Explanation) ->
     %% if possible use a relative reference to Target.
     TargetL = filename:split(Target),