diff options
| author | Hans Bolinder <[email protected]> | 2019-08-21 08:36:38 +0200 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2019-08-21 08:36:38 +0200 |
| commit | fc9b69dac7497a250658680eb9e44e6ccf79d0bc (patch) | |
| tree | 0dc0180b93a362cc10123c31dc4127c5a15a362f | |
| parent | 4fd424f78a6c25679277c42cf510f277d011355d (diff) | |
| parent | ec82235231c66d3de392507d684bd4c5263de07e (diff) | |
| download | otp-fc9b69dac7497a250658680eb9e44e6ccf79d0bc.tar.gz otp-fc9b69dac7497a250658680eb9e44e6ccf79d0bc.tar.bz2 otp-fc9b69dac7497a250658680eb9e44e6ccf79d0bc.zip | |
Merge branch 'maint'
* maint:
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) -> |