From 50f98d7f0e1dc0ad7e882566b964f5c53b18609b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= Date: Fri, 14 Sep 2012 15:07:30 +0200 Subject: test_server_ctrl: Don't die in stop_extra_tools/1 If it is not possible for test_server_ctrl:start_log_file/0 to create the log file directory or log files, then stop_extra_tools/1 (called from init_tester/10) is also likely to crash and hide the original error reason. That will be confusing to the user. Therefore, catch the call to stop_extra_tools/1. --- lib/test_server/src/test_server_ctrl.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/test_server') diff --git a/lib/test_server/src/test_server_ctrl.erl b/lib/test_server/src/test_server_ctrl.erl index a38e2be98e..05ee1359ca 100644 --- a/lib/test_server/src/test_server_ctrl.erl +++ b/lib/test_server/src/test_server_ctrl.erl @@ -1410,7 +1410,7 @@ 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", []); -- cgit v1.2.3