aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2012-09-14 15:07:30 +0200
committerBjörn Gustavsson <[email protected]>2012-09-19 11:51:35 +0200
commit50f98d7f0e1dc0ad7e882566b964f5c53b18609b (patch)
tree095288093c885a59a123cf0567f8b38be40947ca
parentb58ce62a0cf296ca8cd8cd77b053bc70ecf28758 (diff)
downloadotp-50f98d7f0e1dc0ad7e882566b964f5c53b18609b.tar.gz
otp-50f98d7f0e1dc0ad7e882566b964f5c53b18609b.tar.bz2
otp-50f98d7f0e1dc0ad7e882566b964f5c53b18609b.zip
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.
-rw-r--r--lib/test_server/src/test_server_ctrl.erl2
1 files changed, 1 insertions, 1 deletions
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", []);