Merge tag 'OTP-19.0' into sverker/19/binary_to_atom-utf8-crash/ERL-474/OTP-14590

1 files changed, 36 insertions, 11 deletions

diff --git a/lib/common_test/test/ct_verbosity_SUITE.erl b/lib/common_test/test/ct_verbosity_SUITE.erl
index 32488b1db9..b9298e54ca 100644
--- a/lib/common_test/test/ct_verbosity_SUITE.erl
+++ b/lib/common_test/test/ct_verbosity_SUITE.erl
@@ -1,18 +1,19 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2016. 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/.
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
 %%
-%% 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.
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
 %%
 %% %CopyrightEnd%
 %%
@@ -53,9 +54,19 @@ init_per_suite(Config) ->
 end_per_suite(Config) ->
     ct_test_support:end_per_suite(Config).
 
+init_per_testcase(no_crashing, Config) ->
+    Opts = ct_test_support:start_slave(ctX, Config, 50),
+    XNode = proplists:get_value(ct_node, Opts),
+    ct:pal("Node ~p started!", [XNode]),
+    [{xnode,XNode} | Config];
 init_per_testcase(TestCase, Config) ->
     ct_test_support:init_per_testcase(TestCase, Config).
 
+end_per_testcase(no_crashing, Config) ->
+    XNode = proplists:get_value(xnode, Config),
+    ct_test_support:slave_stop(XNode),
+    ct:pal("Node ~p stopped!", [XNode]),
+    ok;
 end_per_testcase(TestCase, Config) ->
     ct_test_support:end_per_testcase(TestCase, Config).
 
@@ -72,7 +83,8 @@ all() ->
      combine_categories,
      testspec_only,
      merge_with_testspec,
-     possible_deadlock
+     possible_deadlock,
+     no_crashing
     ].
 
 %%--------------------------------------------------------------------
@@ -189,6 +201,19 @@ possible_deadlock(Config) ->
     
 
 %%%-----------------------------------------------------------------
+%%%
+no_crashing(Config) ->
+    XNode = proplists:get_value(xnode, Config),
+    ok = rpc:call(XNode, ct, print, ["hello",[]]),
+    ok = rpc:call(XNode, ct, pal, ["hello",[]]),
+    ok = rpc:call(XNode, ct, log, ["hello",[]]),
+    Data = io_lib:format("hello", []),
+    {badrpc,{'EXIT',{noproc,_}}} =
+	(catch rpc:call(XNode, test_server_io, print_unexpected, [Data])),
+    ok.	
+
+
+%%%-----------------------------------------------------------------
 %%% HELP FUNCTIONS
 %%%-----------------------------------------------------------------