From 3e79e2da66002bd998b67ea3f75955a5bbd7348e Mon Sep 17 00:00:00 2001
From: Peter Andersson <peppe@erlang.org>
Date: Thu, 16 Apr 2015 11:20:37 +0200
Subject: Improve error reports in log when suite compilation fails

---
 lib/common_test/src/ct_logs.erl | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'lib/common_test/src')

diff --git a/lib/common_test/src/ct_logs.erl b/lib/common_test/src/ct_logs.erl
index 4d5a75d354..7c8c720e13 100644
--- a/lib/common_test/src/ct_logs.erl
+++ b/lib/common_test/src/ct_logs.erl
@@ -2054,6 +2054,13 @@ runentry(Dir, Totals={Node,Label,Logs,
 					     ?testname_width-3)),
 		lists:flatten(io_lib:format("~ts...",[Trunc]))
 	end,
+    TotMissingStr =
+	if NotBuilt > 0 ->
+		["<font color=\"red\">",
+		 integer_to_list(NotBuilt),"</font>"];
+	   true ->
+		integer_to_list(NotBuilt)
+	end,
     Total = TotSucc+TotFail+AllSkip,
     A = xhtml(["<td align=center><font size=\"-1\">",Node,
 	       "</font></td>\n",
@@ -2073,7 +2080,7 @@ runentry(Dir, Totals={Node,Label,Logs,
 	 "<td align=right>",TotFailStr,"</td>\n",
 	 "<td align=right>",integer_to_list(AllSkip),
 	 " (",UserSkipStr,"/",AutoSkipStr,")</td>\n",
-	 "<td align=right>",integer_to_list(NotBuilt),"</td>\n"],
+	 "<td align=right>",TotMissingStr,"</td>\n"],
     TotalsStr = A++B++C,
     
     XHTML = [xhtml("<tr>\n", ["<tr class=\"",odd_or_even(),"\">\n"]),
-- 
cgit v1.2.3


From 985215ccba444132fb8e01e72968493402b976a8 Mon Sep 17 00:00:00 2001
From: Peter Andersson <peppe@erlang.org>
Date: Thu, 16 Apr 2015 13:38:34 +0200
Subject: Add missing events and hook function calls

---
 lib/common_test/src/ct_framework.erl | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'lib/common_test/src')

diff --git a/lib/common_test/src/ct_framework.erl b/lib/common_test/src/ct_framework.erl
index ea3d7c8218..0878e97f81 100644
--- a/lib/common_test/src/ct_framework.erl
+++ b/lib/common_test/src/ct_framework.erl
@@ -113,6 +113,7 @@ init_tc1(?MODULE,_,error_in_suite,[Config0]) when is_list(Config0) ->
     ct_event:notify(#event{name=tc_start,
 			   node=node(),
 			   data={?MODULE,error_in_suite}}),
+    ct_suite_init(?MODULE, error_in_suite, [], Config0),
     case ?val(error, Config0) of
 	undefined ->
 	    {fail,"unknown_error_in_suite"};
@@ -635,7 +636,20 @@ try_set_default(Name,Key,Info,Where) ->
 end_tc(Mod, Fun, Args) ->
     %% Have to keep end_tc/3 for backwards compatibility issues
     end_tc(Mod, Fun, Args, '$end_tc_dummy').
-end_tc(?MODULE,error_in_suite,_, _) ->		% bad start!
+end_tc(?MODULE,error_in_suite,{Result,[Args]},Return) ->
+    %% this clause gets called if CT has encountered a suite that
+    %% can't be executed
+    FinalNotify =
+	case ct_hooks:end_tc(?MODULE, error_in_suite, Args, Result, Return) of
+	    '$ct_no_change' ->
+		Result;
+	    HookResult ->
+		HookResult
+	end,
+    Event = #event{name=tc_done,
+		   node=node(),
+		   data={?MODULE,error_in_suite,tag(FinalNotify)}},
+    ct_event:sync_notify(Event),
     ok;
 end_tc(Mod,Func,{TCPid,Result,[Args]}, Return) when is_pid(TCPid) ->
     end_tc(Mod,Func,TCPid,Result,Args,Return);
@@ -1293,6 +1307,8 @@ report(What,Data) ->
 	    end,
 	    ct_logs:unregister_groupleader(ReportingPid),
 	    case {Func,Result} of
+		{error_in_suite,_} when Suite == ?MODULE ->
+		    ok;
 		{init_per_suite,_} ->
 		    ok;
 		{end_per_suite,_} ->
-- 
cgit v1.2.3