diff options
| author | Peter Andersson <[email protected]> | 2013-09-02 11:42:27 +0200 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2013-09-02 11:43:10 +0200 |
| commit | 517879c44e0703b69fe8fc4499e656a318cd1a85 (patch) | |
| tree | e64cdbdf67096a3e4db9656517926491ea682d07 /lib/test_server/src/test_server_ctrl.erl | |
| parent | fa1e0c642845cf7e72f0eef0af70baf5b87a0e3c (diff) | |
| parent | 170311bc90b45b97a8f86fbbd4325585cf8e2153 (diff) | |
| download | otp-517879c44e0703b69fe8fc4499e656a318cd1a85.tar.gz otp-517879c44e0703b69fe8fc4499e656a318cd1a85.tar.bz2 otp-517879c44e0703b69fe8fc4499e656a318cd1a85.zip | |
Merge remote branch 'origin/peppe/common_test/test_server_h_problem' into maint
* origin/peppe/common_test/test_server_h_problem:
Remove the obsolete test_server_h error handler
Tag sasl and error reports with suite, group, and function in log
Conflicts:
lib/common_test/src/cth_log_redirect.erl
OTP-11263
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]) -> |