1 files changed, 32 insertions, 9 deletions

diff --git a/erts/emulator/test/trace_SUITE.erl b/erts/emulator/test/trace_SUITE.erl
index 2251575e5a..6eae182e45 100644
--- a/erts/emulator/test/trace_SUITE.erl
+++ b/erts/emulator/test/trace_SUITE.erl
@@ -3,16 +3,17 @@
 %%
 %% Copyright Ericsson AB 1997-2013. 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%
 %%
@@ -181,6 +182,13 @@ send_trace(Config) when is_list(Config) ->
     ?line {trace, Sender, send, to_receiver, Receiver} = receive_first(),
     ?line receive_nothing(),
 
+    %% Check that a message sent to another registered process is traced.
+    register(?MODULE,Receiver),
+    Sender ! {send_please, ?MODULE, to_receiver},
+    {trace, Sender, send, to_receiver, ?MODULE} = receive_first(),
+    receive_nothing(),
+    unregister(?MODULE),
+
     %% Check that a message sent to this process is traced.
     ?line Sender ! {send_please, self(), to_myself},
     ?line receive to_myself -> ok end,
@@ -188,6 +196,21 @@ send_trace(Config) when is_list(Config) ->
     ?line {trace, Sender, send, to_myself, Self} = receive_first(),
     ?line receive_nothing(),
 
+    %% Check that a message sent to dead process is traced.
+    {Pid,Ref} = spawn_monitor(fun() -> ok end),
+    receive {'DOWN',Ref,_,_,_} -> ok end,
+    Sender ! {send_please, Pid, to_dead},
+    {trace, Sender, send_to_non_existing_process, to_dead, Pid} = receive_first(),
+    receive_nothing(),
+
+    %% Check that a message sent to unknown registrated process is traced.
+    BadargSender = fun_spawn(fun sender/0),
+    1 = erlang:trace(BadargSender, true, [send]),
+    unlink(BadargSender),
+    BadargSender ! {send_please, not_registered, to_unknown},
+    {trace, BadargSender, send, to_unknown, not_registered} = receive_first(),
+    receive_nothing(),
+
     %% Another process should not be able to trace Sender.
     ?line Intruder = fun_spawn(fun() -> erlang:trace(Sender, true, [send]) end),
     ?line {'EXIT', Intruder, {badarg, _}} = receive_first(),