Merge branch 'egil/runtime_tools/cuddle-tests'

* egil/runtime_tools/cuddle-tests:
  runtime_tools: Cuddle with dbg_SUITE
  runtime_tools: Remove obsolete debug info in dbg_SUITE
  runtime_tools: Use 'infinity' gen_server calls

1 files changed, 10 insertions, 14 deletions

diff --git a/lib/runtime_tools/test/dbg_SUITE.erl b/lib/runtime_tools/test/dbg_SUITE.erl
index 9c9d6ca352..6b6e35fc31 100644
--- a/lib/runtime_tools/test/dbg_SUITE.erl
+++ b/lib/runtime_tools/test/dbg_SUITE.erl
@@ -447,12 +447,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
     %%
@@ -473,14 +467,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]),
     %%
@@ -895,6 +887,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