aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel/test
diff options
context:
space:
mode:
authorMarcus Arendt <[email protected]>2015-01-23 14:54:17 +0100
committerMarcus Arendt <[email protected]>2015-01-23 14:54:17 +0100
commit6c91a0a020ce22d422afa0c9900a7af7d442831c (patch)
tree191d171a6d6ad4772a6e0d07bb9576b30defd99f /lib/kernel/test
parent94e149cd5b181b1620d07e8558b5473ed8c1891d (diff)
parent51784834fb03854f01798150a0f92d2119255992 (diff)
downloadotp-6c91a0a020ce22d422afa0c9900a7af7d442831c.tar.gz
otp-6c91a0a020ce22d422afa0c9900a7af7d442831c.tar.bz2
otp-6c91a0a020ce22d422afa0c9900a7af7d442831c.zip
Merge branch 'nox/standard_error/OTP-12424' into maint
* nox/standard_error/OTP-12424: Test standard_error Properly handle broken input in standard_error Fix io:getopts(standard_error)
Diffstat (limited to 'lib/kernel/test')
-rw-r--r--lib/kernel/test/Makefile3
-rw-r--r--lib/kernel/test/standard_error_SUITE.erl38
2 files changed, 40 insertions, 1 deletions
diff --git a/lib/kernel/test/Makefile b/lib/kernel/test/Makefile
index f1b8a105ed..ef351a25fb 100644
--- a/lib/kernel/test/Makefile
+++ b/lib/kernel/test/Makefile
@@ -77,7 +77,8 @@ MODULES= \
ignore_cores \
zlib_SUITE \
loose_node \
- sendfile_SUITE
+ sendfile_SUITE \
+ standard_error_SUITE
APP_FILES = \
appinc.app \
diff --git a/lib/kernel/test/standard_error_SUITE.erl b/lib/kernel/test/standard_error_SUITE.erl
new file mode 100644
index 0000000000..b290454b40
--- /dev/null
+++ b/lib/kernel/test/standard_error_SUITE.erl
@@ -0,0 +1,38 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2014. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+-module(standard_error_SUITE).
+
+-export([all/0,suite/0]).
+-export([badarg/1,getopts/1]).
+
+suite() ->
+ [{ct_hooks,[ts_install_cth]}].
+
+all() ->
+ [badarg,getopts].
+
+badarg(Config) when is_list(Config) ->
+ {'EXIT',{badarg,_}} = (catch io:put_chars(standard_error, [oops])),
+ true = erlang:is_process_alive(whereis(standard_error)),
+ ok.
+
+getopts(Config) when is_list(Config) ->
+ [{encoding,latin1}] = io:getopts(standard_error),
+ ok.