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

1 files changed, 43 insertions, 56 deletions

diff --git a/erts/test/z_SUITE.erl b/erts/test/z_SUITE.erl
index ccf22a9b6b..281a47134f 100644
--- a/erts/test/z_SUITE.erl
+++ b/erts/test/z_SUITE.erl
@@ -1,18 +1,19 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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%
 %%
@@ -23,8 +24,6 @@
 %% This suite expects to be run as the last suite of all suites.
 %%
 
-%-define(line_trace, 1).
-
 -include_lib("kernel/include/file.hrl").
 	    
 -record(core_search_conf, {search_dir,
@@ -33,52 +32,19 @@
 			   file,
 			   run_by_ts}).
 
--define(DEFAULT_TIMEOUT, ?t:minutes(5)).
-
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2,end_per_group/2, 
-	 init_per_testcase/2, end_per_testcase/2]).
+-export([all/0, suite/0]).
 
 -export([search_for_core_files/1, core_files/1]).
 
 -include_lib("common_test/include/ct.hrl").
     
-
-init_per_testcase(Case, Config) ->
-    Dog = ?t:timetrap(?DEFAULT_TIMEOUT),
-    [{testcase, Case}, {watchdog, Dog} |Config].
-
-end_per_testcase(_Case, Config) ->
-    Dog = ?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog),
-    ok.
-
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 5}}].
 
 all() -> 
     [core_files].
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-
-core_files(doc) ->
-    [];
-core_files(suite) ->
-    [];
 core_files(Config) when is_list(Config) ->
     case os:type() of
 	{win32, _} ->
@@ -116,7 +82,7 @@ find_cerl(false) ->
     end;
 find_cerl(DBTop) ->
     case catch filelib:wildcard(filename:join([DBTop,
-					       "otp_src_R*",
+					       "otp_src_*",
 					       "bin",
 					       "cerl"])) of
 	[Cerl | _ ] ->
@@ -231,6 +197,20 @@ mod_time_list(F) ->
 str_strip(S) ->
     string:strip(string:strip(string:strip(S), both, $\n), both, $\r).
 
+dump_core(#core_search_conf{ cerl = false }, _) ->
+    ok;
+dump_core(_, {ignore, _Core}) ->
+    ok;
+dump_core(#core_search_conf{ cerl = Cerl }, Core) ->
+    Dump = case test_server:is_debug() of
+	       true ->
+		   os:cmd(Cerl ++ " -debug -dump " ++ Core);
+	       _ ->
+		   os:cmd(Cerl ++ " -dump " ++ Core)
+	   end,
+    ct:log("~ts~n~n~ts",[Core,Dump]).
+
+
 format_core(Conf, {ignore, Core}) ->
     format_core(Conf, Core, "[ignored] ");
 format_core(Conf, Core) ->
@@ -254,11 +234,16 @@ core_file_search(#core_search_conf{search_dir = Base,
 				   extra_search_dir = XBase,
 				   cerl = Cerl,
 				   run_by_ts = RunByTS} = Conf) ->
-    case Cerl of
-	false -> ok;
-	_ -> catch io:format("A cerl script that probably can be used for "
-			     "inspection of emulator cores:~n  ~s~n",
-			     [Cerl])
+    case {Cerl,test_server:is_debug()} of
+	{false,_} -> ok;
+	{_,true} ->
+	    catch io:format("A cerl script that probably can be used for "
+			    "inspection of emulator cores:~n  ~s -debug~n",
+			    [Cerl]);
+	_ ->
+	    catch io:format("A cerl script that probably can be used for "
+			    "inspection of emulator cores:~n  ~s~n",
+			    [Cerl])
     end,
     io:format("Searching for core-files in: ~s~s~n",
 	      [case XBase of
@@ -329,10 +314,12 @@ core_file_search(#core_search_conf{search_dir = Base,
 					 ["Ignored core-files found:",
 					  lists:reverse(ICores)]
 				 end]),
+
+	    lists:foreach(fun(C) -> dump_core(Conf,C) end, Cores),
 	    case {RunByTS, ICores, FCores} of
 		{true, [], []} -> ok;
 		{true, _, []} -> {comment, Res};
-		{true, _, _} -> ?t:fail(Res);
+		{true, _, _} -> ct:fail(Res);
 		_ -> Res
 	    end
     end.