diff options
| author | Hans Bolinder <[email protected]> | 2019-08-21 08:23:23 +0200 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2019-08-21 08:23:23 +0200 |
| commit | ec82235231c66d3de392507d684bd4c5263de07e (patch) | |
| tree | 7b63880394e6ae0c59741b2245c15d21fa79bb58 | |
| parent | 034ed93975f4f3f81d20f67a34e350bcb053b439 (diff) | |
| parent | 36d2a29890384e58f93717043887bf00ccc33cbd (diff) | |
| download | otp-ec82235231c66d3de392507d684bd4c5263de07e.tar.gz otp-ec82235231c66d3de392507d684bd4c5263de07e.tar.bz2 otp-ec82235231c66d3de392507d684bd4c5263de07e.zip | |
Merge branch 'hasse/eunit/io_protocol_fix/OTP-16000' into maint
* hasse/eunit/io_protocol_fix/OTP-16000:
eunit: Handle get_until requests with explicit encoding
| -rw-r--r-- | lib/eunit/src/eunit_proc.erl | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/eunit/src/eunit_proc.erl b/lib/eunit/src/eunit_proc.erl index 96bdcf88b6..6e702543d0 100644 --- a/lib/eunit/src/eunit_proc.erl +++ b/lib/eunit/src/eunit_proc.erl @@ -644,6 +644,8 @@ io_request({get_line, _Enc, _Prompt}, Buf) -> {eof, Buf}; io_request({get_until, _Prompt, _M, _F, _As}, Buf) -> {eof, Buf}; +io_request({get_until, _Enc, _Prompt, _M, _F, _As}, Buf) -> + {eof, Buf}; io_request({setopts, _Opts}, Buf) -> {ok, Buf}; io_request(getopts, Buf) -> |