diff options
author | Sverker Eriksson <[email protected]> | 2016-03-08 14:43:51 +0100 |
---|---|---|
committer | Sverker Eriksson <[email protected]> | 2016-03-08 14:43:51 +0100 |
commit | 652b67ba8d15ff415a8f30034bd9eb03a9c2b8ca (patch) | |
tree | 5cad110a1466a567a47474e490e4a866e65201a7 | |
parent | 9bfbf4319a42be7572334b57c3e16864681c252c (diff) | |
parent | 48d6955eca25d2d9fec0a0a6a4c70ef6ddb85e41 (diff) | |
download | otp-652b67ba8d15ff415a8f30034bd9eb03a9c2b8ca.tar.gz otp-652b67ba8d15ff415a8f30034bd9eb03a9c2b8ca.tar.bz2 otp-652b67ba8d15ff415a8f30034bd9eb03a9c2b8ca.zip |
Merge branch 'sverk/bad_printable_range' into maint
* sverk/bad_printable_range:
stdlib: Fix io_SUITE:bad_printable_range for windows
-rw-r--r-- | lib/stdlib/test/io_SUITE.erl | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/lib/stdlib/test/io_SUITE.erl b/lib/stdlib/test/io_SUITE.erl index 0e897631ff..bb1ed2a4fc 100644 --- a/lib/stdlib/test/io_SUITE.erl +++ b/lib/stdlib/test/io_SUITE.erl @@ -2125,12 +2125,24 @@ rpc_call_max(Node, M, F, Args) -> %% Make sure that a bad specification for a printable range is rejected. bad_printable_range(Config) when is_list(Config) -> Cmd = lists:concat([lib:progname()," +pcunnnnnicode -run erlang halt"]), - case os:cmd(Cmd) of - "bad range of printable characters" ++ _ -> - ok; - String -> - io:format("~s\n", [String]), - ?t:fail() + P = open_port({spawn, Cmd}, [stderr_to_stdout, {line, 200}]), + ok = receive + {P, {data, {eol , "bad range of printable characters" ++ _}}} -> + ok; + Other -> + Other + after 1000 -> + timeout + end, + catch port_close(P), + flush_from_port(P), + ok. + +flush_from_port(P) -> + receive {P, _} -> + flush_from_port(P) + after 0 -> + ok end. io_lib_print_binary_depth_one(doc) -> |