diff options
| author | Hans Bolinder <[email protected]> | 2019-08-21 09:40:13 +0200 | 
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2019-08-21 09:40:13 +0200 | 
| commit | 504d151a57bc93acb3fb7597214a8e62be9c1cfd (patch) | |
| tree | f00c1e3bd932dd07dcb7142be1c749e1bb221420 /lib/stdlib/test | |
| parent | fc9b69dac7497a250658680eb9e44e6ccf79d0bc (diff) | |
| parent | b9aef66da02a8e27b021ad3be2101b221c760a1f (diff) | |
| download | otp-504d151a57bc93acb3fb7597214a8e62be9c1cfd.tar.gz otp-504d151a57bc93acb3fb7597214a8e62be9c1cfd.tar.bz2 otp-504d151a57bc93acb3fb7597214a8e62be9c1cfd.zip | |
Merge branch 'hasse/remove_old_IO_requests/OTP-15695'
* hasse/remove_old_IO_requests/OTP-15695:
  stdlib: Remove old I/O-requests from test suites
  stdlib (doc): Do not mention old requests
  snmp: Update old format I/O-request
  sasl: Use encoding when reading terms
  parsetools (doc): Update old format I/O-requests
  mnesia: Update old format I/O-request
  kernel: Update old format I/O-requests
  stdlib: Remove no longer used function
  kernel: Remove commented out code
  stdlib: Remove commented out code
Diffstat (limited to 'lib/stdlib/test')
| -rw-r--r-- | lib/stdlib/test/io_proto_SUITE.erl | 20 | ||||
| -rw-r--r-- | lib/stdlib/test/shell_SUITE.erl | 9 | 
2 files changed, 1 insertions, 28 deletions
| diff --git a/lib/stdlib/test/io_proto_SUITE.erl b/lib/stdlib/test/io_proto_SUITE.erl index e497b2fb5d..df6958cfa9 100644 --- a/lib/stdlib/test/io_proto_SUITE.erl +++ b/lib/stdlib/test/io_proto_SUITE.erl @@ -1,7 +1,7 @@  %%  %% %CopyrightBegin%  %% -%% Copyright Ericsson AB 2009-2017. All Rights Reserved. +%% Copyright Ericsson AB 2009-2019. All Rights Reserved.  %%  %% Licensed under the Apache License, Version 2.0 (the "License");  %% you may not use this file except in compliance with the License. @@ -1568,10 +1568,6 @@ request({put_chars, Encoding, Chars}, State) ->  request({put_chars, Encoding, Module, Function, Args}, State) ->      {ok, ok, State#state{q=[{put_chars, Encoding, Module, Function, Args} |   			    State#state.q ]}}; -request({put_chars,Chars}, State) -> -    {ok, ok, State#state{q=[{put_chars, Chars} | State#state.q ]}}; -request({put_chars,M,F,As}, State) -> -    {ok, ok, State#state{q=[{put_chars, M,F,As} | State#state.q ]}};  request({get_until, Encoding, Prompt, M, F, As}, State) ->      {ok, convert(State#state.nxt, Encoding, State#state.mode), State#state{nxt = eof, q = [{get_until, Encoding, Prompt, M, F, As} | State#state.q]}};  request({get_chars, Encoding, Prompt, N}, State) -> @@ -1583,20 +1579,6 @@ request({get_line, Encoding, Prompt}, State) ->       State#state{nxt = eof,   		 q = [{get_line, Encoding, Prompt} |   		      State#state.q]}}; -request({get_until, Prompt, M, F, As}, State) -> -    {ok, convert(State#state.nxt, latin1, State#state.mode),  -     State#state{nxt = eof,  -		 q = [{get_until, Prompt, M, F, As} | State#state.q]}}; -request({get_chars, Prompt, N}, State) -> -    {ok, convert(State#state.nxt, latin1, State#state.mode),  -     State#state{nxt = eof,  -		 q = [{get_chars, Prompt, N} |  -		      State#state.q]}}; -request({get_line, Prompt}, State) -> -    {ok, convert(State#state.nxt, latin1, State#state.mode),  -     State#state{nxt = eof,  -		 q = [{get_line, Prompt} |  -		      State#state.q]}};  request({get_geomentry,_}, State) ->      {error, {error,enotsup}, State};  request({setopts, Opts}, State) when Opts =:= [{binary, false}]; Opts =:= [list] -> diff --git a/lib/stdlib/test/shell_SUITE.erl b/lib/stdlib/test/shell_SUITE.erl index cdb6031b07..4d85e1f04b 100644 --- a/lib/stdlib/test/shell_SUITE.erl +++ b/lib/stdlib/test/shell_SUITE.erl @@ -3141,25 +3141,16 @@ io_request({get_geometry,columns}, S) ->      {ok,80,S};  io_request({get_geometry,rows}, S) ->      {ok,24,S}; -io_request({put_chars,Chars}, S) -> -    {ok,ok,S#state{reply = [S#state.reply | Chars]}};  io_request({put_chars,latin1,Chars}, S) ->      {ok,ok,S#state{reply = [S#state.reply | Chars]}};  io_request({put_chars,unicode,Chars0}, S) ->      Chars = unicode:characters_to_list(Chars0),      {ok,ok,S#state{reply = [S#state.reply | Chars]}}; -io_request({put_chars,Mod,Func,Args}, S) -> -    case catch apply(Mod, Func, Args) of -        Chars when is_list(Chars) ->  -            io_request({put_chars,Chars}, S) -    end;  io_request({put_chars,Enc,Mod,Func,Args}, S) ->      case catch apply(Mod, Func, Args) of          Chars when is_list(Chars) ->               io_request({put_chars,Enc,Chars}, S)      end; -io_request({get_until,_Prompt,Mod,Func,ExtraArgs}, S) -> -    get_until(Mod, Func, ExtraArgs, S, latin1);  io_request({get_until,Enc,_Prompt,Mod,Func,ExtraArgs}, S) ->      get_until(Mod, Func, ExtraArgs, S, Enc). | 
