Merge branch 'egil/et/fix-trace-tags/OTP-13545'

* egil/et/fix-trace-tags/OTP-13545:
  et: Update runtime dependencies
  et: Update gc trace tags in selector
  et: Remove unnecessary boilerplate in tests

4 files changed, 49 insertions, 48 deletions

diff --git a/lib/et/src/et.app.src b/lib/et/src/et.app.src
index 77b9488c7e..7a5928d6ab 100644
--- a/lib/et/src/et.app.src
+++ b/lib/et/src/et.app.src
@@ -33,6 +33,6 @@
   {registered, [et_collector]},
   {applications, [stdlib, kernel]},
   {env, []},
-  {runtime_dependencies, ["wx-1.2","stdlib-2.0","runtime_tools-1.8.14",
-			  "kernel-3.0","erts-6.0"]}
+  {runtime_dependencies, ["wx-1.2","stdlib-2.0","runtime_tools-1.10",
+			  "kernel-3.0","erts-8.0"]}
  ]}.
diff --git a/lib/et/src/et_selector.erl b/lib/et/src/et_selector.erl
index 0e2d7010cd..a0297c21d1 100644
--- a/lib/et/src/et_selector.erl
+++ b/lib/et/src/et_selector.erl
@@ -23,11 +23,9 @@
 
 -module(et_selector).
 
--export([
-         make_pattern/1, 
+-export([make_pattern/1,
          change_pattern/1,
-         parse_event/2
-        ]).
+         parse_event/2]).
 
 -compile([{nowarn_deprecated_function,[{erlang,now,0}]}]).
 
@@ -535,7 +533,7 @@ parse_event(Mod, Trace, ParsedTS, ReportedTS, From, Label, Contents) ->
 					  {from, From},
 					  {to, From},
 					  {mfa, MFA}]}}; % MFA | 0
-        gc_start ->
+        gc_minor_start ->
             DetailLevel = 80,
             [GcKeyValueList] = Contents,
             {true, #event{detail_level = DetailLevel,
@@ -549,7 +547,7 @@ parse_event(Mod, Trace, ParsedTS, ReportedTS, From, Label, Contents) ->
 					  {from, From},
 					  {to, From},
 					  {gc_items, GcKeyValueList}]}};
-        gc_end ->
+        gc_minor_end ->
             DetailLevel = 85,
             [GcKeyValueList] = Contents,
             {true, #event{detail_level = DetailLevel,
@@ -559,10 +557,38 @@ parse_event(Mod, Trace, ParsedTS, ReportedTS, From, Label, Contents) ->
                           to           = From,
                           label        = Label,
                           contents     = [{label, Label},
-					  {detail_level, DetailLevel},
-					  {from, From},
-					  {to, From},
-					  {gc_items, GcKeyValueList}]}};
+                                          {detail_level, DetailLevel},
+                                          {from, From},
+                                          {to, From},
+                                          {gc_items, GcKeyValueList}]}};
+        gc_major_start ->
+            DetailLevel = 80,
+            [GcKeyValueList] = Contents,
+            {true, #event{detail_level = DetailLevel,
+                          trace_ts     = ReportedTS,
+                          event_ts     = ParsedTS,
+                          from         = From,
+                          to           = From,
+                          label        = Label,
+                          contents     = [{label, Label},
+                                          {detail_level, DetailLevel},
+                                          {from, From},
+                                          {to, From},
+                                          {gc_items, GcKeyValueList}]}};
+        gc_major_end ->
+            DetailLevel = 85,
+            [GcKeyValueList] = Contents,
+            {true, #event{detail_level = DetailLevel,
+                          trace_ts     = ReportedTS,
+                          event_ts     = ParsedTS,
+                          from         = From,
+                          to           = From,
+                          label        = Label,
+                          contents     = [{label, Label},
+                                          {detail_level, DetailLevel},
+                                          {from, From},
+                                          {to, From},
+                                          {gc_items, GcKeyValueList}]}};
         _ ->
             error_logger:format("~p(~p): Ignoring unknown trace type -> ~p~n~n",
                                 [?MODULE, ?LINE, Trace]),
diff --git a/lib/et/test/et_SUITE.erl b/lib/et/test/et_SUITE.erl
index 4a26b46439..199aff43a8 100644
--- a/lib/et/test/et_SUITE.erl
+++ b/lib/et/test/et_SUITE.erl
@@ -16,7 +16,8 @@
 %%
 -module(et_SUITE).
 
--compile([export_all]).
+-export([suite/0, all/0]).
+-export([app/1, appup/1]).
 -include_lib("common_test/include/ct.hrl").
 
 suite() ->
@@ -25,27 +26,10 @@ suite() ->
 all() ->
     [app, appup].
 
-groups() ->
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-     ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-app() ->
-    [{doc, "Test that the et app file is ok"}].
+%% Test that the et app file is ok
 app(Config) when is_list(Config) ->
     ok = ?t:app_test(et).
 
-appup() ->
-    [{doc, "Test that the et appup file is ok"}].
+%% Test that the et appup file is ok
 appup(Config) when is_list(Config) ->
     ok = ?t:appup_test(et).
diff --git a/lib/et/test/et_wx_SUITE.erl b/lib/et/test/et_wx_SUITE.erl
index 785d1b8145..6475b6706b 100644
--- a/lib/et/test/et_wx_SUITE.erl
+++ b/lib/et/test/et_wx_SUITE.erl
@@ -19,11 +19,10 @@
 
 -module(et_wx_SUITE).
 
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, 
-	 init_per_suite/1, end_per_suite/1, 
-	 init_per_testcase/2, end_per_testcase/2]).
-
--compile(export_all).
+-export([all/0, suite/0,
+         init_per_testcase/2, end_per_testcase/2,
+         init_per_suite/1, end_per_suite/1]).
+-export([start_all_windows/1]).
 
 -include("et_test_lib.hrl").
 
@@ -40,21 +39,13 @@ end_per_testcase(Func,Config) ->
     et_test_lib:end_per_testcase(Func,Config).
 
 %% SUITE specification
-suite() -> [{ct_hooks,[ts_install_cth]}].
+
+suite() ->
+    [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     [start_all_windows].
 
-groups() -> 
-    [].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
 %% The test cases
 
 %% Display all windows and see if something crashes