Merge branch 'maint'

2 files changed, 66 insertions, 10 deletions

diff --git a/lib/stdlib/test/gen_fsm_SUITE.erl b/lib/stdlib/test/gen_fsm_SUITE.erl
index 2e266198e9..75796ab1b6 100644
--- a/lib/stdlib/test/gen_fsm_SUITE.erl
+++ b/lib/stdlib/test/gen_fsm_SUITE.erl
@@ -34,7 +34,9 @@
 
 -export([shutdown/1]).
 
--export([ sys1/1, call_format_status/1, error_format_status/1, get_state/1, replace_state/1]).
+-export([ sys1/1,
+	  call_format_status/1, error_format_status/1, terminate_crash_format/1,
+	  get_state/1, replace_state/1]).
 
 -export([hibernate/1,hiber_idle/3,hiber_wakeup/3,hiber_idle/2,hiber_wakeup/2]).
 
@@ -71,7 +73,8 @@ groups() ->
       [stop1, stop2, stop3, stop4, stop5, stop6, stop7, stop8, stop9, stop10]},
      {abnormal, [], [abnormal1, abnormal2]},
      {sys, [],
-      [sys1, call_format_status, error_format_status, get_state, replace_state]}].
+      [sys1, call_format_status, error_format_status, terminate_crash_format,
+       get_state, replace_state]}].
 
 init_per_suite(Config) ->
     Config.
@@ -507,7 +510,7 @@ error_format_status(Config) when is_list(Config) ->
     receive
 	{error,_GroupLeader,{Pid,
 			     "** State machine"++_,
-			     [Pid,{_,_,badreturn},idle,StateData,_]}} ->
+			     [Pid,{_,_,badreturn},idle,{formatted,StateData},_]}} ->
 	    ok;
 	Other ->
 	    ?line io:format("Unexpected: ~p", [Other]),
@@ -517,6 +520,29 @@ error_format_status(Config) when is_list(Config) ->
     process_flag(trap_exit, OldFl),
     ok.
 
+terminate_crash_format(Config) when is_list(Config) ->
+    error_logger_forwarder:register(),
+    OldFl = process_flag(trap_exit, true),
+    StateData = crash_terminate,
+    {ok, Pid} = gen_fsm:start(gen_fsm_SUITE, {state_data, StateData}, []),
+    stop_it(Pid),
+    receive
+	{error,_GroupLeader,{Pid,
+			     "** State machine"++_,
+			     [Pid,{_,_,_},idle,{formatted, StateData},_]}} ->
+	    ok;
+	Other ->
+	    io:format("Unexpected: ~p", [Other]),
+	    ?t:fail()
+    after 5000 ->
+	    io:format("Timeout: expected error logger msg", []),
+	    ?t:fail()
+    end,
+    [] = ?t:messages_get(),
+    process_flag(trap_exit, OldFl),
+    ok.
+
+
 get_state(Config) when is_list(Config) ->
     State = self(),
     {ok, Pid} = gen_fsm:start(?MODULE, {state_data, State}, []),
@@ -971,7 +997,8 @@ init({state_data, StateData}) ->
 init(_) ->
     {ok, idle, state_data}.
 
-
+terminate(_, _State, crash_terminate) ->
+    exit({crash, terminate});
 terminate({From, stopped}, State, _Data) ->
     From ! {self(), {stopped, State}},
     ok;
@@ -1109,6 +1136,6 @@ handle_sync_event({get, _Pid}, _From, State, Data) ->
     {reply, {state, State, Data}, State, Data}.
 
 format_status(terminate, [_Pdict, StateData]) ->
-    StateData;
+    {formatted, StateData};
 format_status(normal, [_Pdict, _StateData]) ->
     [format_status_called].
diff --git a/lib/stdlib/test/gen_server_SUITE.erl b/lib/stdlib/test/gen_server_SUITE.erl
index c3ec4932b3..8b6654dd5e 100644
--- a/lib/stdlib/test/gen_server_SUITE.erl
+++ b/lib/stdlib/test/gen_server_SUITE.erl
@@ -32,7 +32,8 @@
 	 spec_init_local_registered_parent/1, 
 	 spec_init_global_registered_parent/1,
 	 otp_5854/1, hibernate/1, otp_7669/1, call_format_status/1,
-	 error_format_status/1, get_state/1, replace_state/1, call_with_huge_message_queue/1
+	 error_format_status/1, terminate_crash_format/1,
+	 get_state/1, replace_state/1, call_with_huge_message_queue/1
 	]).
 
 -export([stop1/1, stop2/1, stop3/1, stop4/1, stop5/1, stop6/1, stop7/1,
@@ -59,7 +60,8 @@ all() ->
      call_remote_n3, spec_init,
      spec_init_local_registered_parent,
      spec_init_global_registered_parent, otp_5854, hibernate,
-     otp_7669, call_format_status, error_format_status,
+     otp_7669,
+     call_format_status, error_format_status, terminate_crash_format,
      get_state, replace_state,
      call_with_huge_message_queue].
 
@@ -376,7 +378,7 @@ crash(Config) when is_list(Config) ->
     receive
 	{error,_GroupLeader4,{Pid4,
 			      "** Generic server"++_,
-			      [Pid4,crash,state4,crashed]}} ->
+			      [Pid4,crash,{formatted, state4},crashed]}} ->
 	    ok;
 	Other4a ->
  	    ?line io:format("Unexpected: ~p", [Other4a]),
@@ -1127,7 +1129,7 @@ error_format_status(Config) when is_list(Config) ->
     receive
 	{error,_GroupLeader,{Pid,
 			     "** Generic server"++_,
-			     [Pid,crash,State,crashed]}} ->
+			     [Pid,crash,{formatted, State},crashed]}} ->
 	    ok;
 	Other ->
 	    ?line io:format("Unexpected: ~p", [Other]),
@@ -1137,6 +1139,31 @@ error_format_status(Config) when is_list(Config) ->
     process_flag(trap_exit, OldFl),
     ok.
 
+%% Verify that error when terminating correctly calls our format_status/2 fun
+%%
+terminate_crash_format(Config) when is_list(Config) ->
+    error_logger_forwarder:register(),
+    OldFl = process_flag(trap_exit, true),
+    State = crash_terminate,
+    {ok, Pid} = gen_server:start_link(?MODULE, {state, State}, []),
+    gen_server:call(Pid, stop),
+    receive {'EXIT', Pid, {crash, terminate}} -> ok end,
+    receive
+	{error,_GroupLeader,{Pid,
+			     "** Generic server"++_,
+			     [Pid,stop, {formatted, State},{crash, terminate}]}} ->
+	    ok;
+	Other ->
+	    io:format("Unexpected: ~p", [Other]),
+	    ?t:fail()
+    after 5000 ->
+	    io:format("Timeout: expected error logger msg", []),
+	    ?t:fail()
+    end,
+    ?t:messages_get(),
+    process_flag(trap_exit, OldFl),
+    ok.
+
 %% Verify that sys:get_state correctly returns gen_server state
 %%
 get_state(suite) ->
@@ -1426,10 +1453,12 @@ terminate({From, stopped}, _State) ->
 terminate({From, stopped_info}, _State) ->
     From ! {self(), stopped_info},
     ok;
+terminate(_, crash_terminate) ->
+    exit({crash, terminate});
 terminate(_Reason, _State) ->
     ok.
 
 format_status(terminate, [_PDict, State]) ->
-    State;
+    {formatted, State};
 format_status(normal, [_PDict, _State]) ->
     format_status_called.