diff options
author | Peter Andersson <peppe@erlang.org> | 2013-09-02 11:45:24 +0200 |
---|---|---|
committer | Peter Andersson <peppe@erlang.org> | 2013-09-02 11:45:24 +0200 |
commit | a2d3e57f475b391f9e338503a2a5eead78930e5d (patch) | |
tree | f51b67cc6787073569b4a4c9ec1b4610bda849d0 /lib/test_server/src/test_server_ctrl.erl | |
parent | 6144fd582667642fdacba8018eef464a780aba17 (diff) | |
parent | 517879c44e0703b69fe8fc4499e656a318cd1a85 (diff) | |
download | otp-a2d3e57f475b391f9e338503a2a5eead78930e5d.tar.gz otp-a2d3e57f475b391f9e338503a2a5eead78930e5d.tar.bz2 otp-a2d3e57f475b391f9e338503a2a5eead78930e5d.zip |
Merge branch 'maint'
Diffstat (limited to 'lib/test_server/src/test_server_ctrl.erl')
-rw-r--r-- | lib/test_server/src/test_server_ctrl.erl | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/lib/test_server/src/test_server_ctrl.erl b/lib/test_server/src/test_server_ctrl.erl index ffa21d054c..4a10684ea5 100644 --- a/lib/test_server/src/test_server_ctrl.erl +++ b/lib/test_server/src/test_server_ctrl.erl @@ -479,12 +479,6 @@ init([]) -> test_server_sup:call_trace(TraceSpec) end, process_flag(trap_exit, true), - case lists:keysearch(sasl, 1, application:which_applications()) of - {value,_} -> - test_server_h:install(); - false -> - ok - end, %% copy format_exception setting from init arg to application environment case init:get_argument(test_server_format_exception) of {ok,[[TSFE]]} -> @@ -1067,12 +1061,6 @@ terminate(_Reason, State) -> end, kill_all_jobs(State#state.jobs), test_server_node:kill_nodes(), - case lists:keysearch(sasl, 1, application:which_applications()) of - {value,_} -> - test_server_h:restore(); - _ -> - ok - end, ok. kill_all_jobs([{_Name,JobPid}|Jobs]) -> |