diff options
| author | Peter Andersson <[email protected]> | 2012-03-02 11:34:54 +0100 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2012-03-02 11:34:54 +0100 |
| commit | bedb0de46685241cedaad05165ad65e60a25da60 (patch) | |
| tree | 3b43b1c102f9ae5ce363549c6ddc44b077895998 /lib/test_server/src/test_server_ctrl.erl | |
| parent | 1bc4f4c35876a8dcccad66129e68f602751f6e36 (diff) | |
| download | otp-bedb0de46685241cedaad05165ad65e60a25da60.tar.gz otp-bedb0de46685241cedaad05165ad65e60a25da60.tar.bz2 otp-bedb0de46685241cedaad05165ad65e60a25da60.zip | |
Fix problem with handling error_logger events
OTP-9941
OTP-9955
Diffstat (limited to 'lib/test_server/src/test_server_ctrl.erl')
| -rw-r--r-- | lib/test_server/src/test_server_ctrl.erl | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/test_server/src/test_server_ctrl.erl b/lib/test_server/src/test_server_ctrl.erl index 3432b3bc8e..3bea9e39ee 100644 --- a/lib/test_server/src/test_server_ctrl.erl +++ b/lib/test_server/src/test_server_ctrl.erl @@ -1301,7 +1301,12 @@ terminate(_Reason, State) -> end, kill_all_jobs(State#state.jobs), test_server_node:stop(State#state.target_info), - test_server_h:restore(), + case lists:keysearch(sasl, 1, application:which_applications()) of + {value,_} -> + test_server_h:restore(); + _ -> + ok + end, ok. kill_all_jobs([{_Name,JobPid}|Jobs]) -> |