1 files changed, 12 insertions, 16 deletions
diff --git a/lib/runtime_tools/test/dbg_SUITE.erl b/lib/runtime_tools/test/dbg_SUITE.erl
index 4b32696aa5..5a3c885571 100644
--- a/lib/runtime_tools/test/dbg_SUITE.erl
+++ b/lib/runtime_tools/test/dbg_SUITE.erl
@@ -389,8 +389,8 @@ distributed(Config) when is_list(Config) ->
         {value, {matched, Node, 1}} = lists:keysearch(Node, 2, Z),
         dbg:cn(Node),
         dbg:tp(dbg,ln,[]),
-        ok = rpc:call(Node, dbg, ltp, []),
-        ok = rpc:call(Node, dbg, ln, []),
+        ok = rpc:block_call(Node, dbg, ltp, []),
+        ok = rpc:block_call(Node, dbg, ln, []),
         ok = dbg:ln(),
         S = self(),
         {TraceSend, TraceCall} =
@@ -669,12 +669,6 @@ file_port_schedfix1(Config) when is_list(Config) ->
     %%
     {ok,[{matched,_,_}]} = dbg:p(all, [clear]),
     stop(),
-    % Some debug code to run on all platforms, for finding the fault on genny
-    % Dont touch please /PaN
-    io:format("Trace dump by PaN BEGIN~n"),
-    dbg:trace_client(file,{FName, wrap, ".wraplog"},{fun(end_of_trace,Pid)-> Pid ! done; (Mesg,Pid) -> io:format("~w~n",[Mesg]),Pid end,self()}),
-    receive done -> ok end,
-    io:format("Trace dump by PaN END~n"),
     %%
     %% Get the trace result
     %%
@@ -695,14 +689,12 @@ file_port_schedfix1(Config) when is_list(Config) ->
     %%
     %% Analyze the result
     %%
-    {Min, Max} =
-    lists:foldl(
-      fun({_Pid, M}, {Mi, Ma}) ->
-              {if M < Mi -> M; true -> Mi end,
-               if M > Ma -> M; true -> Ma end}
-      end,
-      {void, 0},
-      Result),
+    {Min, Max} = lists:foldl(fun({_Pid, M}, {Mi, Ma}) ->
+                                     {if M < Mi -> M; true -> Mi end,
+                                      if M > Ma -> M; true -> Ma end}
+                             end,
+                             {void, 0},
+                             Result),
     % More PaN debug
     io:format("Min = ~f, Max = ~f~n",[Min,Max]),
     %%
@@ -1117,6 +1109,10 @@ schedstat_handler(TraceMsg, {Parent, Tag, Data} = State) ->
                     Data
             end,
             {Parent, Tag, NewData};
+        {trace_ts,_Pid,spawned,_OtherPid,_,_Ts} ->
+            State;
+        {trace_ts,_Pid,getting_linked,_OtherPid,_Ts} ->
+            State;
         {trace_ts, Pid, exit, normal, {A3, B3, C3}} ->
             NewData =
             case lists:keysearch(Pid, 1, Data) of