aboutsummaryrefslogtreecommitdiffstats
path: root/lib/common_test/test
diff options
context:
space:
mode:
authorPeter Andersson <[email protected]>2013-06-05 01:53:43 +0200
committerPeter Andersson <[email protected]>2013-06-05 16:14:07 +0200
commitb715feddc88bd8f6bdb664cc2e87425de7d31898 (patch)
tree7fb416f4e2336fc57107c92ff3b97071cb0ddac3 /lib/common_test/test
parent4f5f57d0bdd8b5ba9902c868758130a660c22606 (diff)
downloadotp-b715feddc88bd8f6bdb664cc2e87425de7d31898.tar.gz
otp-b715feddc88bd8f6bdb664cc2e87425de7d31898.tar.bz2
otp-b715feddc88bd8f6bdb664cc2e87425de7d31898.zip
Fix problem with tests being wrongly added to separate specs
Diffstat (limited to 'lib/common_test/test')
-rw-r--r--lib/common_test/test/ct_testspec_3_SUITE.erl398
1 files changed, 59 insertions, 339 deletions
diff --git a/lib/common_test/test/ct_testspec_3_SUITE.erl b/lib/common_test/test/ct_testspec_3_SUITE.erl
index 0174eef9c0..d8a59b982c 100644
--- a/lib/common_test/test/ct_testspec_3_SUITE.erl
+++ b/lib/common_test/test/ct_testspec_3_SUITE.erl
@@ -1386,12 +1386,12 @@ test_events(rec_incl_separate_join2) ->
{?eh,stop_logging,[]}];
test_events(rec_incl_join_separate1) ->
- [
- {?eh,start_logging,{'DEF','RUNDIR'}},
+ [{?eh,start_logging,{'DEF','RUNDIR'}},
{?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
{?eh,start_info,{2,2,10}},
{?eh,tc_start,{t23_SUITE,init_per_suite}},
{?eh,tc_done,{t23_SUITE,init_per_suite,ok}},
+ {?eh,test_stats,{1,2,{1,1}}},
{?eh,tc_start,{t23_SUITE,end_per_suite}},
{?eh,tc_done,{t23_SUITE,end_per_suite,ok}},
{?eh,tc_start,{t22_SUITE,init_per_suite}},
@@ -1403,103 +1403,35 @@ test_events(rec_incl_join_separate1) ->
{?eh,stop_logging,[]},
{?eh,start_logging,{'DEF','RUNDIR'}},
- {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
- {?eh,start_info,{4,3,20}},
- {?eh,tc_start,{t23_SUITE,init_per_suite}},
- {?eh,tc_done,{t23_SUITE,init_per_suite,ok}},
- {?eh,tc_start,{t23_SUITE,end_per_suite}},
- {?eh,tc_done,{t23_SUITE,end_per_suite,ok}},
- {?eh,tc_start,{t12_SUITE,init_per_suite}},
- {?eh,tc_done,{t12_SUITE,init_per_suite,ok}},
- {?eh,tc_start,{t12_SUITE,end_per_suite}},
- {?eh,tc_done,{t12_SUITE,end_per_suite,ok}},
- {?eh,tc_start,{t12_SUITE,init_per_suite}},
- {?eh,tc_done,{t12_SUITE,init_per_suite,ok}},
- {?eh,tc_start,{t12_SUITE,end_per_suite}},
- {?eh,tc_done,{t12_SUITE,end_per_suite,ok}},
- {?eh,tc_start,{t22_SUITE,init_per_suite}},
- {?eh,tc_done,{t22_SUITE,init_per_suite,ok}},
- {?eh,test_stats,{4,8,{4,4}}},
- {?eh,tc_start,{t22_SUITE,end_per_suite}},
- {?eh,tc_done,{t22_SUITE,end_per_suite,ok}},
- {?eh,test_done,{'DEF','STOP_TIME'}},
+ {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}}]
+ ++ flat_spec2_events() ++
+ [{?eh,test_done,{'DEF','STOP_TIME'}},
{?eh,stop_logging,[]},
-
-%%! WHY NOT 12,12,22?
{?eh,start_logging,{'DEF','RUNDIR'}},
- {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
- {?eh,start_info,{3,3,15}},
- {?eh,tc_start,{t23_SUITE,init_per_suite}},
- {?eh,tc_done,{t23_SUITE,init_per_suite,ok}},
- {?eh,tc_start,{t23_SUITE,end_per_suite}},
- {?eh,tc_done,{t23_SUITE,end_per_suite,ok}},
- {?eh,tc_start,{t21_SUITE,init_per_suite}},
- {?eh,tc_done,{t21_SUITE,init_per_suite,ok}},
- {?eh,tc_start,{t21_SUITE,end_per_suite}},
- {?eh,tc_done,{t21_SUITE,end_per_suite,ok}},
- {?eh,tc_start,{t11_SUITE,init_per_suite}},
- {?eh,tc_done,{t11_SUITE,init_per_suite,ok}},
- {?eh,test_stats,{3,6,{3,3}}},
- {?eh,tc_start,{t11_SUITE,end_per_suite}},
- {?eh,tc_done,{t11_SUITE,end_per_suite,ok}},
- {?eh,test_done,{'DEF','STOP_TIME'}},
+ {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}}]
+ ++ flat_spec1_events() ++
+ [{?eh,test_done,{'DEF','STOP_TIME'}},
{?eh,stop_logging,[]},
-%%! WHY NOT 11,21?
-
{?eh,start_logging,{'DEF','RUNDIR'}},
- {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
- {?eh,start_info,{3,3,15}},
- {?eh,tc_start,{t23_SUITE,init_per_suite}},
- {?eh,tc_done,{t23_SUITE,init_per_suite,ok}},
- {?eh,tc_start,{t23_SUITE,end_per_suite}},
- {?eh,tc_done,{t23_SUITE,end_per_suite,ok}},
- {?eh,tc_start,{t21_SUITE,init_per_suite}},
- {?eh,tc_done,{t21_SUITE,init_per_suite,ok}},
- {?eh,tc_start,{t21_SUITE,end_per_suite}},
- {?eh,tc_done,{t21_SUITE,end_per_suite,ok}},
- {?eh,tc_start,{t11_SUITE,init_per_suite}},
- {?eh,tc_done,{t11_SUITE,init_per_suite,ok}},
- {?eh,test_stats,{3,6,{3,3}}},
- {?eh,tc_start,{t11_SUITE,end_per_suite}},
- {?eh,tc_done,{t11_SUITE,end_per_suite,ok}},
- {?eh,test_done,{'DEF','STOP_TIME'}},
+ {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}}]
+ ++ flat_spec1_events() ++
+ [{?eh,test_done,{'DEF','STOP_TIME'}},
{?eh,stop_logging,[]},
-
-%%! WHY NOT 11,21?
{?eh,start_logging,{'DEF','RUNDIR'}},
- {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
- {?eh,start_info,{4,3,20}},
- {?eh,tc_start,{t23_SUITE,init_per_suite}},
- {?eh,tc_done,{t23_SUITE,init_per_suite,ok}},
- {?eh,tc_start,{t23_SUITE,end_per_suite}},
- {?eh,tc_done,{t23_SUITE,end_per_suite,ok}},
- {?eh,tc_start,{t12_SUITE,init_per_suite}},
- {?eh,tc_done,{t12_SUITE,init_per_suite,ok}},
- {?eh,tc_start,{t12_SUITE,end_per_suite}},
- {?eh,tc_done,{t12_SUITE,end_per_suite,ok}},
- {?eh,tc_start,{t12_SUITE,init_per_suite}},
- {?eh,tc_done,{t12_SUITE,init_per_suite,ok}},
- {?eh,tc_start,{t12_SUITE,end_per_suite}},
- {?eh,tc_done,{t12_SUITE,end_per_suite,ok}},
- {?eh,tc_start,{t22_SUITE,init_per_suite}},
- {?eh,tc_done,{t22_SUITE,init_per_suite,ok}},
- {?eh,test_stats,{4,8,{4,4}}},
- {?eh,tc_start,{t22_SUITE,end_per_suite}},
- {?eh,tc_done,{t22_SUITE,end_per_suite,ok}},
- {?eh,test_done,{'DEF','STOP_TIME'}},
+ {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}}]
+ ++ flat_spec2_events() ++
+ [{?eh,test_done,{'DEF','STOP_TIME'}},
{?eh,stop_logging,[]},
-%%! WHY NOT 12,12,22?
-
{?eh,start_logging,{'DEF','RUNDIR'}},
{?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
{?eh,start_info,{2,2,10}},
{?eh,tc_start,{t23_SUITE,init_per_suite}},
{?eh,tc_done,{t23_SUITE,init_per_suite,ok}},
- {?eh,tc_start,{t23_SUITE,ok_tc}},
+ {?eh,test_stats,{1,2,{1,1}}},
{?eh,tc_start,{t23_SUITE,end_per_suite}},
{?eh,tc_done,{t23_SUITE,end_per_suite,ok}},
{?eh,tc_start,{t22_SUITE,init_per_suite}},
@@ -1509,106 +1441,38 @@ test_events(rec_incl_join_separate1) ->
{?eh,tc_done,{t22_SUITE,end_per_suite,ok}},
{?eh,test_done,{'DEF','STOP_TIME'}},
{?eh,stop_logging,[]},
-
+
{?eh,start_logging,{'DEF','RUNDIR'}},
- {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
- {?eh,start_info,{3,3,15}},
- {?eh,tc_start,{t23_SUITE,init_per_suite}},
- {?eh,tc_done,{t23_SUITE,init_per_suite,ok}},
- {?eh,tc_start,{t23_SUITE,end_per_suite}},
- {?eh,tc_done,{t23_SUITE,end_per_suite,ok}},
- {?eh,tc_start,{t21_SUITE,init_per_suite}},
- {?eh,tc_done,{t21_SUITE,init_per_suite,ok}},
- {?eh,tc_start,{t21_SUITE,end_per_suite}},
- {?eh,tc_done,{t21_SUITE,end_per_suite,ok}},
- {?eh,tc_start,{t11_SUITE,init_per_suite}},
- {?eh,tc_done,{t11_SUITE,init_per_suite,ok}},
- {?eh,test_stats,{3,6,{3,3}}},
- {?eh,tc_start,{t11_SUITE,end_per_suite}},
- {?eh,tc_done,{t11_SUITE,end_per_suite,ok}},
- {?eh,test_done,{'DEF','STOP_TIME'}},
+ {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}}]
+ ++ flat_spec1_events() ++
+ [{?eh,test_done,{'DEF','STOP_TIME'}},
{?eh,stop_logging,[]},
{?eh,start_logging,{'DEF','RUNDIR'}},
- {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
- {?eh,start_info,{4,3,20}},
- {?eh,tc_start,{t23_SUITE,init_per_suite}},
- {?eh,tc_done,{t23_SUITE,init_per_suite,ok}},
- {?eh,tc_start,{t23_SUITE,end_per_suite}},
- {?eh,tc_done,{t23_SUITE,end_per_suite,ok}},
- {?eh,tc_start,{t12_SUITE,init_per_suite}},
- {?eh,tc_done,{t12_SUITE,init_per_suite,ok}},
- {?eh,tc_start,{t12_SUITE,end_per_suite}},
- {?eh,tc_done,{t12_SUITE,end_per_suite,ok}},
- {?eh,tc_start,{t12_SUITE,init_per_suite}},
- {?eh,tc_done,{t12_SUITE,init_per_suite,ok}},
- {?eh,tc_start,{t12_SUITE,end_per_suite}},
- {?eh,tc_done,{t12_SUITE,end_per_suite,ok}},
- {?eh,tc_start,{t22_SUITE,init_per_suite}},
- {?eh,tc_done,{t22_SUITE,init_per_suite,ok}},
- {?eh,test_stats,{4,8,{4,4}}},
- {?eh,tc_start,{t22_SUITE,end_per_suite}},
- {?eh,tc_done,{t22_SUITE,end_per_suite,ok}},
- {?eh,test_done,{'DEF','STOP_TIME'}},
+ {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}}]
+ ++ flat_spec2_events() ++
+
+ [{?eh,test_done,{'DEF','STOP_TIME'}},
{?eh,stop_logging,[]},
-
{?eh,start_logging,{'DEF','RUNDIR'}},
- {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
- {?eh,start_info,{5,3,25}},
- {?eh,tc_start,{t23_SUITE,init_per_suite}},
- {?eh,tc_done,{t23_SUITE,init_per_suite,ok}},
- {?eh,tc_start,{t23_SUITE,end_per_suite}},
- {?eh,tc_done,{t23_SUITE,end_per_suite,ok}},
- {?eh,tc_start,{t22_SUITE,init_per_suite}},
- {?eh,tc_done,{t22_SUITE,init_per_suite,ok}},
- {?eh,tc_start,{t22_SUITE,end_per_suite}},
- {?eh,tc_done,{t22_SUITE,end_per_suite,ok}},
- {?eh,tc_start,{t12_SUITE,init_per_suite}},
- {?eh,tc_done,{t12_SUITE,init_per_suite,ok}},
- {?eh,tc_start,{t12_SUITE,end_per_suite}},
- {?eh,tc_done,{t12_SUITE,end_per_suite,ok}},
- {?eh,tc_start,{t12_SUITE,init_per_suite}},
- {?eh,tc_done,{t12_SUITE,init_per_suite,ok}},
- {?eh,tc_start,{t12_SUITE,end_per_suite}},
- {?eh,tc_done,{t12_SUITE,end_per_suite,ok}},
- {?eh,tc_start,{t22_SUITE,init_per_suite}},
- {?eh,tc_done,{t22_SUITE,init_per_suite,ok}},
- {?eh,test_stats,{5,10,{5,5}}},
- {?eh,tc_start,{t22_SUITE,end_per_suite}},
- {?eh,tc_done,{t22_SUITE,end_per_suite,ok}},
- {?eh,test_done,{'DEF','STOP_TIME'}},
+ {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}}]
+ ++ flat_spec2_events() ++
+ [{?eh,test_done,{'DEF','STOP_TIME'}},
{?eh,stop_logging,[]},
{?eh,start_logging,{'DEF','RUNDIR'}},
- {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
- {?eh,start_info,{4,4,20}},
- {?eh,tc_start,{t23_SUITE,init_per_suite}},
- {?eh,tc_done,{t23_SUITE,init_per_suite,ok}},
- {?eh,tc_start,{t23_SUITE,end_per_suite}},
- {?eh,tc_done,{t23_SUITE,end_per_suite,ok}},
- {?eh,tc_start,{t22_SUITE,init_per_suite}},
- {?eh,tc_done,{t22_SUITE,init_per_suite,ok}},
- {?eh,tc_start,{t22_SUITE,end_per_suite}},
- {?eh,tc_done,{t22_SUITE,end_per_suite,ok}},
- {?eh,tc_start,{t21_SUITE,init_per_suite}},
- {?eh,tc_done,{t21_SUITE,init_per_suite,ok}},
- {?eh,tc_start,{t21_SUITE,end_per_suite}},
- {?eh,tc_done,{t21_SUITE,end_per_suite,ok}},
- {?eh,tc_start,{t11_SUITE,init_per_suite}},
- {?eh,tc_done,{t11_SUITE,init_per_suite,ok}},
- {?eh,test_stats,{4,8,{4,4}}},
- {?eh,tc_start,{t11_SUITE,end_per_suite}},
- {?eh,tc_done,{t11_SUITE,end_per_suite,ok}},
- {?eh,test_done,{'DEF','STOP_TIME'}},
+ {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}}]
+ ++ flat_spec1_events() ++
+ [{?eh,test_done,{'DEF','STOP_TIME'}},
{?eh,stop_logging,[]}];
test_events(rec_incl_join_separate2) ->
- [
- {?eh,start_logging,{'DEF','RUNDIR'}},
+ [{?eh,start_logging,{'DEF','RUNDIR'}},
{?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
{?eh,start_info,{2,2,10}},
{?eh,tc_start,{t23_SUITE,init_per_suite}},
{?eh,tc_done,{t23_SUITE,init_per_suite,ok}},
+ {?eh,test_stats,{1,2,{1,1}}},
{?eh,tc_start,{t23_SUITE,end_per_suite}},
{?eh,tc_done,{t23_SUITE,end_per_suite,ok}},
{?eh,tc_start,{t22_SUITE,init_per_suite}},
@@ -1620,195 +1484,51 @@ test_events(rec_incl_join_separate2) ->
{?eh,stop_logging,[]},
{?eh,start_logging,{'DEF','RUNDIR'}},
- {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
- {?eh,start_info,{4,3,20}},
- {?eh,tc_start,{t23_SUITE,init_per_suite}},
- {?eh,tc_done,{t23_SUITE,init_per_suite,ok}},
- {?eh,tc_start,{t23_SUITE,end_per_suite}},
- {?eh,tc_done,{t23_SUITE,end_per_suite,ok}},
- {?eh,tc_start,{t12_SUITE,init_per_suite}},
- {?eh,tc_done,{t12_SUITE,init_per_suite,ok}},
- {?eh,tc_start,{t12_SUITE,end_per_suite}},
- {?eh,tc_done,{t12_SUITE,end_per_suite,ok}},
- {?eh,tc_start,{t12_SUITE,init_per_suite}},
- {?eh,tc_done,{t12_SUITE,init_per_suite,ok}},
- {?eh,tc_start,{t12_SUITE,end_per_suite}},
- {?eh,tc_done,{t12_SUITE,end_per_suite,ok}},
- {?eh,tc_start,{t22_SUITE,init_per_suite}},
- {?eh,tc_done,{t22_SUITE,init_per_suite,ok}},
- {?eh,test_stats,{4,8,{4,4}}},
- {?eh,tc_start,{t22_SUITE,end_per_suite}},
- {?eh,tc_done,{t22_SUITE,end_per_suite,ok}},
- {?eh,test_done,{'DEF','STOP_TIME'}},
+ {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}}]
+ ++ flat_spec2_events() ++
+ [{?eh,test_done,{'DEF','STOP_TIME'}},
{?eh,stop_logging,[]},
-%%! WHY NOT 12,12,22?
-
{?eh,start_logging,{'DEF','RUNDIR'}},
- {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
- {?eh,start_info,{3,3,15}},
- {?eh,tc_start,{t23_SUITE,init_per_suite}},
- {?eh,tc_done,{t23_SUITE,init_per_suite,ok}},
- {?eh,tc_start,{t23_SUITE,end_per_suite}},
- {?eh,tc_done,{t23_SUITE,end_per_suite,ok}},
- {?eh,tc_start,{t21_SUITE,init_per_suite}},
- {?eh,tc_done,{t21_SUITE,init_per_suite,ok}},
- {?eh,tc_start,{t21_SUITE,end_per_suite}},
- {?eh,tc_done,{t21_SUITE,end_per_suite,ok}},
- {?eh,tc_start,{t11_SUITE,init_per_suite}},
- {?eh,tc_done,{t11_SUITE,init_per_suite,ok}},
- {?eh,test_stats,{3,6,{3,3}}},
- {?eh,tc_start,{t11_SUITE,end_per_suite}},
- {?eh,tc_done,{t11_SUITE,end_per_suite,ok}},
- {?eh,test_done,{'DEF','STOP_TIME'}},
+ {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}}]
+ ++ flat_spec1_events() ++
+ [{?eh,test_done,{'DEF','STOP_TIME'}},
{?eh,stop_logging,[]},
-
-%%! WHY NOT 11,21?
{?eh,start_logging,{'DEF','RUNDIR'}},
- {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
- {?eh,start_info,{3,3,15}},
- {?eh,tc_start,{t23_SUITE,init_per_suite}},
- {?eh,tc_done,{t23_SUITE,init_per_suite,ok}},
- {?eh,tc_start,{t23_SUITE,end_per_suite}},
- {?eh,tc_done,{t23_SUITE,end_per_suite,ok}},
- {?eh,tc_start,{t21_SUITE,init_per_suite}},
- {?eh,tc_done,{t21_SUITE,init_per_suite,ok}},
- {?eh,tc_start,{t21_SUITE,end_per_suite}},
- {?eh,tc_done,{t21_SUITE,end_per_suite,ok}},
- {?eh,tc_start,{t11_SUITE,init_per_suite}},
- {?eh,tc_done,{t11_SUITE,init_per_suite,ok}},
- {?eh,test_stats,{3,6,{3,3}}},
- {?eh,tc_start,{t11_SUITE,end_per_suite}},
- {?eh,tc_done,{t11_SUITE,end_per_suite,ok}},
- {?eh,test_done,{'DEF','STOP_TIME'}},
+ {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}}]
+ ++ flat_spec1_events() ++
+ [{?eh,test_done,{'DEF','STOP_TIME'}},
{?eh,stop_logging,[]},
-
-%%! WHY NOT 11,21?
{?eh,start_logging,{'DEF','RUNDIR'}},
- {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
- {?eh,start_info,{4,3,20}},
- {?eh,tc_start,{t23_SUITE,init_per_suite}},
- {?eh,tc_done,{t23_SUITE,init_per_suite,ok}},
- {?eh,tc_start,{t23_SUITE,end_per_suite}},
- {?eh,tc_done,{t23_SUITE,end_per_suite,ok}},
- {?eh,tc_start,{t12_SUITE,init_per_suite}},
- {?eh,tc_done,{t12_SUITE,init_per_suite,ok}},
- {?eh,tc_start,{t12_SUITE,end_per_suite}},
- {?eh,tc_done,{t12_SUITE,end_per_suite,ok}},
- {?eh,tc_start,{t12_SUITE,init_per_suite}},
- {?eh,tc_done,{t12_SUITE,init_per_suite,ok}},
- {?eh,tc_start,{t12_SUITE,end_per_suite}},
- {?eh,tc_done,{t12_SUITE,end_per_suite,ok}},
- {?eh,tc_start,{t22_SUITE,init_per_suite}},
- {?eh,tc_done,{t22_SUITE,init_per_suite,ok}},
- {?eh,test_stats,{4,8,{4,4}}},
- {?eh,tc_start,{t22_SUITE,end_per_suite}},
- {?eh,tc_done,{t22_SUITE,end_per_suite,ok}},
- {?eh,test_done,{'DEF','STOP_TIME'}},
+ {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}}]
+ ++ flat_spec2_events() ++
+ [{?eh,test_done,{'DEF','STOP_TIME'}},
{?eh,stop_logging,[]},
-%%! WHY NOT 12,12,22?
-
{?eh,start_logging,{'DEF','RUNDIR'}},
- {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
- {?eh,start_info,{4,4,20}},
- {?eh,tc_start,{t23_SUITE,init_per_suite}},
- {?eh,tc_done,{t23_SUITE,init_per_suite,ok}},
- {?eh,tc_start,{t23_SUITE,end_per_suite}},
- {?eh,tc_done,{t23_SUITE,end_per_suite,ok}},
- {?eh,tc_start,{t22_SUITE,init_per_suite}},
- {?eh,tc_done,{t22_SUITE,init_per_suite,ok}},
- {?eh,tc_start,{t22_SUITE,end_per_suite}},
- {?eh,tc_done,{t22_SUITE,end_per_suite,ok}},
- {?eh,tc_start,{t21_SUITE,init_per_suite}},
- {?eh,tc_done,{t21_SUITE,init_per_suite,ok}},
- {?eh,tc_start,{t21_SUITE,end_per_suite}},
- {?eh,tc_done,{t21_SUITE,end_per_suite,ok}},
- {?eh,tc_start,{t11_SUITE,init_per_suite}},
- {?eh,tc_done,{t11_SUITE,init_per_suite,ok}},
- {?eh,test_stats,{4,8,{4,4}}},
- {?eh,tc_start,{t11_SUITE,end_per_suite}},
- {?eh,tc_done,{t11_SUITE,end_per_suite,ok}},
- {?eh,test_done,{'DEF','STOP_TIME'}},
+ {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}}]
+ ++ flat_spec1_events() ++
+ [{?eh,test_done,{'DEF','STOP_TIME'}},
{?eh,stop_logging,[]},
-
+
{?eh,start_logging,{'DEF','RUNDIR'}},
- {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
- {?eh,start_info,{5,3,25}},
- {?eh,tc_start,{t23_SUITE,init_per_suite}},
- {?eh,tc_done,{t23_SUITE,init_per_suite,ok}},
- {?eh,tc_start,{t23_SUITE,end_per_suite}},
- {?eh,tc_done,{t23_SUITE,end_per_suite,ok}},
- {?eh,tc_start,{t22_SUITE,init_per_suite}},
- {?eh,tc_done,{t22_SUITE,init_per_suite,ok}},
- {?eh,tc_start,{t22_SUITE,end_per_suite}},
- {?eh,tc_done,{t22_SUITE,end_per_suite,ok}},
- {?eh,tc_start,{t12_SUITE,init_per_suite}},
- {?eh,tc_done,{t12_SUITE,init_per_suite,ok}},
- {?eh,tc_start,{t12_SUITE,end_per_suite}},
- {?eh,tc_done,{t12_SUITE,end_per_suite,ok}},
- {?eh,tc_start,{t12_SUITE,init_per_suite}},
- {?eh,tc_done,{t12_SUITE,init_per_suite,ok}},
- {?eh,tc_start,{t12_SUITE,end_per_suite}},
- {?eh,tc_done,{t12_SUITE,end_per_suite,ok}},
- {?eh,tc_start,{t22_SUITE,init_per_suite}},
- {?eh,tc_done,{t22_SUITE,init_per_suite,ok}},
- {?eh,test_stats,{5,10,{5,5}}},
- {?eh,tc_start,{t22_SUITE,end_per_suite}},
- {?eh,tc_done,{t22_SUITE,end_per_suite,ok}},
- {?eh,test_done,{'DEF','STOP_TIME'}},
+ {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}}]
+ ++ flat_spec2_events() ++
+ [{?eh,test_done,{'DEF','STOP_TIME'}},
{?eh,stop_logging,[]},
-
+
{?eh,start_logging,{'DEF','RUNDIR'}},
- {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
- {?eh,start_info,{5,3,25}},
- {?eh,tc_start,{t23_SUITE,init_per_suite}},
- {?eh,tc_done,{t23_SUITE,init_per_suite,ok}},
- {?eh,tc_start,{t23_SUITE,end_per_suite}},
- {?eh,tc_done,{t23_SUITE,end_per_suite,ok}},
- {?eh,tc_start,{t22_SUITE,init_per_suite}},
- {?eh,tc_done,{t22_SUITE,init_per_suite,ok}},
- {?eh,tc_start,{t22_SUITE,end_per_suite}},
- {?eh,tc_done,{t22_SUITE,end_per_suite,ok}},
- {?eh,tc_start,{t12_SUITE,init_per_suite}},
- {?eh,tc_done,{t12_SUITE,init_per_suite,ok}},
- {?eh,tc_start,{t12_SUITE,end_per_suite}},
- {?eh,tc_done,{t12_SUITE,end_per_suite,ok}},
- {?eh,tc_start,{t12_SUITE,init_per_suite}},
- {?eh,tc_done,{t12_SUITE,init_per_suite,ok}},
- {?eh,tc_start,{t12_SUITE,end_per_suite}},
- {?eh,tc_done,{t12_SUITE,end_per_suite,ok}},
- {?eh,tc_start,{t22_SUITE,init_per_suite}},
- {?eh,tc_done,{t22_SUITE,init_per_suite,ok}},
- {?eh,test_stats,{5,10,{5,5}}},
- {?eh,tc_start,{t22_SUITE,end_per_suite}},
- {?eh,tc_done,{t22_SUITE,end_per_suite,ok}},
- {?eh,test_done,{'DEF','STOP_TIME'}},
-
+ {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}}]
+ ++ flat_spec2_events() ++
+ [{?eh,test_done,{'DEF','STOP_TIME'}},
{?eh,stop_logging,[]},
+
{?eh,start_logging,{'DEF','RUNDIR'}},
- {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
- {?eh,start_info,{4,4,20}},
- {?eh,tc_start,{t23_SUITE,init_per_suite}},
- {?eh,tc_done,{t23_SUITE,init_per_suite,ok}},
- {?eh,tc_start,{t23_SUITE,end_per_suite}},
- {?eh,tc_done,{t23_SUITE,end_per_suite,ok}},
- {?eh,tc_start,{t22_SUITE,init_per_suite}},
- {?eh,tc_done,{t22_SUITE,init_per_suite,ok}},
- {?eh,tc_start,{t22_SUITE,end_per_suite}},
- {?eh,tc_done,{t22_SUITE,end_per_suite,ok}},
- {?eh,tc_start,{t21_SUITE,init_per_suite}},
- {?eh,tc_done,{t21_SUITE,init_per_suite,ok}},
- {?eh,tc_start,{t21_SUITE,end_per_suite}},
- {?eh,tc_done,{t21_SUITE,end_per_suite,ok}},
- {?eh,tc_start,{t11_SUITE,init_per_suite}},
- {?eh,tc_done,{t11_SUITE,init_per_suite,ok}},
- {?eh,test_stats,{4,8,{4,4}}},
- {?eh,tc_start,{t11_SUITE,end_per_suite}},
- {?eh,tc_done,{t11_SUITE,end_per_suite,ok}},
- {?eh,test_done,{'DEF','STOP_TIME'}},
+ {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}}]
+ ++ flat_spec1_events() ++
+ [{?eh,test_done,{'DEF','STOP_TIME'}},
{?eh,stop_logging,[]}].
%%%-----------------------------------------------------------------
@@ -1865,7 +1585,7 @@ flat_spec1_events() ->
flat_spec2_events() ->
[
- {?eh,start_info,{3,2,15}},
+ {?eh,start_info,{3,2,15}},
{?eh,tc_start,{t12_SUITE,init_per_suite}},
{?eh,tc_done,{t12_SUITE,init_per_suite,ok}},
{?eh,tc_start,{t12_SUITE,ok_tc}},