Fix problem with tests being wrongly added to separate specs

2 files changed, 78 insertions, 349 deletions

diff --git a/lib/common_test/src/ct_testspec.erl b/lib/common_test/src/ct_testspec.erl
index a3a47db41c..b724eafe7e 100644
--- a/lib/common_test/src/ct_testspec.erl
+++ b/lib/common_test/src/ct_testspec.erl
@@ -253,7 +253,7 @@ collect_tests_from_file(Specs,Nodes,Relaxed) when is_list(Nodes) ->
     Specs2 = [filename:absname(S) || S <- Specs1],
     TS0 = #testspec{nodes=NodeRefs},
 
-    try create_specs(Specs2,TS0,Relaxed,Join) of
+    try create_testspecs(Specs2,TS0,Relaxed,Join) of
 	{{[],_},SeparateTestSpecs} ->
 	    filter_and_convert(SeparateTestSpecs);
 	{{_,#testspec{tests=[]}},SeparateTestSpecs} ->
@@ -295,9 +295,13 @@ delete_dups1([E|Es],Keep) ->
 delete_dups1([],Keep) ->
     Keep.
 
-create_specs(Specs,TestSpec,Relaxed,Join) ->
-    SpecsTree = create_spec_tree(Specs,TestSpec,Join,[]),   
-    create_specs(SpecsTree,TestSpec,Relaxed).
+create_testspecs(Specs,TestSpec,Relaxed,Join) ->
+    %% SpecsTree = {SpecAbsName, TermsInSpec,
+    %%              IncludedJoinTree, IncludedSeparateTree,
+    %%              JoinSpecWithRest, RestSpecsTree}
+    SpecsTree = create_spec_tree(Specs,TestSpec,Join,[]),
+    AllSpecs = create_specs(SpecsTree,TestSpec,TestSpec,Relaxed),
+    AllSpecs.
 
 create_spec_tree([Spec|Specs],TS,JoinWithNext,Known) ->
     SpecDir = filename:dirname(filename:absname(Spec)),
@@ -327,27 +331,31 @@ create_spec_tree([],_TS,_JoinWithNext,_Known) ->
     [].
 
 create_specs({Spec,Terms,InclJoin,InclSep,JoinWithNext,NextSpec},
-	     TestSpec,Relaxed) ->
+	     TestSpec,TestSpec0,Relaxed) ->
     SpecDir = filename:dirname(filename:absname(Spec)),
     TestSpec1 = create_spec(Terms,TestSpec#testspec{spec_dir=SpecDir},
 			    JoinWithNext,Relaxed),
 
-    {{JoinSpecs1,JoinTS1},Separate1} = create_specs(InclJoin,TestSpec1,Relaxed),
+    {{JoinSpecs1,JoinTS1},Separate1} = create_specs(InclJoin,TestSpec1,
+						    TestSpec0,Relaxed),
 
     {{JoinSpecs2,JoinTS2},Separate2} =
 	case JoinWithNext of
 	    true ->
-		create_specs(NextSpec,JoinTS1,Relaxed);
+		create_specs(NextSpec,JoinTS1,
+			     TestSpec0,Relaxed);
 	    false ->
 		{{[],JoinTS1},[]}
 	end,
-    {SepJoinSpecs,Separate3} = create_specs(InclSep,TestSpec,Relaxed),
+    {SepJoinSpecs,Separate3} = create_specs(InclSep,TestSpec0,
+					    TestSpec0,Relaxed),
     {SepJoinSpecs1,Separate4} =
 	case JoinWithNext of
 	    true ->
 		{{[],TestSpec},[]};
 	    false ->
-		create_specs(NextSpec,TestSpec,Relaxed)
+		create_specs(NextSpec,TestSpec0,
+			     TestSpec0,Relaxed)
 	end,            
 
     SpecInfo = {Spec,TestSpec1#testspec.merge_tests},
@@ -368,7 +376,8 @@ create_specs({Spec,Terms,InclJoin,InclSep,JoinWithNext,NextSpec},
 	    {{[SpecInfo|(JoinSpecs1++JoinSpecs2)],JoinTS2},
 	     AllSeparate}
     end;
-create_specs([],TestSpec,_Relaxed) ->
+
+create_specs([],TestSpec,_,_Relaxed) ->
     {{[],TestSpec},[]}.
 		
 create_spec(Terms,TestSpec,JoinedByPrev,Relaxed) ->
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}},