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/kernel/test/file_SUITE.erl | |
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/kernel/test/file_SUITE.erl')
-rw-r--r-- | lib/kernel/test/file_SUITE.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/kernel/test/file_SUITE.erl b/lib/kernel/test/file_SUITE.erl index 9efe83d8b3..747f1d9e1b 100644 --- a/lib/kernel/test/file_SUITE.erl +++ b/lib/kernel/test/file_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2018. All Rights Reserved. +%% Copyright Ericsson AB 1996-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. @@ -278,11 +278,11 @@ mini_server(Parent) -> Parent ! {io_request,From,To,{put_chars,Data}}, From ! {io_reply, To, ok}, mini_server(Parent); - {io_request,From,To,{get_chars,'',N}} -> + {io_request,From,To,{get_chars,_Encoding,'',N}} -> Parent ! {io_request,From,To,{get_chars,'',N}}, From ! {io_reply, To, {ok, lists:duplicate(N,$a)}}, mini_server(Parent); - {io_request,From,To,{get_line,''}} -> + {io_request,From,To,{get_line,_Encoding,''}} -> Parent ! {io_request,From,To,{get_line,''}}, From ! {io_reply, To, {ok, "hej\n"}}, mini_server(Parent) |