Make line numbers show in logs for timetraps and abortions

OTP-9930

3 files changed, 53 insertions, 21 deletions

diff --git a/lib/common_test/test/ct_error_SUITE.erl b/lib/common_test/test/ct_error_SUITE.erl
index 2b3157ff3b..484b0aac0c 100644
--- a/lib/common_test/test/ct_error_SUITE.erl
+++ b/lib/common_test/test/ct_error_SUITE.erl
@@ -682,7 +682,7 @@ test_events(timetrap_end_conf) ->
     [
      {?eh,start_logging,{'DEF','RUNDIR'}},
      {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
-     {?eh,start_info,{1,1,6}},
+     {?eh,start_info,{1,1,8}},
      {?eh,tc_start,{timetrap_1_SUITE,init_per_suite}},
      {?eh,tc_done,{timetrap_1_SUITE,init_per_suite,ok}},
      {?eh,tc_start,{timetrap_1_SUITE,tc1}},
@@ -709,6 +709,14 @@ test_events(timetrap_end_conf) ->
      {?eh,tc_done,
       {timetrap_1_SUITE,tc6,{failed,{testcase_aborted,testing_end_conf}}}},
      {?eh,test_stats,{0,6,{0,0}}},
+     {?eh,tc_start,{timetrap_1_SUITE,tc7}},
+     {?eh,tc_done,
+      {timetrap_1_SUITE,tc7,{failed,{timetrap_timeout,1000}}}},
+     {?eh,test_stats,{0,7,{0,0}}},
+     {?eh,tc_start,{timetrap_1_SUITE,tc8}},
+     {?eh,tc_done,
+      {timetrap_1_SUITE,tc8,{failed,{timetrap_timeout,1000}}}},
+     {?eh,test_stats,{0,8,{0,0}}},
      {?eh,tc_start,{timetrap_1_SUITE,end_per_suite}},
      {?eh,tc_done,{timetrap_1_SUITE,end_per_suite,ok}},
      {?eh,test_done,{'DEF','STOP_TIME'}},
diff --git a/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_1_SUITE.erl b/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_1_SUITE.erl
index cb3109349b..faa0a7305c 100644
--- a/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_1_SUITE.erl
+++ b/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_1_SUITE.erl
@@ -83,23 +83,11 @@ init_per_testcase(TC, Config) ->
     ets:insert(?MODULE, {last_case,fail}),
     init_per_testcase1(TC, Config).
 
-init_per_testcase1(tc1, Config) ->
-    [{tc,tc1}|Config];
-
-init_per_testcase1(tc2, Config) ->
-    [{tc,tc2}|Config];
-
-init_per_testcase1(tc3, Config) ->
-    [{tc,tc3}|Config];
-
 init_per_testcase1(tc4, Config) ->
     [{tc,tc4},{default_timeout,5000}|Config];
 
-init_per_testcase1(tc5, Config) ->
-    [{tc,tc5}|Config];
-
-init_per_testcase1(tc6, Config) ->
-    [{tc,tc6}|Config].
+init_per_testcase1(TC, Config) ->
+    [{tc,TC}|Config].
 
 %%--------------------------------------------------------------------
 %% Function: end_per_testcase(TestCase, Config0) ->
@@ -145,7 +133,19 @@ end_per_testcase1(tc5, Config) ->
 end_per_testcase1(tc6, Config) ->
     ct:pal("end_per_testcase(tc6): ~p", [Config]),
     tc6 = ?config(tc, Config),
-    exit(end_per_tc_fail_after_abort).
+    exit(end_per_tc_fail_after_abort);
+
+end_per_testcase1(tc7, Config) ->
+    ct:pal("end_per_testcase(tc7): ~p", [Config]),
+    tc7 = ?config(tc, Config),
+    {failed,timetrap_timeout} = ?config(tc_status, Config),
+    ok;
+
+end_per_testcase1(tc8, Config) ->
+    ct:pal("end_per_testcase(tc8): ~p", [Config]),
+    tc8 = ?config(tc, Config),
+    {failed,timetrap_timeout} = ?config(tc_status, Config),
+    ok.
 
 %%--------------------------------------------------------------------
 %% Function: groups() -> [Group]
@@ -170,25 +170,42 @@ groups() ->
 %% Reason = term()
 %%--------------------------------------------------------------------
 all() ->
-    [tc1, tc2, tc3, tc4, tc5, tc6].
+    [tc1, tc2, tc3, tc4, tc5, tc6, tc7, tc8].
 
 tc1(_) ->
-    timer:sleep(2000).
+    timer:sleep(2000),
+    ok.
 
 tc2(_) ->
     timer:sleep(2000).
 
 tc3(_) ->
     spawn(ct, abort_current_testcase, [testing_end_conf]),
-    timer:sleep(2000).
+    timer:sleep(2000),
+    ok.
 
 tc4(_) ->
     spawn(ct, abort_current_testcase, [testing_end_conf]),
-    timer:sleep(2000).
+    timer:sleep(2000),
+    ok.
 
 tc5(_) ->
-    timer:sleep(2000).
+    timer:sleep(2000),
+    ok.
 
 tc6(_) ->
     spawn(ct, abort_current_testcase, [testing_end_conf]),
     timer:sleep(2000).
+
+tc7(_) ->
+    sleep(2000),
+    ok.
+
+tc8(_) ->
+    timetrap_helper:sleep(2000),
+    ok.
+
+%%%-----------------------------------------------------------------
+sleep(T) ->
+    timer:sleep(T),
+    ok.
diff --git a/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_helper.erl b/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_helper.erl
new file mode 100644
index 0000000000..1389acca11
--- /dev/null
+++ b/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_helper.erl
@@ -0,0 +1,7 @@
+-module(timetrap_helper).
+
+-export([sleep/1]).
+
+sleep(T) ->
+    timer:sleep(T),
+    ok.