Merge branch 'siri/ct_hooks/callbacks-on-skip/OTP-10599' into maint

* siri/ct_hooks/callbacks-on-skip/OTP-10599:
  [ct] Update built-in ct hooks with new Suite parameter
  [cth_surefire] Handle skips from test spec
  [ct] Remove excessive skipped/failed tag in hook function
  [ct] Send tc_start event on force_stop and failed sequence
  [ct] Correctly handle process died in init and end_per_testcase
  [ct] Fix faulty hook callbacks for skipped tests
  Add dummy end_per_suite/1
  [ct] Fix hooks and fail when one of init/end_per_* does not exit
  [ct] Add Suite argument to hook callback functions
  [ct] Fix function_clause in ct_framework when hook function crashes

1 files changed, 20 insertions, 20 deletions

diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/verify_data_dir_cth.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/verify_data_dir_cth.erl
index 9abd2e5e83..42e086b96e 100644
--- a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/verify_data_dir_cth.erl
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/verify_data_dir_cth.erl
@@ -62,43 +62,43 @@ post_end_per_suite(Suite,Config,Return,State) ->
     check_dirs(State,Config),
     empty_cth:post_end_per_suite(Suite,Config,Return,State).
 
-pre_init_per_group(Group,Config,State) ->
+pre_init_per_group(Suite,Group,Config,State) ->
     check_dirs(State,Config),
-    empty_cth:pre_init_per_group(Group,Config,State).
+    empty_cth:pre_init_per_group(Suite,Group,Config,State).
 
-post_init_per_group(Group,Config,Return,State) ->
+post_init_per_group(Suite,Group,Config,Return,State) ->
     check_dirs(State,Return),
-    empty_cth:post_init_per_group(Group,Config,Return,State).
+    empty_cth:post_init_per_group(Suite,Group,Config,Return,State).
 
-pre_end_per_group(Group,Config,State) ->
+pre_end_per_group(Suite,Group,Config,State) ->
     check_dirs(State,Config),
-    empty_cth:pre_end_per_group(Group,Config,State).
+    empty_cth:pre_end_per_group(Suite,Group,Config,State).
 
-post_end_per_group(Group,Config,Return,State) ->
+post_end_per_group(Suite,Group,Config,Return,State) ->
     check_dirs(State,Config),
-    empty_cth:post_end_per_group(Group,Config,Return,State).
+    empty_cth:post_end_per_group(Suite,Group,Config,Return,State).
 
-pre_init_per_testcase(TC,Config,State) ->
+pre_init_per_testcase(Suite,TC,Config,State) ->
     check_dirs(State,Config),
-    empty_cth:pre_init_per_testcase(TC,Config,State).
+    empty_cth:pre_init_per_testcase(Suite,TC,Config,State).
 
-post_init_per_testcase(TC,Config,Return,State) ->
+post_init_per_testcase(Suite,TC,Config,Return,State) ->
     check_dirs(State,Config),
-    empty_cth:post_init_per_testcase(TC,Config,Return,State).
+    empty_cth:post_init_per_testcase(Suite,TC,Config,Return,State).
 
-pre_end_per_testcase(TC,Config,State) ->
+pre_end_per_testcase(Suite,TC,Config,State) ->
     check_dirs(State,Config),
-    empty_cth:pre_end_per_testcase(TC,Config,State).
+    empty_cth:pre_end_per_testcase(Suite,TC,Config,State).
 
-post_end_per_testcase(TC,Config,Return,State) ->
+post_end_per_testcase(Suite,TC,Config,Return,State) ->
     check_dirs(State,Config),
-    empty_cth:post_end_per_testcase(TC,Config,Return,State).
+    empty_cth:post_end_per_testcase(Suite,TC,Config,Return,State).
 
-on_tc_fail(TC, Reason, State) ->
-    empty_cth:on_tc_fail(TC,Reason,State).
+on_tc_fail(Suite,TC, Reason, State) ->
+    empty_cth:on_tc_fail(Suite,TC,Reason,State).
 
-on_tc_skip(TC, Reason, State) ->
-    empty_cth:on_tc_skip(TC,Reason,State).
+on_tc_skip(Suite,TC, Reason, State) ->
+    empty_cth:on_tc_skip(Suite,TC,Reason,State).
 
 terminate(State) ->
     empty_cth:terminate(State).